Release version 3.3.8 (2021.1.8).

See #4172

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-#Mon Jul 03 09:48:21 CEST 2023
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
+#Fri Jun 03 09:42:19 CEST 2022
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip

Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/3.1.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.6.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -20,7 +20,64 @@ pipeline {
 	stages {
 		stage("Docker images") {
 			parallel {
-				stage('Publish JDK (Java 17) + MongoDB 4.4') {
+				stage('Publish JDK (main) + MongoDB 4.0') {
+					when {
+						anyOf {
+							changeset "ci/openjdk8-mongodb-4.0/**"
+							changeset "ci/pipeline.properties"
+						}
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-with-mongodb-4.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.0.version']} ci/openjdk8-mongodb-4.0/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK (main) + MongoDB 4.4') {
+					when {
+						anyOf {
+							changeset "ci/openjdk8-mongodb-4.4/**"
+							changeset "ci/pipeline.properties"
+						}
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk8-mongodb-4.4/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK (main) + MongoDB 5.0') {
+					when {
+						anyOf {
+							changeset "ci/openjdk8-mongodb-5.0/**"
+							changeset "ci/pipeline.properties"
+						}
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.5.0.version']} ci/openjdk8-mongodb-5.0/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK (LTS) + MongoDB 4.4') {
 					when {
 						anyOf {
 							changeset "ci/openjdk17-mongodb-4.4/**"
@@ -32,64 +89,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								image.push()
-							}
-						}
-					}
-				}
-				stage('Publish JDK (Java 17) + MongoDB 5.0') {
-					when {
-						anyOf {
-							changeset "ci/openjdk17-mongodb-5.0/**"
-							changeset "ci/pipeline.properties"
-						}
-					}
-					agent { label 'data' }
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					steps {
-						script {
-							def image = docker.build("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.5.0.version']} ci/openjdk17-mongodb-5.0/")
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								image.push()
-							}
-						}
-					}
-				}
-				stage('Publish JDK (Java 17) + MongoDB 6.0') {
-					when {
-						anyOf {
-							changeset "ci/openjdk17-mongodb-6.0/**"
-							changeset "ci/pipeline.properties"
-						}
-					}
-					agent { label 'data' }
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					steps {
-						script {
-							def image = docker.build("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk17-mongodb-6.0/")
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								image.push()
-							}
-						}
-					}
-				}
-				stage('Publish JDK (Java 20) + MongoDB 6.0') {
-					when {
-						anyOf {
-							changeset "ci/openjdk20-mongodb-6.0/**"
-							changeset "ci/pipeline.properties"
-						}
-					}
-					agent { label 'data' }
-					options { timeout(time: 30, unit: 'MINUTES') }
-
-					steps {
-						script {
-							def image = docker.build("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk20-mongodb-6.0/")
+							def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
@@ -116,7 +116,7 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+					docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
 						sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
 						sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
 						sh 'sleep 10'
@@ -137,8 +137,29 @@ pipeline {
 				}
 			}
 			parallel {
+				stage("test: mongodb 4.4 (main)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+								sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+								sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
+								sh 'sleep 10'
+								sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
+								sh 'sleep 15'
+								sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+							}
+						}
+					}
+				}
 
-				stage("test: MongoDB 5.0 (main)") {
+				stage("test: mongodb 5.0 (main)") {
 					agent {
 						label 'data'
 					}
@@ -160,7 +181,7 @@ pipeline {
 					}
 				}
 
-				stage("test: MongoDB 6.0 (main)") {
+				stage("test: baseline (LTS)") {
 					agent {
 						label 'data'
 					}
@@ -170,33 +191,11 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-4.4:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
 								sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
 								sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
 								sh 'sleep 10'
-								sh 'mongosh --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 -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
-							}
-						}
-					}
-				}
-
-				stage("test: MongoDB 6.0 (next)") {
-					agent {
-						label 'data'
-					}
-					options { timeout(time: 30, unit: 'MINUTES') }
-					environment {
-						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-					}
-					steps {
-						script {
-							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
-								sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
-								sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
-								sh 'sleep 10'
-								sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
+								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 -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
 							}
@@ -226,7 +225,6 @@ pipeline {
 			steps {
 				script {
 					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -v'
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
 								'-Dartifactory.server=https://repo.spring.io ' +
 								"-Dartifactory.username=${ARTIFACTORY_USR} " +

README.adoc

@@ -93,11 +93,142 @@ and declare the appropriate dependency version.
 </repository>
 ----
 
-[[upgrading]]
-== Upgrading
+== Upgrading from 2.x
 
-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.
+The 4.0 MongoDB Java Driver does no longer support certain features that have already been deprecated in one of the last minor versions.
+Some of the changes affect the initial setup configuration as well as compile/runtime features. We summarized the most typical changes one might encounter.
+
+=== XML Namespace
+
+.Changed XML Namespace Elements and Attributes:
+|===
+| Element / Attribute | 2.x | 3.x
+
+| `<mongo:mongo-client />`
+| Used to create a `com.mongodb.MongoClient`
+| Now exposes a `com.mongodb.client.MongoClient`
+
+| `<mongo:mongo-client replica-set="..." />`
+| Was a comma delimited list of replica set members (host/port)
+| Now defines the replica set name. +
+Use `<mongo:client-settings cluster-hosts="..." />` instead
+
+| `<mongo:db-factory writeConcern="..." />`
+| NONE, NORMAL, SAFE, FSYNC_SAFE, REPLICAS_SAFE, MAJORITY
+| W1, W2, W3, UNACKNOWLEDGED, ACKNOWLEDGED, JOURNALED, MAJORITY
+|===
+
+.Removed XML Namespace Elements and Attributes:
+|===
+| Element / Attribute | Replacement in 3.x | Comment
+
+| `<mongo:db-factory mongo-ref="..." />`
+| `<mongo:db-factory mongo-client-ref="..." />`
+| Referencing a `com.mongodb.client.MongoClient`.
+
+| `<mongo:mongo-client credentials="..." />`
+| `<mongo:mongo-client credential="..." />`
+| Single authentication data instead of list.
+
+| `<mongo:client-options />`
+| `<mongo:client-settings />`
+| See `com.mongodb.MongoClientSettings` for details.
+|===
+
+.New XML Namespace Elements and Attributes:
+|===
+| Element | Comment
+
+| `<mongo:db-factory mongo-client-ref="..." />`
+| Replacement for `<mongo:db-factory mongo-ref="..." />`
+
+| `<mongo:db-factory connection-string="..." />`
+| Replacement for `uri` and `client-uri`.
+
+| `<mongo:mongo-client connection-string="..." />`
+| Replacement for `uri` and `client-uri`.
+
+| `<mongo:client-settings />`
+| Namespace element for `com.mongodb.MongoClientSettings`.
+
+|===
+
+=== Java Configuration
+
+.Java API changes
+|===
+| Type | Comment
+
+| `MongoClientFactoryBean`
+| Creates `com.mongodb.client.MongoClient` instead of `com.mongodb.MongoClient` +
+Uses `MongoClientSettings` instead of `MongoClientOptions`.
+
+| `MongoDataIntegrityViolationException`
+| Uses `WriteConcernResult` instead of `WriteResult`.
+
+| `BulkOperationException`
+| Uses `MongoBulkWriteException` and `com.mongodb.bulk.BulkWriteError` instead of `BulkWriteException` and `com.mongodb.BulkWriteError`
+
+| `ReactiveMongoClientFactoryBean`
+| Uses `com.mongodb.MongoClientSettings` instead of `com.mongodb.async.client.MongoClientSettings`
+
+| `ReactiveMongoClientSettingsFactoryBean`
+| Now produces `com.mongodb.MongoClientSettings` instead of `com.mongodb.async.client.MongoClientSettings`
+|===
+
+.Removed Java API:
+|===
+| 2.x | Replacement in 3.x | Comment
+
+| `MongoClientOptionsFactoryBean`
+| `MongoClientSettingsFactoryBean`
+| Creating a `com.mongodb.MongoClientSettings`.
+
+| `AbstractMongoConfiguration`
+| `AbstractMongoClientConfiguration` +
+(Available since 2.1)
+| Using `com.mongodb.client.MongoClient`.
+
+| `MongoDbFactory#getLegacyDb()`
+| -
+| -
+
+| `SimpleMongoDbFactory`
+| `SimpleMongoClientDbFactory` +
+(Available since 2.1)
+|
+
+| `MapReduceOptions#getOutputType()`
+| `MapReduceOptions#getMapReduceAction()`
+| Returns `MapReduceAction` instead of `MapReduceCommand.OutputType`.
+
+| `Meta\|Query` maxScan & snapshot
+|
+|
+|===
+
+=== Other Changes
+
+==== UUID Types
+
+The MongoDB UUID representation can now be configured with different formats.
+This has to be done via `MongoClientSettings` as shown in the snippet below.
+
+.UUID Codec Configuration
+====
+[source,java]
+----
+static class Config extends AbstractMongoClientConfiguration {
+
+    @Override
+    public void configureClientSettings(MongoClientSettings.Builder builder) {
+        builder.uuidRepresentation(UuidRepresentation.STANDARD);
+    }
+
+    // ...
+}
+----
+====
 
 [[getting-help]]
 == Getting Help
@@ -140,27 +271,26 @@ The https://spring.io/[spring.io] site contains several guides that show how to
 [[building-from-source]]
 == Building from Source
 
-You do not need to build from source to use Spring Data. Binaries are available in https://repo.spring.io[repo.spring.io]
+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]
+Follow this https://start.spring.io/#type=maven-project&language=java&platformVersion=2.5.4&packaging=jar&jvmVersion=1.8&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=2.5.4&packaging=jar&jvmVersion=1.8&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]).
+However, 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]
+and minimally JDK 8 (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]
+In order to build Spring Data MongoDB, first 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`).
+your MongoDB installation (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 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:
 
@@ -182,7 +312,7 @@ To initialize the replica set, start a mongo client:
 [source,bash]
 ----
 $ $MONGODB_HOME/bin/mongo
-MongoDB server version: 6.0.0
+MongoDB server version: 5.0.0
 ...
 ----
 
@@ -201,7 +331,7 @@ In case you need to, you can adjust the `ulimit` with the following command (327
 $ ulimit -n 32768
 ----
 
-You can use `ulimit -a` again to verify the `ulimit` for "_open files_" was set appropriately.
+You can use `ulimit -a` again to verify the `ulimit` on "_open files_" was set appropriately.
 
 Now you are ready to build Spring Data MongoDB. Simply enter the following `mvnw` (Maven Wrapper) command:
 
@@ -210,7 +340,7 @@ Now you are ready to build Spring Data MongoDB. Simply enter the following `mvnw
  $ ./mvnw clean install
 ----
 
-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].
+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].
 
 _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._

ci/openjdk11-mongodb-4.4/Dockerfile

@@ -0,0 +1,21 @@
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG MONGODB
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+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/http/https/g' /etc/apt/sources.list ; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.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/*;

ci/openjdk17-mongodb-4.4/Dockerfile

@@ -7,16 +7,15 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
 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 && \
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
-	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \
-	echo ${TZ} > /etc/timezone
+	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/http/https/g' /etc/apt/sources.list ; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.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/*
+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/*;

ci/openjdk17-mongodb-6.0/Dockerfile

@@ -1,24 +0,0 @@
-ARG BASE
-FROM ${BASE}
-# Any ARG statements before FROM are cleared.
-ARG MONGODB
-
-ENV TZ=Etc/UTC
-ENV DEBIAN_FRONTEND=noninteractive
-
-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 6.0 release signing key
-	wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \
-	# Needed when MongoDB creates a 6.0 folder.
-	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.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/*

ci/openjdk20-mongodb-6.0/Dockerfile

@@ -1,24 +0,0 @@
-ARG BASE
-FROM ${BASE}
-# Any ARG statements before FROM are cleared.
-ARG MONGODB
-
-ENV TZ=Etc/UTC
-ENV DEBIAN_FRONTEND=noninteractive
-
-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 6.0 release signing key
-	wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \
-	# Needed when MongoDB creates a 6.0 folder.
-	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.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/*

ci/openjdk8-mongodb-4.0/Dockerfile

@@ -0,0 +1,21 @@
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG MONGODB
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN 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/http/https/g' /etc/apt/sources.list ; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list; \
+	echo ${TZ} > /etc/timezone;
+
+RUN 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/*;

ci/openjdk8-mongodb-4.4/Dockerfile

@@ -0,0 +1,23 @@
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG MONGODB
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+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/http/https/g' /etc/apt/sources.list ; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 ; \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 ; \
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list; \
+	echo ${TZ} > /etc/timezone;
+
+RUN apt-get update ; \
+	ln -T /bin/true /usr/bin/systemctl ; \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} ; \
+    rm /usr/bin/systemctl ; \
+	apt-get clean ; \
+	rm -rf /var/lib/apt/lists/* ;

ci/openjdk8-mongodb-5.0/Dockerfile

@@ -7,18 +7,17 @@ ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
 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 && \
+	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/http/https/g' /etc/apt/sources.list ; \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget ; \
 	# MongoDB 5.0 release signing key
-	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \
+	apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 ; \
 	# Needed when MongoDB creates a 5.0 folder.
-	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.0.list && \
-	echo ${TZ} > /etc/timezone
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.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/*
+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/*;

ci/pipeline.properties

@@ -1,21 +1,23 @@
 # Java versions
-java.main.tag=17.0.7_7-jdk-focal
-java.next.tag=20-jdk-jammy
+java.main.tag=8u322-b06-jdk
+java.next.tag=11.0.14.1_1-jdk
+java.lts.tag=17.0.2_8-jdk
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
 docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
 
 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.22
-docker.mongodb.5.0.version=5.0.18
-docker.mongodb.6.0.version=6.0.7
+docker.mongodb.4.0.version=4.0.28
+docker.mongodb.4.4.version=4.4.12
+docker.mongodb.5.0.version=5.0.6
 
 # Supported versions of Redis
-docker.redis.6.version=6.2.12
+docker.redis.6.version=6.2.6
 
 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.15
+docker.cassandra.3.version=3.11.12
 
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>4.1.2</version>
+	<version>3.3.8</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.1.2</version>
+		<version>2.6.8</version>
 	</parent>
 
 	<modules>
@@ -26,8 +26,8 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>3.1.2</springdata.commons>
-		<mongo>4.9.1</mongo>
+		<springdata.commons>2.6.8</springdata.commons>
+		<mongo>4.4.2</mongo>
 		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>
@@ -144,8 +144,31 @@
 	</dependencies>
 
 	<repositories>
-		
-		
+		<repository>
+			<id>spring-libs-release</id>
+			<url>https://repo.spring.io/libs-release</url>
+		</repository>
+		<repository>
+			<id>sonatype-libs-snapshot</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 
+	<pluginRepositories>
+		<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>

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.1.2</version>
+		<version>3.3.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.
@@ -322,7 +322,7 @@ public class AbstractMicrobenchmark {
 		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));
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.
@@ -96,14 +96,15 @@ class MongoResultsWriter implements ResultsWriter {
 		for (Object key : doc.keySet()) {
 
 			Object value = doc.get(key);
-			if (value instanceof Document document) {
-				value = fixDocumentKeys(document);
-			} else if (value instanceof BasicDBObject basicDBObject) {
-				value = fixDocumentKeys(new Document(basicDBObject));
+			if (value instanceof Document) {
+				value = fixDocumentKeys((Document) value);
+			} else if (value instanceof BasicDBObject) {
+				value = fixDocumentKeys(new Document((BasicDBObject) value));
 			}
 
-			if (key instanceof String newKey) {
+			if (key instanceof String) {
 
+				String newKey = (String) key;
 				if (newKey.contains(".")) {
 					newKey = newKey.replace('.', ',');
 				}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.

spring-data-mongodb-distribution/pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
@@ -15,18 +14,13 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.1.2</version>
+		<version>3.3.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<project.root>${basedir}/..</project.root>
 		<dist.key>SDMONGO</dist.key>
-
-		<!-- Observability -->
-		<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/spring-data-mongodb/</micrometer-docs-generator.inputPath>
-		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
-		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/target/</micrometer-docs-generator.outputPath>
 	</properties>
 
 	<build>
@@ -35,43 +29,12 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-docs</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-						<configuration>
-							<mainClass>io.micrometer.docs.DocsGeneratorCommand</mainClass>
-							<includePluginDependencies>true</includePluginDependencies>
-							<arguments>
-								<argument>${micrometer-docs-generator.inputPath}</argument>
-								<argument>${micrometer-docs-generator.inclusionPattern}</argument>
-								<argument>${micrometer-docs-generator.outputPath}</argument>
-							</arguments>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>io.micrometer</groupId>
-						<artifactId>micrometer-docs-generator</artifactId>
-						<version>1.0.1</version>
-						<type>jar</type>
-					</dependency>
-				</dependencies>
-			</plugin>
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
 				<configuration>
 					<attributes>
-						<mongo-reactivestreams>${mongo.reactivestreams}
-						</mongo-reactivestreams>
+						<mongo-reactivestreams>${mongo.reactivestreams}</mongo-reactivestreams>
 						<reactor>${reactor}</reactor>
 					</attributes>
 				</configuration>

spring-data-mongodb/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -13,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.1.2</version>
+		<version>3.3.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -112,13 +110,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-crypt</artifactId>
-			<version>1.6.1</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
@@ -131,6 +122,27 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>${rxjava}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.reactivex</groupId>
+			<artifactId>rxjava-reactive-streams</artifactId>
+			<version>${rxjava-reactive-streams}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.reactivex.rxjava2</groupId>
+			<artifactId>rxjava</artifactId>
+			<version>${rxjava2}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>io.reactivex.rxjava3</groupId>
 			<artifactId>rxjava</artifactId>
@@ -140,6 +152,12 @@
 
 		<!-- 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>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>javax.interceptor</groupId>
@@ -149,48 +167,31 @@
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.enterprise</groupId>
-			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
 			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.annotation</groupId>
-			<artifactId>jakarta.annotation-api</artifactId>
-			<version>${jakarta-annotation-api}</version>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>${javax-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-spi</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- JSR 303 Validation -->
 		<dependency>
-			<groupId>jakarta.validation</groupId>
-			<artifactId>jakarta.validation-api</artifactId>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
@@ -203,37 +204,30 @@
 		</dependency>
 
 		<dependency>
-			<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>org.hibernate.validator</groupId>
+			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>7.0.1.Final</version>
+			<version>5.4.3.Final</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.el</groupId>
-			<artifactId>jakarta.el-api</artifactId>
-			<version>4.0.0</version>
-			<scope>provided</scope>
-			<optional>true</optional>
+			<groupId>org.glassfish</groupId>
+			<artifactId>javax.el</artifactId>
+			<version>3.0.1-b11</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.glassfish</groupId>
-			<artifactId>jakarta.el</artifactId>
-			<version>4.0.2</version>
-			<scope>provided</scope>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.threeten</groupId>
+			<artifactId>threetenbp</artifactId>
+			<version>${threetenbp}</version>
 			<optional>true</optional>
 		</dependency>
 
@@ -243,6 +237,13 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jul-to-slf4j</artifactId>
+			<version>${slf4j}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>nl.jqno.equalsverifier</groupId>
 			<artifactId>equalsverifier</artifactId>
@@ -278,9 +279,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.transaction</groupId>
-			<artifactId>jakarta.transaction-api</artifactId>
-			<version>2.0.0</version>
+			<groupId>javax.transaction</groupId>
+			<artifactId>jta</artifactId>
+			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -311,34 +312,11 @@
 
 		<dependency>
 			<groupId>io.mockk</groupId>
-			<artifactId>mockk-jvm</artifactId>
+			<artifactId>mockk</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>
@@ -372,11 +350,8 @@
 							<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>
@@ -396,9 +371,7 @@
 						<exclude>**/ReactivePerformanceTests.java</exclude>
 					</excludes>
 					<systemPropertyVariables>
-						<java.util.logging.config.file>
-							src/test/resources/logging.properties
-						</java.util.logging.config.file>
+						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
 						<reactor.trace.cancel>true</reactor.trace.cancel>
 					</systemPropertyVariables>
 				</configuration>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-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.
@@ -103,11 +103,19 @@ public class BindableMongoExpression implements MongoExpression {
 		return new BindableMongoExpression(expressionString, codecRegistryProvider, args);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoExpression#toDocument()
+	 */
 	@Override
 	public Document toDocument() {
 		return target.get();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString() {
 		return "BindableMongoExpression{" + "expressionString='" + expressionString + '\'' + ", args="

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2017-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.
@@ -62,7 +62,7 @@ public interface CodecRegistryProvider {
 	 */
 	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));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -102,7 +102,7 @@ public class MongoDatabaseUtils {
 	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 (sessionSynchronization == SessionSynchronization.NEVER
 				|| !TransactionSynchronizationManager.isSynchronizationActive()) {
@@ -193,11 +193,19 @@ public class MongoDatabaseUtils {
 			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) {
 
@@ -206,6 +214,10 @@ public class MongoDatabaseUtils {
 			}
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.transaction.support.ResourceHolderSynchronization#afterCompletion(int)
+		 */
 		@Override
 		public void afterCompletion(int status) {
 
@@ -216,6 +228,10 @@ public class MongoDatabaseUtils {
 			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) {
 

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2011-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.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.DataAccessException;
+
+import com.mongodb.client.MongoDatabase;
+
+/**
+ * Interface for factories creating {@link MongoDatabase} instances.
+ *
+ * @author Mark Pollack
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @deprecated since 3.0, use {@link MongoDatabaseFactory} instead.
+ */
+@Deprecated
+public interface MongoDbFactory extends MongoDatabaseFactory {
+
+	/**
+	 * Creates a default {@link MongoDatabase} instance.
+	 *
+	 * @return never {@literal null}.
+	 * @throws DataAccessException
+	 * @deprecated since 3.0. Use {@link #getMongoDatabase()} instead.
+	 */
+	@Deprecated
+	default MongoDatabase getDb() throws DataAccessException {
+		return getMongoDatabase();
+	}
+
+	/**
+	 * Obtain a {@link MongoDatabase} instance to access the database with the given name.
+	 *
+	 * @param dbName must not be {@literal null} or empty.
+	 * @return never {@literal null}.
+	 * @throws DataAccessException
+	 * @deprecated since 3.0. Use {@link #getMongoDatabase(String)} instead.
+	 */
+	@Deprecated
+	default MongoDatabase getDb(String dbName) throws DataAccessException {
+		return getMongoDatabase(dbName);
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-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.

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

@@ -1,81 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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);
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -68,7 +68,7 @@ class MongoResourceHolder extends ResourceHolderSupport {
 		ClientSession session = getSession();
 
 		if (session == null) {
-			throw new IllegalStateException("No session available");
+			throw new IllegalStateException("No session available!");
 		}
 
 		return session;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -100,12 +100,16 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	 */
 	public MongoTransactionManager(MongoDatabaseFactory dbFactory, @Nullable TransactionOptions options) {
 
-		Assert.notNull(dbFactory, "DbFactory must not be null");
+		Assert.notNull(dbFactory, "DbFactory must not be null!");
 
 		this.dbFactory = dbFactory;
 		this.options = options;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doGetTransaction()
+	 */
 	@Override
 	protected Object doGetTransaction() throws TransactionException {
 
@@ -114,11 +118,19 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		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 {
 
@@ -148,6 +160,10 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		TransactionSynchronizationManager.bindResource(getRequiredDbFactory(), resourceHolder);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSuspend(java.lang.Object)
+	 */
 	@Override
 	protected Object doSuspend(Object transaction) throws TransactionException {
 
@@ -157,11 +173,19 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		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 {
 
@@ -212,6 +236,10 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		transactionObject.commitTransaction();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doRollback(org.springframework.transaction.support.DefaultTransactionStatus)
+	 */
 	@Override
 	protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
 
@@ -231,6 +259,10 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSetRollbackOnly(org.springframework.transaction.support.DefaultTransactionStatus)
+	 */
 	@Override
 	protected void doSetRollbackOnly(DefaultTransactionStatus status) throws TransactionException {
 
@@ -238,6 +270,10 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		transactionObject.getRequiredResourceHolder().setRollbackOnly();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doCleanupAfterCompletion(java.lang.Object)
+	 */
 	@Override
 	protected void doCleanupAfterCompletion(Object transaction) {
 
@@ -266,7 +302,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	 */
 	public void setDbFactory(MongoDatabaseFactory dbFactory) {
 
-		Assert.notNull(dbFactory, "DbFactory must not be null");
+		Assert.notNull(dbFactory, "DbFactory must not be null!");
 		this.dbFactory = dbFactory;
 	}
 
@@ -289,11 +325,19 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		return dbFactory;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.transaction.support.ResourceTransactionManager#getResourceFactory()
+	 */
 	@Override
 	public MongoDatabaseFactory getResourceFactory() {
 		return getRequiredDbFactory();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
 	@Override
 	public void afterPropertiesSet() {
 		getRequiredDbFactory();
@@ -315,7 +359,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 	private MongoDatabaseFactory getRequiredDbFactory() {
 
 		Assert.state(dbFactory != null,
-				"MongoTransactionManager operates upon a MongoDbFactory; Did you forget to provide one; It's required");
+				"MongoTransactionManager operates upon a MongoDbFactory. Did you forget to provide one? It's required.");
 
 		return dbFactory;
 	}
@@ -353,7 +397,7 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 				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 = %b, ", session.getServerSession().isClosed());
+				debugString += String.format("closed = %d, ", session.getServerSession().isClosed());
 				debugString += String.format("clusterTime = %s", session.getClusterTime());
 			} else {
 				debugString += "id = n/a";
@@ -450,22 +494,30 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 
 		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();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.
@@ -136,7 +136,7 @@ public class ReactiveMongoDatabaseUtils {
 	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);
@@ -214,11 +214,19 @@ public class ReactiveMongoDatabaseUtils {
 			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) {
 
@@ -229,6 +237,10 @@ public class ReactiveMongoDatabaseUtils {
 			return Mono.empty();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#afterCompletion(int)
+		 */
 		@Override
 		public Mono<Void> afterCompletion(int status) {
 
@@ -244,6 +256,10 @@ public class ReactiveMongoDatabaseUtils {
 			});
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#releaseResource(java.lang.Object, java.lang.Object)
+		 */
 		@Override
 		protected Mono<Void> releaseResource(ReactiveMongoResourceHolder resourceHolder, Object resourceKey) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.
@@ -104,12 +104,16 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 	public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFactory,
 			@Nullable TransactionOptions options) {
 
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null");
+		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
 
 		this.databaseFactory = databaseFactory;
 		this.options = options;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doGetTransaction(org.springframework.transaction.reactive.TransactionSynchronizationManager)
+	 */
 	@Override
 	protected Object doGetTransaction(TransactionSynchronizationManager synchronizationManager)
 			throws TransactionException {
@@ -119,11 +123,19 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		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 {
@@ -163,6 +175,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		});
 	}
 
+	/*
+	 * (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 {
@@ -176,6 +192,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		});
 	}
 
+	/*
+	 * (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) {
@@ -183,6 +203,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 				.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 {
@@ -219,6 +243,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		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) {
@@ -240,6 +268,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		});
 	}
 
+	/*
+	 * (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 {
@@ -250,6 +282,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		});
 	}
 
+	/*
+	 * (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) {
@@ -281,7 +317,7 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 	 */
 	public void setDatabaseFactory(ReactiveMongoDatabaseFactory databaseFactory) {
 
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null");
+		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
 		this.databaseFactory = databaseFactory;
 	}
 
@@ -304,6 +340,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		return databaseFactory;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
 	@Override
 	public void afterPropertiesSet() {
 		getRequiredDatabaseFactory();
@@ -323,7 +363,7 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 	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;
 	}
@@ -361,7 +401,7 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 				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 = %b, ", session.getServerSession().isClosed());
+				debugString += String.format("closed = %d, ", session.getServerSession().isClosed());
 				debugString += String.format("clusterTime = %s", session.getClusterTime());
 			} else {
 				debugString += "id = n/a";
@@ -458,22 +498,30 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 
 		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");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -76,13 +76,13 @@ public class SessionAwareMethodInterceptor<D, C> implements MethodInterceptor {
 			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,6 +95,10 @@ public class SessionAwareMethodInterceptor<D, C> implements MethodInterceptor {
 		this.sessionType = sessionType;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.aopalliance.intercept.MethodInterceptor(org.aopalliance.intercept.MethodInvocation)
+	 */
 	@Nullable
 	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-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.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.util.Version;
 import org.springframework.util.StringUtils;
 
@@ -31,7 +31,7 @@ import com.mongodb.MongoDriverInformation;
  */
 public class SpringDataMongoDB {
 
-	private static final Log LOGGER = LogFactory.getLog(SpringDataMongoDB.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(SpringDataMongoDB.class);
 
 	private static final Version FALLBACK_VERSION = new Version(3);
 	private static final MongoDriverInformation DRIVER_INFORMATION = MongoDriverInformation
@@ -68,7 +68,7 @@ public class SpringDataMongoDB {
 		try {
 			return Version.parse(versionString);
 		} catch (Exception e) {
-			LOGGER.debug(String.format("Cannot read Spring Data MongoDB version '%s'.", versionString));
+			LOGGER.debug("Cannot read Spring Data MongoDB version '{}'.", versionString);
 		}
 
 		return FALLBACK_VERSION;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.
@@ -16,13 +16,12 @@
 package org.springframework.data.mongodb;
 
 import org.springframework.dao.UncategorizedDataAccessException;
-import org.springframework.lang.Nullable;
 
 public class UncategorizedMongoDbException extends UncategorizedDataAccessException {
 
 	private static final long serialVersionUID = -2336595514062364929L;
 
-	public UncategorizedMongoDbException(String msg, @Nullable Throwable cause) {
+	public UncategorizedMongoDbException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessor.java

@@ -1,107 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.MemberCategory;
-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,
-								MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS);
-					}
-				});
-	}
-
-	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;
-	}
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotPredicates.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.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.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * @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 = (lib) -> ReactiveWrappers.isAvailable(lib);
-	public static final Predicate<ClassLoader> IS_SYNC_CLIENT_PRESENT = (classLoader) -> ClassUtils.isPresent("com.mongodb.client.MongoClient", classLoader);
-
-	public static boolean isReactorPresent() {
-		return IS_REACTIVE_LIBARARY_AVAILABLE.test(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
-	}
-
-	public static boolean isSyncClientPresent(@Nullable ClassLoader classLoader) {
-		return IS_SYNC_CLIENT_PRESENT.test(classLoader);
-	}
-
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoManagedTypesBeanRegistrationAotProcessor.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.generate.GenerationContext;
-import org.springframework.core.ResolvableType;
-import org.springframework.data.aot.ManagedTypesBeanRegistrationAotProcessor;
-import org.springframework.data.mongodb.MongoManagedTypes;
-import org.springframework.lang.Nullable;
-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);
-	}
-}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java

@@ -1,83 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.*;
-
-import java.util.Arrays;
-
-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.lang.Nullable;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@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);
-
-		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"));
-		}
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -25,7 +25,9 @@ import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.lang.Nullable;
 
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoClientSettings.Builder;
@@ -78,12 +80,30 @@ public abstract class AbstractMongoClientConfiguration extends MongoConfiguratio
 		return new SimpleMongoClientDatabaseFactory(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();
+	}
+
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)
+	 * @see #mongoMappingContext(MongoCustomConversions)
 	 * @see #mongoDbFactory()
 	 */
 	@Bean

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-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.
@@ -84,10 +84,10 @@ public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurat
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #reactiveMongoDbFactory()} and
-	 * {@link #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)
+	 * @see #mongoMappingContext(MongoCustomConversions)
 	 * @see #reactiveMongoDbFactory()
 	 * @return never {@literal null}.
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.
@@ -30,6 +30,10 @@ import com.mongodb.ConnectionString;
  */
 public class ConnectionStringPropertyEditor extends PropertyEditorSupport {
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
 	@Override
 	public void setAsText(@Nullable String connectionString) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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.
@@ -34,6 +34,10 @@ import org.w3c.dom.Element;
  */
 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 {
@@ -42,6 +46,10 @@ class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 		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) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -80,7 +80,7 @@ import org.w3c.dom.Element;
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator",
+	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
 	/* (non-Javadoc)
@@ -253,7 +253,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 				&& 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;
 		}
@@ -374,6 +374,10 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 			this.delegates = new HashSet<>(Arrays.asList(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 {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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.
@@ -47,16 +47,28 @@ public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinit
 	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) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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.
@@ -18,10 +18,11 @@ package org.springframework.data.mongodb.config;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.Ordered;
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
@@ -35,42 +36,68 @@ import org.springframework.util.Assert;
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Mark Paluch
- * @author Christoph Strobl
  */
-class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport implements Ordered {
+class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
+	/*
+	 * (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
-	protected void postProcess(BeanDefinitionBuilder builder, AuditingConfiguration configuration,
-			BeanDefinitionRegistry registry) {
+	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
 
-		builder.setFactoryMethod("from").addConstructorArgReference("mongoMappingContext");
+		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+
+		super.registerBeanDefinitions(annotationMetadata, registry);
 	}
 
+	/*
+	 * (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");
+		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
 
-		return configureDefaultAuditHandlerAttributes(configuration,
-				BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class));
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
+
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
+		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+
+		builder.addConstructorArgValue(definition.getBeanDefinition());
+		return configureDefaultAuditHandlerAttributes(configuration, builder);
 	}
 
+	/*
+	 * (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);
@@ -81,8 +108,4 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport impl
 				AuditingEntityCallback.class.getName(), registry);
 	}
 
-	@Override
-	public int getOrder() {
-		return Ordered.LOWEST_PRECEDENCE;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.
@@ -35,6 +35,10 @@ import org.w3c.dom.Element;
  */
 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);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-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.
@@ -30,7 +30,6 @@ 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;
@@ -77,13 +76,14 @@ public abstract class MongoConfigurationSupport {
 	 *
 	 * @see #getMappingBasePackages()
 	 * @return
+	 * @throws ClassNotFoundException
 	 */
 	@Bean
-	public MongoMappingContext mongoMappingContext(MongoCustomConversions customConversions,
-			MongoManagedTypes mongoManagedTypes) {
+	public MongoMappingContext mongoMappingContext(MongoCustomConversions customConversions)
+			throws ClassNotFoundException {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setManagedTypes(mongoManagedTypes);
+		mappingContext.setInitialEntitySet(getInitialEntitySet());
 		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
 		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
 		mappingContext.setAutoIndexCreation(autoIndexCreation());
@@ -91,16 +91,6 @@ public abstract class MongoConfigurationSupport {
 		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
@@ -206,7 +196,7 @@ public abstract class MongoConfigurationSupport {
 	 * {@link org.springframework.data.mongodb.core.index.IndexDefinition} from the entity or not.
 	 *
 	 * @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}.
+	 *         <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() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.
@@ -51,6 +51,10 @@ 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 {
 
@@ -117,7 +121,7 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 								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 {
@@ -194,7 +198,7 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 			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]);
@@ -209,21 +213,21 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 
 		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!");
 		}
 	}
 
@@ -231,7 +235,7 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 		try {
 			return URLDecoder.decode(it, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
-			throw new IllegalArgumentException("o_O UTF-8 not supported", e);
+			throw new IllegalArgumentException("o_O UTF-8 not supported!", e);
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -62,6 +62,10 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		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 {
@@ -70,6 +74,10 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 		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) {
 
@@ -163,7 +171,7 @@ public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
 		if (element.getAttributes().getLength() > allowedAttributesCount) {
 
-			parserContext.getReaderContext().error("Configure either MongoDB " + type + " or details individually",
+			parserContext.getReaderContext().error("Configure either MongoDB " + type + " or details individually!",
 					parserContext.extractSource(element));
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -26,6 +26,10 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
+	 */
 	public void init() {
 
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -40,6 +40,7 @@ import org.w3c.dom.Element;
  * @author Christoph Strobl
  * @author Mark Paluch
  */
+@SuppressWarnings("deprecation")
 abstract class MongoParsingUtils {
 
 	private MongoParsingUtils() {}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -39,6 +39,10 @@ import org.w3c.dom.Element;
  */
 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 {
@@ -47,6 +51,10 @@ class MongoTemplateParser extends AbstractBeanDefinitionParser {
 		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) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-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.
@@ -41,11 +41,19 @@ public class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEnti
 		this.converter = converter;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObject()
+	 */
 	@Override
 	public PersistentEntities getObject() {
 		return PersistentEntities.of(converter.getMappingContext());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
 	@Override
 	public Class<?> getObjectType() {
 		return PersistentEntities.class;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-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.
@@ -18,9 +18,11 @@ package org.springframework.data.mongodb.config;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.auditing.ReactiveIsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
@@ -32,42 +34,56 @@ 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 {
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation()
+	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableReactiveMongoAuditing.class;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName()
+	 */
 	@Override
 	protected String getAuditingHandlerBeanName() {
 		return "reactiveMongoAuditingHandler";
 	}
 
-	@Override
-	protected void postProcess(BeanDefinitionBuilder builder, AuditingConfiguration configuration,
-			BeanDefinitionRegistry 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");
+		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
 
-		return configureDefaultAuditHandlerAttributes(configuration,
-				BeanDefinitionBuilder.rootBeanDefinition(ReactiveIsNewAwareAuditingHandler.class));
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveIsNewAwareAuditingHandler.class);
+
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
+		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+
+		builder.addConstructorArgValue(definition.getBeanDefinition());
+		return configureDefaultAuditHandlerAttributes(configuration, builder);
 	}
 
+	/*
+	 * (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 builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.
@@ -32,6 +32,10 @@ import com.mongodb.ReadConcernLevel;
  */
 public class ReadConcernPropertyEditor extends PropertyEditorSupport {
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
+	 */
 	@Override
 	public void setAsText(@Nullable String readConcernString) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.
@@ -29,6 +29,10 @@ import com.mongodb.ReadPreference;
  */
 public class ReadPreferencePropertyEditor extends PropertyEditorSupport {
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
 	@Override
 	public void setAsText(@Nullable String readPreferenceString) throws IllegalArgumentException {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -21,8 +21,8 @@ import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -43,9 +43,13 @@ 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 %s '%s'; Check your replica set configuration";
-	private static final Log LOG = LogFactory.getLog(ServerAddressPropertyEditor.class);
+	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);
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
 	@Override
 	public void setAsText(@Nullable String replicaSetString) {
 
@@ -68,7 +72,7 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
 		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 +88,14 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	private ServerAddress parseServerAddress(String source) {
 
 		if (!StringUtils.hasText(source)) {
-			if(LOG.isWarnEnabled()) {
-				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source));
-			}
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
 			return null;
 		}
 
 		String[] hostAndPort = extractHostAddressAndPort(source.trim());
 
 		if (hostAndPort.length > 2) {
-			if(LOG.isWarnEnabled()) {
-				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source));
-			}
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
 			return null;
 		}
 
@@ -105,13 +105,9 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 
 			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
 		} catch (UnknownHostException e) {
-			if(LOG.isWarnEnabled()) {
-				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]));
-			}
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
 		} catch (NumberFormatException e) {
-			if(LOG.isWarnEnabled()) {
-				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]));
-			}
+			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
 		}
 
 		return null;
@@ -125,7 +121,7 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	 */
 	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];

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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.
@@ -26,6 +26,10 @@ import com.mongodb.WriteConcern;
  */
 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);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-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.
@@ -29,6 +29,10 @@ import org.springframework.util.StringUtils;
  */
 public class UUidRepresentationPropertyEditor extends PropertyEditorSupport {
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
 	@Override
 	public void setAsText(@Nullable String value) {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -22,16 +24,23 @@ import java.util.stream.Collectors;
 import org.bson.Document;
 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.AggregationOptions.DomainTypeMapping;
+import org.springframework.data.mongodb.core.aggregation.CountOperation;
 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.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.data.util.Lazy;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Utility methods to map {@link org.springframework.data.mongodb.core.aggregation.Aggregation} pipeline definitions and
@@ -95,9 +104,14 @@ class AggregationUtil {
 	 * @return
 	 */
 	List<Document> createPipeline(Aggregation aggregation, AggregationOperationContext context) {
+
+		if (ObjectUtils.nullSafeEquals(context, Aggregation.DEFAULT_CONTEXT)) {
 			return aggregation.toPipeline(context);
 		}
 
+		return mapAggregationPipeline(aggregation.toPipeline(context));
+	}
+
 	/**
 	 * Extract the command and map the aggregation pipeline.
 	 *
@@ -106,7 +120,16 @@ class AggregationUtil {
 	 * @return
 	 */
 	Document createCommand(String collection, Aggregation aggregation, AggregationOperationContext context) {
-		return aggregation.toDocument(collection, 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;
 	}
 
 	private List<Document> mapAggregationPipeline(List<Document> pipeline) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.
@@ -19,30 +19,16 @@ import java.util.List;
 
 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. 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
+ * 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
  * {@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
@@ -85,19 +71,7 @@ public interface BulkOperations {
 	 * @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}.
-	 * @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, UpdateDefinition update);
+	BulkOperations updateOne(Query query, Update update);
 
 	/**
 	 * Add a list of updates to the bulk operation. For each update request, only the first matching document is updated.
@@ -105,7 +79,7 @@ public interface BulkOperations {
 	 * @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, UpdateDefinition>> updates);
+	BulkOperations updateOne(List<Pair<Query, Update>> updates);
 
 	/**
 	 * Add a single update to the bulk operation. For the update request, all matching documents are updated.
@@ -114,19 +88,7 @@ public interface BulkOperations {
 	 * @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.
-	 *
-	 * @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, UpdateDefinition update);
+	BulkOperations updateMulti(Query query, Update update);
 
 	/**
 	 * Add a list of updates to the bulk operation. For each update request, all matching documents are updated.
@@ -134,7 +96,7 @@ public interface BulkOperations {
 	 * @param updates Update operations to perform.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
 	 */
-	BulkOperations updateMulti(List<Pair<Query, UpdateDefinition>> updates);
+	BulkOperations updateMulti(List<Pair<Query, Update>> updates);
 
 	/**
 	 * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty,
@@ -144,20 +106,7 @@ public interface BulkOperations {
 	 * @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,
-	 * 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}.
-	 * @since 4.1
-	 */
-	BulkOperations upsert(Query query, UpdateDefinition update);
+	BulkOperations upsert(Query query, Update update);
 
 	/**
 	 * Add a list of upserts to the bulk operation. An upsert is an update if the set of matching documents is not empty,
@@ -189,7 +138,7 @@ public interface BulkOperations {
 	 *
 	 * @param query Update criteria.
 	 * @param replacement the replacement document. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replacement added, will never be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
 	 * @since 2.2
 	 */
 	default BulkOperations replaceOne(Query query, Object replacement) {
@@ -202,7 +151,7 @@ public interface BulkOperations {
 	 * @param query Update criteria.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replacement added, will never be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
 	 * @since 2.2
 	 */
 	BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options);

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

@@ -1,221 +0,0 @@
-/*
- * Copyright 2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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) {
-
-			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());
-		}
-
-		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.
-	 * @return new instance of {@link UpdateOptions}.
-	 */
-	protected static UpdateOptions computeUpdateOptions(Query filterQuery, UpdateDefinition update, boolean upsert) {
-
-		UpdateOptions options = new UpdateOptions();
-		options.upsert(upsert);
-
-		if (update.hasArrayFilters()) {
-			List<Document> list = new ArrayList<>(update.getArrayFilters().size());
-			for (ArrayFilter arrayFilter : update.getArrayFilters()) {
-				list.add(arrayFilter.asDocument());
-			}
-			options.arrayFilters(list);
-		}
-
-		filterQuery.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
-		return options;
-	}
-
-	/**
-	 * Value object chaining together an actual source with its {@link WriteModel} representation.
-	 *
-	 * @author Christoph Strobl
-	 */
-	record SourceAwareWriteModelHolder(Object source, WriteModel<Document> model) {
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -36,29 +36,21 @@ import com.mongodb.client.model.changestream.OperationType;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Myroslav Kosinskyi
  * @since 2.1
  */
 public class ChangeStreamEvent<T> {
 
 	@SuppressWarnings("rawtypes") //
-	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 static final AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> CONVERTED_UPDATER = AtomicReferenceFieldUpdater
+			.newUpdater(ChangeStreamEvent.class, Object.class, "converted");
 
 	private final @Nullable ChangeStreamDocument<Document> raw;
 
 	private final Class<T> targetType;
 	private final MongoConverter converter;
 
-	// accessed through CONVERTED_FULL_DOCUMENT_UPDATER.
-	private volatile @Nullable T convertedFullDocument;
-
-	// accessed through CONVERTED_FULL_DOCUMENT_BEFORE_CHANGE_UPDATER.
-	private volatile @Nullable T convertedFullDocumentBeforeChange;
+	// accessed through CONVERTED_UPDATER.
+	private volatile @Nullable T converted;
 
 	/**
 	 * @param raw can be {@literal null}.
@@ -155,43 +147,27 @@ public class ChangeStreamEvent<T> {
 	@Nullable
 	public T getBody() {
 
-		if (raw == null || raw.getFullDocument() == null) {
+		if (raw == null) {
 			return null;
 		}
 
-		return getConvertedFullDocument(raw.getFullDocument());
+		Document fullDocument = raw.getFullDocument();
+
+		if (fullDocument == null) {
+			return targetType.cast(fullDocument);
 		}
 
-	/**
-	 * 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
-	 */
-	@Nullable
-	public T getBodyBeforeChange() {
-
-		if (raw == null || raw.getFullDocumentBeforeChange() == null) {
-			return null;
-		}
-
-		return getConvertedFullDocumentBeforeChange(raw.getFullDocumentBeforeChange());
+		return getConverted(fullDocument);
 	}
 
 	@SuppressWarnings("unchecked")
-	private T getConvertedFullDocumentBeforeChange(Document fullDocument) {
-		return (T) doGetConverted(fullDocument, CONVERTED_FULL_DOCUMENT_BEFORE_CHANGE_UPDATER);
+	private T getConverted(Document fullDocument) {
+		return (T) doGetConverted(fullDocument);
 	}
 
-	@SuppressWarnings("unchecked")
-	private T getConvertedFullDocument(Document fullDocument) {
-		return (T) doGetConverted(fullDocument, CONVERTED_FULL_DOCUMENT_UPDATER);
-	}
+	private Object doGetConverted(Document fullDocument) {
 
-	private Object doGetConverted(Document fullDocument, AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> updater) {
-
-		Object result = updater.get(this);
+		Object result = CONVERTED_UPDATER.get(this);
 
 		if (result != null) {
 			return result;
@@ -200,26 +176,30 @@ public class ChangeStreamEvent<T> {
 		if (ClassUtils.isAssignable(Document.class, fullDocument.getClass())) {
 
 			result = converter.read(targetType, fullDocument);
-			return updater.compareAndSet(this, null, result) ? result : updater.get(this);
+			return CONVERTED_UPDATER.compareAndSet(this, null, result) ? result : CONVERTED_UPDATER.get(this);
 		}
 
 		if (converter.getConversionService().canConvert(fullDocument.getClass(), targetType)) {
 
 			result = converter.getConversionService().convert(fullDocument, targetType);
-			return updater.compareAndSet(this, null, result) ? result : updater.get(this);
+			return CONVERTED_UPDATER.compareAndSet(this, null, result) ? result : CONVERTED_UPDATER.get(this);
 		}
 
 		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) {
+	public boolean equals(Object o) {
 
 		if (this == o)
 			return true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -32,7 +32,6 @@ 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
@@ -41,7 +40,6 @@ import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @author Myroslav Kosinskyi
  * @since 2.1
  */
 public class ChangeStreamOptions {
@@ -49,7 +47,6 @@ 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;
@@ -77,14 +74,6 @@ public class ChangeStreamOptions {
 		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.
 	 */
@@ -150,21 +139,21 @@ public class ChangeStreamOptions {
 			return timestamp;
 		}
 
-		if (timestamp instanceof Instant instant) {
-			return new BsonTimestamp((int) instant.getEpochSecond(), 0);
+		if (timestamp instanceof Instant) {
+			return new BsonTimestamp((int) ((Instant) timestamp).getEpochSecond(), 0);
 		}
 
-		if (timestamp instanceof BsonTimestamp bsonTimestamp) {
-			return Instant.ofEpochSecond(bsonTimestamp.getTime());
+		if (timestamp instanceof BsonTimestamp) {
+			return Instant.ofEpochSecond(((BsonTimestamp) timestamp).getTime());
 		}
 
 		throw new IllegalArgumentException(
-				"o_O that should actually not happen; The timestamp should be an Instant or a BsonTimestamp but was "
+				"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) {
+	public boolean equals(Object o) {
 		if (this == o)
 			return true;
 		if (o == null || getClass() != o.getClass())
@@ -181,9 +170,6 @@ public class ChangeStreamOptions {
 		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;
 		}
@@ -198,7 +184,6 @@ public class ChangeStreamOptions {
 		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);
@@ -235,7 +220,6 @@ 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;
@@ -250,7 +234,7 @@ public class ChangeStreamOptions {
 		 */
 		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;
@@ -274,7 +258,7 @@ public class ChangeStreamOptions {
 		 */
 		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;
@@ -303,7 +287,7 @@ public class ChangeStreamOptions {
 		 */
 		public ChangeStreamOptionsBuilder resumeToken(BsonValue resumeToken) {
 
-			Assert.notNull(resumeToken, "ResumeToken must not be null");
+			Assert.notNull(resumeToken, "ResumeToken must not be null!");
 
 			this.resumeToken = resumeToken;
 
@@ -332,38 +316,12 @@ public class ChangeStreamOptions {
 		 */
 		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
-		 */
-		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.
 		 *
@@ -372,7 +330,7 @@ public class ChangeStreamOptions {
 		 */
 		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;
@@ -387,7 +345,7 @@ public class ChangeStreamOptions {
 		 */
 		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;
@@ -433,7 +391,6 @@ public class ChangeStreamOptions {
 			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;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.
@@ -26,7 +26,6 @@ import org.springframework.data.mongodb.core.validation.Validator;
 import org.springframework.data.util.Optionals;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.ValidationAction;
 import com.mongodb.client.model.ValidationLevel;
@@ -47,11 +46,24 @@ public class CollectionOptions {
 	private @Nullable Collation collation;
 	private ValidationOptions validationOptions;
 	private @Nullable TimeSeriesOptions timeSeriesOptions;
-	private @Nullable CollectionChangeStreamOptions changeStreamOptions;
+
+	/**
+	 * 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(), null);
+	}
 
 	private CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped,
-			@Nullable Collation collation, ValidationOptions validationOptions, @Nullable TimeSeriesOptions timeSeriesOptions,
-			@Nullable CollectionChangeStreamOptions changeStreamOptions) {
+			@Nullable Collation collation, ValidationOptions validationOptions,
+			@Nullable TimeSeriesOptions timeSeriesOptions) {
 
 		this.maxDocuments = maxDocuments;
 		this.size = size;
@@ -59,7 +71,6 @@ public class CollectionOptions {
 		this.collation = collation;
 		this.validationOptions = validationOptions;
 		this.timeSeriesOptions = timeSeriesOptions;
-		this.changeStreamOptions = changeStreamOptions;
 	}
 
 	/**
@@ -71,9 +82,9 @@ public class CollectionOptions {
 	 */
 	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(), null, null);
+		return new CollectionOptions(null, null, null, collation, ValidationOptions.none(), null);
 	}
 
 	/**
@@ -83,7 +94,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public static CollectionOptions empty() {
-		return new CollectionOptions(null, null, null, null, ValidationOptions.none(), null, null);
+		return new CollectionOptions(null, null, null, null, ValidationOptions.none(), null);
 	}
 
 	/**
@@ -100,28 +111,15 @@ public class CollectionOptions {
 		return empty().timeSeries(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 already given settings and capped set to {@literal true}. <br />
-	 * <strong>NOTE:</strong> Using capped collections requires defining {@link #size(long)}.
+	 * <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, timeSeriesOptions,
-				changeStreamOptions);
+		return new CollectionOptions(size, maxDocuments, true, collation, validationOptions, null);
 	}
 
 	/**
@@ -132,8 +130,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions maxDocuments(long maxDocuments) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
-				changeStreamOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions);
 	}
 
 	/**
@@ -144,8 +141,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions size(long size) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
-				changeStreamOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions);
 	}
 
 	/**
@@ -156,8 +152,7 @@ public class CollectionOptions {
 	 * @since 2.0
 	 */
 	public CollectionOptions collation(@Nullable Collation collation) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
-				changeStreamOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions);
 	}
 
 	/**
@@ -249,7 +244,7 @@ public class CollectionOptions {
 	 */
 	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));
 	}
 
@@ -263,7 +258,7 @@ public class CollectionOptions {
 	 */
 	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));
 	}
 
@@ -276,9 +271,8 @@ public class CollectionOptions {
 	 */
 	public CollectionOptions validation(ValidationOptions validationOptions) {
 
-		Assert.notNull(validationOptions, "ValidationOptions must not be null");
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
-				changeStreamOptions);
+		Assert.notNull(validationOptions, "ValidationOptions must not be null!");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions);
 	}
 
 	/**
@@ -290,23 +284,8 @@ public class CollectionOptions {
 	 */
 	public CollectionOptions timeSeries(TimeSeriesOptions timeSeriesOptions) {
 
-		Assert.notNull(timeSeriesOptions, "TimeSeriesOptions must not be null");
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
-				changeStreamOptions);
-	}
-
-	/**
-	 * 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);
+		Assert.notNull(timeSeriesOptions, "TimeSeriesOptions must not be null!");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions);
 	}
 
 	/**
@@ -367,70 +346,6 @@ public class CollectionOptions {
 		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);
-	}
-
-	@Override
-	public String toString() {
-		return "CollectionOptions{" + "maxDocuments=" + maxDocuments + ", size=" + size + ", capped=" + capped
-				+ ", collation=" + collation + ", validationOptions=" + validationOptions + ", timeSeriesOptions="
-				+ timeSeriesOptions + ", changeStreamOptions=" + changeStreamOptions + ", 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;
-		}
-		return ObjectUtils.nullSafeEquals(changeStreamOptions, that.changeStreamOptions);
-	}
-
-	@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);
-		return result;
-	}
-
 	/**
 	 * Encapsulation of ValidationOptions options.
 	 *
@@ -525,92 +440,6 @@ public class CollectionOptions {
 		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 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);
-		}
 	}
 
 	/**
@@ -631,7 +460,7 @@ public class CollectionOptions {
 
 		private TimeSeriesOptions(String timeField, @Nullable String metaField, GranularityDefinition granularity) {
 
-			Assert.hasText(timeField, "Time field must not be empty or null");
+			Assert.hasText(timeField, "Time field must not be empty or null!");
 
 			this.timeField = timeField;
 			this.metaField = metaField;
@@ -696,40 +525,5 @@ public class CollectionOptions {
 		public GranularityDefinition getGranularity() {
 			return granularity;
 		}
-
-		@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;
-		}
 	}
 }

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

@@ -1,61 +0,0 @@
-/*
- * Copyright 2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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));
-	}
-
-}

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

@@ -1,182 +0,0 @@
-/*
- * Copyright 2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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 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 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 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);
-		}
-
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 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.
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.bson.Document;
+
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.core.query.MetricConversion;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
@@ -38,7 +38,7 @@ import org.springframework.util.ObjectUtils;
  */
 class CountQuery {
 
-	private final Document source;
+	private Document source;
 
 	private CountQuery(Document source) {
 		this.source = source;
@@ -64,15 +64,18 @@ class CountQuery {
 
 		for (Map.Entry<String, Object> entry : source.entrySet()) {
 
-			if (entry.getValue() instanceof Document document && requiresRewrite(entry.getValue())) {
+			if (entry.getValue() instanceof Document && requiresRewrite(entry.getValue())) {
 
-				target.putAll(createGeoWithin(entry.getKey(), document, source.get("$and")));
+				Document theValue = (Document) entry.getValue();
+				target.putAll(createGeoWithin(entry.getKey(), theValue, source.get("$and")));
 				continue;
 			}
 
-			if (entry.getValue() instanceof Collection<?> collection && requiresRewrite(entry.getValue())) {
+			if (entry.getValue() instanceof Collection && requiresRewrite(entry.getValue())) {
 
-				target.put(entry.getKey(), rewriteCollection(collection));
+				Collection<?> source = (Collection<?>) entry.getValue();
+
+				target.put(entry.getKey(), rewriteCollection(source));
 				continue;
 			}
 
@@ -93,12 +96,12 @@ class CountQuery {
 	 */
 	private boolean requiresRewrite(Object valueToInspect) {
 
-		if (valueToInspect instanceof Document document) {
-			return requiresRewrite(document);
+		if (valueToInspect instanceof Document) {
+			return requiresRewrite((Document) valueToInspect);
 		}
 
-		if (valueToInspect instanceof Collection<?> collection) {
-			return requiresRewrite(collection);
+		if (valueToInspect instanceof Collection) {
+			return requiresRewrite((Collection) valueToInspect);
 		}
 
 		return false;
@@ -107,7 +110,7 @@ class CountQuery {
 	private boolean requiresRewrite(Collection<?> collection) {
 
 		for (Object o : collection) {
-			if (o instanceof Document document && requiresRewrite(document)) {
+			if (o instanceof Document && requiresRewrite((Document) o)) {
 				return true;
 			}
 		}
@@ -136,8 +139,8 @@ class CountQuery {
 		Collection<Object> rewrittenCollection = new ArrayList<>(source.size());
 
 		for (Object item : source) {
-			if (item instanceof Document document && requiresRewrite(item)) {
-				rewrittenCollection.add(CountQuery.of(document).toQueryDocument());
+			if (item instanceof Document && requiresRewrite(item)) {
+				rewrittenCollection.add(CountQuery.of((Document) item).toQueryDocument());
 			} else {
 				rewrittenCollection.add(item);
 			}
@@ -154,14 +157,12 @@ class CountQuery {
 	 * @param $and potentially existing {@code $and} condition.
 	 * @return the rewritten query {@link Document}.
 	 */
-	@SuppressWarnings("unchecked")
 	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 = getMaxDistance(source, $near, spheric);
-
+		Number maxDistance = source.containsKey("$maxDistance") ? (Number) source.get("$maxDistance") : Double.MAX_VALUE;
 		List<Object> $centerMax = Arrays.asList(toCenterCoordinates($near), maxDistance);
 		Document $geoWithinMax = new Document("$geoWithin",
 				new Document(spheric ? "$centerSphere" : "$center", $centerMax));
@@ -179,12 +180,12 @@ class CountQuery {
 
 		if ($and != null) {
 			if ($and instanceof Collection) {
-				Collection<Document> andElements = (Collection<Document>) $and;
+				Collection andElements = (Collection) $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 {
@@ -193,33 +194,9 @@ class CountQuery {
 
 		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");
 	}
@@ -239,20 +216,14 @@ class CountQuery {
 			return value;
 		}
 
-		if (value instanceof Point point) {
-			return Arrays.asList(point.getX(), point.getY());
+		if (value instanceof Point) {
+			return Arrays.asList(((Point) value).getX(), ((Point) value).getY());
 		}
 
-		if (value instanceof Document document) {
+		if (value instanceof Document && ((Document) value).containsKey("x")) {
 
-			if (document.containsKey("x")) {
-				return Arrays.asList(document.get("x"), document.get("y"));
-			}
-
-			if (document.containsKey("$geometry")) {
-				Document geoJsonPoint = document.get("$geometry", Document.class);
-				return geoJsonPoint.get("coordinates");
-			}
+			Document point = (Document) value;
+			return Arrays.asList(point.get("x"), point.get("y"));
 		}
 
 		return value;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -61,8 +61,8 @@ public interface CursorPreparer extends ReadPreferenceAware {
 	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());

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.
@@ -16,47 +16,42 @@
 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.springframework.context.ApplicationEvent;
+import org.bson.conversions.Bson;
 import org.springframework.context.ApplicationEventPublisher;
 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.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.mapping.event.MongoMappingEvent;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
 import org.springframework.data.util.Pair;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.WriteConcern;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.MongoCollection;
-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;
+import com.mongodb.client.model.*;
 
 /**
  * Default implementation for {@link BulkOperations}.
@@ -72,7 +67,7 @@ import com.mongodb.client.model.WriteModel;
  * @author Jacob Botuck
  * @since 1.9
  */
-class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperations {
+class DefaultBulkOperations implements BulkOperations {
 
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
@@ -80,6 +75,7 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 	private final List<SourceAwareWriteModelHolder> models = new ArrayList<>();
 
 	private @Nullable WriteConcern defaultWriteConcern;
+
 	private BulkWriteOptions bulkOptions;
 
 	/**
@@ -94,15 +90,14 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 	DefaultBulkOperations(MongoOperations mongoOperations, String collectionName,
 			BulkOperationContext 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");
+		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());
+		this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
 	}
 
 	/**
@@ -114,10 +109,14 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		this.defaultWriteConcern = defaultWriteConcern;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object)
+	 */
 	@Override
 	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);
@@ -126,65 +125,93 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List)
+	 */
 	@Override
 	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
-	public BulkOperations updateOne(Query query, UpdateDefinition update) {
+	@SuppressWarnings("unchecked")
+	public BulkOperations updateOne(Query query, Update 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 update(query, update, false, false);
+		return updateOne(Collections.singletonList(Pair.of(query, update)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(java.util.List)
+	 */
 	@Override
-	public BulkOperations updateOne(List<Pair<Query, UpdateDefinition>> updates) {
+	public BulkOperations updateOne(List<Pair<Query, Update>> updates) {
 
-		Assert.notNull(updates, "Updates must not be null");
+		Assert.notNull(updates, "Updates must not be null!");
 
-		for (Pair<Query, UpdateDefinition> update : updates) {
+		for (Pair<Query, Update> 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
-	public BulkOperations updateMulti(Query query, UpdateDefinition update) {
+	@SuppressWarnings("unchecked")
+	public BulkOperations updateMulti(Query query, Update 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 this;
+		return updateMulti(Collections.singletonList(Pair.of(query, update)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(java.util.List)
+	 */
 	@Override
-	public BulkOperations updateMulti(List<Pair<Query, UpdateDefinition>> updates) {
+	public BulkOperations updateMulti(List<Pair<Query, Update>> updates) {
 
-		Assert.notNull(updates, "Updates must not be null");
+		Assert.notNull(updates, "Updates must not be null!");
 
-		for (Pair<Query, UpdateDefinition> update : updates) {
+		for (Pair<Query, Update> 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, UpdateDefinition update) {
+	public BulkOperations upsert(Query query, Update update) {
 		return update(query, update, true, true);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(java.util.List)
+	 */
 	@Override
 	public BulkOperations upsert(List<Pair<Query, Update>> updates) {
 
@@ -195,10 +222,14 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(org.springframework.data.mongodb.core.query.Query)
+	 */
 	@Override
 	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);
@@ -208,10 +239,14 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List)
+	 */
 	@Override
 	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);
@@ -220,12 +255,16 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#replaceOne(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions)
+	 */
 	@Override
 	public BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) {
 
-		Assert.notNull(query, "Query must not be null");
-		Assert.notNull(replacement, "Replacement must not be null");
-		Assert.notNull(options, "Options must not be null");
+		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());
@@ -239,6 +278,10 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
+	 */
 	@Override
 	public com.mongodb.bulk.BulkWriteResult execute() {
 
@@ -246,14 +289,14 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 
 			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.bulkMode());
+			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
 		}
 	}
 
@@ -272,8 +315,9 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 					bulkOptions);
 		} catch (RuntimeException ex) {
 
-			if (ex instanceof MongoBulkWriteException mongoBulkWriteException) {
+			if (ex instanceof MongoBulkWriteException) {
 
+				MongoBulkWriteException mongoBulkWriteException = (MongoBulkWriteException) ex;
 				if (mongoBulkWriteException.getWriteConcernError() != null) {
 					throw new DataIntegrityViolationException(ex.getMessage(), ex);
 				}
@@ -288,17 +332,17 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 
 		maybeEmitBeforeSaveEvent(it);
 
-		if (it.model() instanceof InsertOneModel<Document> model) {
+		if (it.getModel() instanceof InsertOneModel) {
 
-			Document target = model.getDocument();
-			maybeInvokeBeforeSaveCallback(it.source(), target);
-		} else if (it.model() instanceof ReplaceOneModel<Document> model) {
+			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
+			maybeInvokeBeforeSaveCallback(it.getSource(), target);
+		} else if (it.getModel() instanceof ReplaceOneModel) {
 
-			Document target = model.getReplacement();
-			maybeInvokeBeforeSaveCallback(it.source(), target);
+			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
+			maybeInvokeBeforeSaveCallback(it.getSource(), target);
 		}
 
-		return mapWriteModel(it.source(), it.model());
+		return mapWriteModel(it.getModel());
 	}
 
 	/**
@@ -310,10 +354,10 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 	 * @param multi whether to issue a multi-update.
 	 * @return the {@link BulkOperations} with the update registered.
 	 */
-	private BulkOperations update(Query query, UpdateDefinition update, boolean upsert, boolean multi) {
+	private BulkOperations update(Query query, Update 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 = computeUpdateOptions(query, update, upsert);
 
@@ -326,30 +370,53 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		return this;
 	}
 
-	@Override
-	protected void maybeEmitEvent(ApplicationEvent event) {
-		bulkOperationContext.publishEvent(event);
+	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());
 		}
 
-	@Override
-	protected UpdateMapper updateMapper() {
-		return bulkOperationContext.updateMapper();
+		if (writeModel instanceof UpdateManyModel) {
+
+			UpdateManyModel<Document> model = (UpdateManyModel<Document>) writeModel;
+
+			return new UpdateManyModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
+					model.getOptions());
 		}
 
-	@Override
-	protected QueryMapper queryMapper() {
-		return bulkOperationContext.queryMapper();
+		if (writeModel instanceof DeleteOneModel) {
+
+			DeleteOneModel<Document> model = (DeleteOneModel<Document>) writeModel;
+
+			return new DeleteOneModel<>(getMappedQuery(model.getFilter()), model.getOptions());
 		}
 
-	@Override
-	protected Optional<? extends MongoPersistentEntity<?>> entity() {
-		return bulkOperationContext.entity();
+		if (writeModel instanceof DeleteManyModel) {
+
+			DeleteManyModel<Document> model = (DeleteManyModel<Document>) writeModel;
+
+			return new DeleteManyModel<>(getMappedQuery(model.getFilter()), model.getOptions());
+		}
+
+		return writeModel;
+	}
+
+	private Bson getMappedUpdate(Bson update) {
+		return bulkOperationContext.getUpdateMapper().getMappedObject(update, bulkOperationContext.getEntity());
+	}
+
+	private Bson getMappedQuery(Bson query) {
+		return bulkOperationContext.getQueryMapper().getMappedObject(query, bulkOperationContext.getEntity());
 	}
 
 	private Document getMappedObject(Object source) {
 
-		if (source instanceof Document document) {
-			return document;
+		if (source instanceof Document) {
+			return (Document) source;
 		}
 
 		Document sink = new Document();
@@ -362,83 +429,268 @@ class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperati
 		models.add(new SourceAwareWriteModelHolder(source, model));
 	}
 
+	private void maybeEmitBeforeSaveEvent(SourceAwareWriteModelHolder holder) {
+
+		if (holder.getModel() instanceof InsertOneModel) {
+
+			Document target = ((InsertOneModel<Document>) holder.getModel()).getDocument();
+			maybeEmitEvent(new BeforeSaveEvent<>(holder.getSource(), target, collectionName));
+		} else if (holder.getModel() instanceof ReplaceOneModel) {
+
+			Document target = ((ReplaceOneModel<Document>) holder.getModel()).getReplacement();
+			maybeEmitEvent(new BeforeSaveEvent<>(holder.getSource(), target, collectionName));
+		}
+	}
+
+	private void maybeEmitAfterSaveEvent(SourceAwareWriteModelHolder holder) {
+
+		if (holder.getModel() instanceof InsertOneModel) {
+
+			Document target = ((InsertOneModel<Document>) holder.getModel()).getDocument();
+			maybeEmitEvent(new AfterSaveEvent<>(holder.getSource(), target, collectionName));
+		} else if (holder.getModel() instanceof ReplaceOneModel) {
+
+			Document target = ((ReplaceOneModel<Document>) holder.getModel()).getReplacement();
+			maybeEmitEvent(new AfterSaveEvent<>(holder.getSource(), target, collectionName));
+		}
+	}
+
 	private void maybeInvokeAfterSaveCallback(SourceAwareWriteModelHolder holder) {
 
-		if (holder.model() instanceof InsertOneModel<Document> model) {
+		if (holder.getModel() instanceof InsertOneModel) {
 
-			Document target = model.getDocument();
-			maybeInvokeAfterSaveCallback(holder.source(), target);
-		} else if (holder.model() instanceof ReplaceOneModel<Document> model) {
+			Document target = ((InsertOneModel<Document>) holder.getModel()).getDocument();
+			maybeInvokeAfterSaveCallback(holder.getSource(), target);
+		} else if (holder.getModel() instanceof ReplaceOneModel) {
 
-			Document target = model.getReplacement();
-			maybeInvokeAfterSaveCallback(holder.source(), target);
+			Document target = ((ReplaceOneModel<Document>) holder.getModel()).getReplacement();
+			maybeInvokeAfterSaveCallback(holder.getSource(), target);
 		}
 	}
 
-	private void publishEvent(MongoMappingEvent<?> event) {
-		bulkOperationContext.publishEvent(event);
+	private <E extends MongoMappingEvent<T>, T> E maybeEmitEvent(E event) {
+
+		if (bulkOperationContext.getEventPublisher() == null) {
+			return event;
+		}
+
+		bulkOperationContext.getEventPublisher().publishEvent(event);
+		return event;
 	}
 
 	private Object maybeInvokeBeforeConvertCallback(Object value) {
-		return bulkOperationContext.callback(BeforeConvertCallback.class, value, collectionName);
+
+		if (bulkOperationContext.getEntityCallbacks() == null) {
+			return value;
+		}
+
+		return bulkOperationContext.getEntityCallbacks().callback(BeforeConvertCallback.class, value, collectionName);
 	}
 
 	private Object maybeInvokeBeforeSaveCallback(Object value, Document mappedDocument) {
-		return bulkOperationContext.callback(BeforeSaveCallback.class, value, mappedDocument, collectionName);
+
+		if (bulkOperationContext.getEntityCallbacks() == null) {
+			return value;
+		}
+
+		return bulkOperationContext.getEntityCallbacks().callback(BeforeSaveCallback.class, value, mappedDocument,
+				collectionName);
 	}
 
 	private Object maybeInvokeAfterSaveCallback(Object value, Document mappedDocument) {
-		return bulkOperationContext.callback(AfterSaveCallback.class, value, mappedDocument, collectionName);
+
+		if (bulkOperationContext.getEntityCallbacks() == null) {
+			return value;
+		}
+
+		return bulkOperationContext.getEntityCallbacks().callback(AfterSaveCallback.class, value, mappedDocument,
+				collectionName);
+	}
+
+	private static BulkWriteOptions getBulkWriteOptions(BulkMode bulkMode) {
+
+		BulkWriteOptions options = new BulkWriteOptions();
+
+		switch (bulkMode) {
+			case ORDERED:
+				return options.ordered(true);
+			case UNORDERED:
+				return options.ordered(false);
+		}
+
+		throw new IllegalStateException("BulkMode was null!");
 	}
 
 	/**
-	 * {@link BulkOperationContext} holds information about {@link BulkMode} the entity in use as well as references to
+	 * @param filterQuery The {@link Query} to read a potential {@link Collation} from. Must not be {@literal null}.
+	 * @param update The {@link Update} to apply
+	 * @param upsert flag to indicate if document should be upserted.
+	 * @return new instance of {@link UpdateOptions}.
+	 */
+	private static UpdateOptions computeUpdateOptions(Query filterQuery, UpdateDefinition update, boolean upsert) {
+
+		UpdateOptions options = new UpdateOptions();
+		options.upsert(upsert);
+
+		if (update.hasArrayFilters()) {
+			List<Document> list = new ArrayList<>(update.getArrayFilters().size());
+			for (ArrayFilter arrayFilter : update.getArrayFilters()) {
+				list.add(arrayFilter.asDocument());
+			}
+			options.arrayFilters(list);
+		}
+
+		filterQuery.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+		return options;
+	}
+
+	/**
+	 * {@link BulkOperationContext} holds information about
+	 * {@link org.springframework.data.mongodb.core.BulkOperations.BulkMode} the entity in use as well as references to
 	 * {@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) {
+	static final class BulkOperationContext {
 
-		public boolean skipEntityCallbacks() {
-			return entityCallbacks == null;
+		private final BulkMode bulkMode;
+		private final Optional<? extends MongoPersistentEntity<?>> entity;
+		private final QueryMapper queryMapper;
+		private final UpdateMapper updateMapper;
+		private final ApplicationEventPublisher eventPublisher;
+		private final EntityCallbacks entityCallbacks;
+
+		BulkOperationContext(BulkOperations.BulkMode bulkMode, Optional<? extends MongoPersistentEntity<?>> entity,
+				QueryMapper queryMapper, UpdateMapper updateMapper, ApplicationEventPublisher eventPublisher,
+				EntityCallbacks entityCallbacks) {
+
+			this.bulkMode = bulkMode;
+			this.entity = entity;
+			this.queryMapper = queryMapper;
+			this.updateMapper = updateMapper;
+			this.eventPublisher = eventPublisher;
+			this.entityCallbacks = entityCallbacks;
 		}
 
-		public boolean skipEventPublishing() {
-			return eventPublisher == null;
+		public BulkMode getBulkMode() {
+			return this.bulkMode;
 		}
 
-		@SuppressWarnings("rawtypes")
-		public <T> T callback(Class<? extends EntityCallback> callbackType, T entity, String collectionName) {
-
-			if (skipEntityCallbacks()) {
-				return entity;
+		public Optional<? extends MongoPersistentEntity<?>> getEntity() {
+			return this.entity;
 		}
 
-			return entityCallbacks.callback(callbackType, entity, collectionName);
+		public QueryMapper getQueryMapper() {
+			return this.queryMapper;
 		}
 
-		@SuppressWarnings("rawtypes")
-		public <T> T callback(Class<? extends EntityCallback> callbackType, T entity, Document document,
-				String collectionName) {
-
-			if (skipEntityCallbacks()) {
-				return entity;
+		public UpdateMapper getUpdateMapper() {
+			return this.updateMapper;
 		}
 
-			return entityCallbacks.callback(callbackType, entity, document, collectionName);
+		public ApplicationEventPublisher getEventPublisher() {
+			return this.eventPublisher;
 		}
 
-		public void publishEvent(ApplicationEvent event) {
-
-			if (skipEventPublishing()) {
-				return;
+		public EntityCallbacks getEntityCallbacks() {
+			return this.entityCallbacks;
 		}
 
-			eventPublisher.publishEvent(event);
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			BulkOperationContext that = (BulkOperationContext) o;
+
+			if (bulkMode != that.bulkMode)
+				return false;
+			if (!ObjectUtils.nullSafeEquals(this.entity, that.entity)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(this.queryMapper, that.queryMapper)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(this.updateMapper, that.updateMapper)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(this.eventPublisher, that.eventPublisher)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(this.entityCallbacks, that.entityCallbacks);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = bulkMode != null ? bulkMode.hashCode() : 0;
+			result = 31 * result + ObjectUtils.nullSafeHashCode(entity);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(queryMapper);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(updateMapper);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(eventPublisher);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(entityCallbacks);
+			return result;
+		}
+
+		public String toString() {
+			return "DefaultBulkOperations.BulkOperationContext(bulkMode=" + this.getBulkMode() + ", entity="
+					+ this.getEntity() + ", queryMapper=" + this.getQueryMapper() + ", updateMapper=" + this.getUpdateMapper()
+					+ ", eventPublisher=" + this.getEventPublisher() + ", entityCallbacks=" + this.getEntityCallbacks() + ")";
 		}
 	}
 
+	/**
+	 * Value object chaining together an actual source with its {@link WriteModel} representation.
+	 *
+	 * @since 2.2
+	 * @author Christoph Strobl
+	 */
+	private static final class SourceAwareWriteModelHolder {
+
+		private final Object source;
+		private final WriteModel<Document> model;
+
+		SourceAwareWriteModelHolder(Object source, WriteModel<Document> model) {
+
+			this.source = source;
+			this.model = model;
+		}
+
+		public Object getSource() {
+			return this.source;
+		}
+
+		public WriteModel<Document> getModel() {
+			return this.model;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			SourceAwareWriteModelHolder that = (SourceAwareWriteModelHolder) o;
+
+			if (!ObjectUtils.nullSafeEquals(this.source, that.source)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(this.model, that.model);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(model);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(source);
+			return result;
+		}
+
+		public String toString() {
+			return "DefaultBulkOperations.SourceAwareWriteModelHolder(source=" + this.getSource() + ", model="
+					+ this.getModel() + ")";
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2023 the original author or authors.
+ * Copyright 2011-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.
@@ -22,7 +22,6 @@ import java.util.List;
 import org.bson.Document;
 import org.springframework.dao.DataAccessException;
 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;
@@ -30,7 +29,6 @@ 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;
@@ -85,9 +83,9 @@ public class DefaultIndexOperations implements IndexOperations {
 	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;
@@ -105,8 +103,8 @@ public class DefaultIndexOperations implements IndexOperations {
 	 */
 	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());
@@ -114,6 +112,10 @@ public class DefaultIndexOperations implements IndexOperations {
 		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) {
 
 		return execute(collection -> {
@@ -148,6 +150,10 @@ public class DefaultIndexOperations implements IndexOperations {
 		return null;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropIndex(java.lang.String)
+	 */
 	public void dropIndex(final String name) {
 
 		execute(collection -> {
@@ -157,24 +163,18 @@ public class DefaultIndexOperations implements IndexOperations {
 
 	}
 
-	@Override
-	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);
-		}
-	}
-
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropAllIndexes()
+	 */
 	public void dropAllIndexes() {
 		dropIndex("*");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperations#getIndexInfo()
+	 */
 	public List<IndexInfo> getIndexInfo() {
 
 		return execute(new CollectionCallback<List<IndexInfo>>() {
@@ -206,7 +206,7 @@ public class DefaultIndexOperations implements IndexOperations {
 	@Nullable
 	public <T> T execute(CollectionCallback<T> callback) {
 
-		Assert.notNull(callback, "CollectionCallback must not be null");
+		Assert.notNull(callback, "CollectionCallback must not be null!");
 
 		if (type != null) {
 			return mongoOperations.execute(type, callback);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-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.
@@ -42,6 +42,10 @@ class DefaultIndexOperationsProvider implements IndexOperationsProvider {
 		this.mapper = mapper;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.IndexOperationsProvider#reactiveIndexOps(java.lang.String)
+	 */
 	@Override
 	public IndexOperations indexOps(String collectionName, Class<?> type) {
 		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper, type);

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

@@ -1,390 +0,0 @@
-/*
- * Copyright 2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.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.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.lang.Nullable;
-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
-	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
-	public ReactiveBulkOperations insert(List<? extends Object> documents) {
-
-		Assert.notNull(documents, "Documents must not be null");
-
-		documents.forEach(this::insert);
-
-		return this;
-	}
-
-	@Override
-	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
-	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
-	public ReactiveBulkOperations upsert(Query query, UpdateDefinition update) {
-		return update(query, update, true, true);
-	}
-
-	@Override
-	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
-	public ReactiveBulkOperations remove(List<Query> removes) {
-
-		Assert.notNull(removes, "Removals must not be null");
-
-		for (Query query : removes) {
-			remove(query);
-		}
-
-		return this;
-	}
-
-	@Override
-	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());
-		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<>(getMappedQuery(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).flatMap(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);
-
-		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")
-		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")
-		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);
-		}
-
-		public void publishEvent(ApplicationEvent event) {
-
-			if (skipEventPublishing()) {
-				return;
-			}
-
-			eventPublisher.publishEvent(event);
-		}
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-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.
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.Optional;
 
 import org.bson.Document;
-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;
@@ -30,7 +29,6 @@ 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;
 
@@ -78,9 +76,9 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
 			QueryMapper queryMapper, Optional<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;
@@ -88,6 +86,10 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 		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) {
 
 		return mongoOperations.execute(collectionName, collection -> {
@@ -106,22 +108,6 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 		}).next();
 	}
 
-	@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();
-	}
-
 	@Nullable
 	private MongoPersistentEntity<?> lookupPersistentEntity(String collection) {
 
@@ -133,14 +119,26 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 				.orElse(null);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropIndex(java.lang.String)
+	 */
 	public Mono<Void> dropIndex(final String name) {
 		return mongoOperations.execute(collectionName, collection -> collection.dropIndex(name)).then();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropAllIndexes()
+	 */
 	public Mono<Void> dropAllIndexes() {
 		return dropIndex("*");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#getIndexInfo()
+	 */
 	public Flux<IndexInfo> getIndexInfo() {
 
 		return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) //

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-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.
@@ -31,6 +31,7 @@ import org.bson.types.ObjectId;
 import org.springframework.dao.DataAccessException;
 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;
@@ -64,29 +65,41 @@ 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) {
 
-		Assert.notNull(script, "Script must not be null");
+		Assert.notNull(script, "Script must not be null!");
 
 		return mongoOperations.execute(new DbCallback<Object>() {
 
@@ -102,10 +115,14 @@ class DefaultScriptOperations implements ScriptOperations {
 		});
 	}
 
+	/*
+	 * (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) {
 
-		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>() {
 
@@ -118,14 +135,22 @@ class DefaultScriptOperations implements ScriptOperations {
 		});
 	}
 
+	/*
+	 * (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);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#getScriptNames()
+	 */
 	@Override
 	public Set<String> getScriptNames() {
 
@@ -150,7 +175,7 @@ class DefaultScriptOperations implements ScriptOperations {
 			return args;
 		}
 
-		List<Object> convertedValues = new ArrayList<>(args.length);
+		List<Object> convertedValues = new ArrayList<Object>(args.length);
 
 		for (Object arg : args) {
 			convertedValues.add(arg instanceof String && quote ? String.format("'%s'", arg)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2023 the original author or authors.
+ * Copyright 2010-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-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.

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

@@ -1,60 +0,0 @@
-/*
- * Copyright 2022-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY 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.context.ApplicationEventPublisher;
-import org.springframework.lang.Nullable;
-
-/**
- * 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.
-	 */
-	public void publishEvent(Object event) {
-
-		if (canPublishEvent()) {
-			publisher.publishEvent(event);
-		}
-	}
-
-	private boolean canPublishEvent() {
-		return publisher != null && eventsEnabled;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 the original author or authors.
+ * Copyright 2018-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.
@@ -17,28 +17,20 @@ package org.springframework.data.mongodb.core;
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import org.bson.BsonNull;
 import org.bson.Document;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.convert.CustomConversions;
 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.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.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
@@ -47,13 +39,6 @@ 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.data.mongodb.core.timeseries.Granularity;
-import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.mongodb.util.BsonUtils;
-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.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -62,11 +47,6 @@ 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.
  *
@@ -82,31 +62,9 @@ class EntityOperations {
 	private static final String ID_FIELD = "_id";
 
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context;
-	private final QueryMapper queryMapper;
 
-	private final EntityProjectionIntrospector introspector;
-
-	private final MongoJsonSchemaMapper schemaMapper;
-
-	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) {
+	EntityOperations(MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
 		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);
 	}
 
 	/**
@@ -118,21 +76,17 @@ class EntityOperations {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	<T> Entity<T> forEntity(T entity) {
 
-		Assert.notNull(entity, "Bean must not be null");
-
-		if (entity instanceof TargetAware targetAware) {
-			return new SimpleMappedEntity((Map<String, Object>) targetAware.getTarget(), this);
-		}
+		Assert.notNull(entity, "Bean must not be null!");
 
 		if (entity instanceof String) {
-			return new UnmappedEntity(parse(entity.toString()), this);
+			return new UnmappedEntity(parse(entity.toString()));
 		}
 
 		if (entity instanceof Map) {
-			return new SimpleMappedEntity((Map<String, Object>) entity, this);
+			return new SimpleMappedEntity((Map<String, Object>) entity);
 		}
 
-		return MappedEntity.of(entity, context, this);
+		return MappedEntity.of(entity, context);
 	}
 
 	/**
@@ -145,18 +99,18 @@ class EntityOperations {
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	<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()), this);
+			return new UnmappedEntity(parse(entity.toString()));
 		}
 
 		if (entity instanceof Map) {
-			return new SimpleMappedEntity((Map<String, Object>) entity, this);
+			return new SimpleMappedEntity((Map<String, Object>) entity);
 		}
 
-		return AdaptibleMappedEntity.of(entity, context, conversionService, this);
+		return AdaptibleMappedEntity.of(entity, context, conversionService);
 	}
 
 	/**
@@ -181,7 +135,7 @@ class EntityOperations {
 
 		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!");
 		}
 
 		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(entityClass);
@@ -218,7 +172,7 @@ class EntityOperations {
 	 */
 	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);
 
@@ -257,12 +211,12 @@ class EntityOperations {
 		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;
 		}
@@ -282,102 +236,10 @@ class EntityOperations {
 		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()));
-			}
-
-			result.timeSeriesOptions(options);
-		});
-
-		collectionOptions.getChangeStreamOptions().ifPresent(it -> result
-				.changeStreamPreAndPostImagesOptions(new ChangeStreamPreAndPostImagesOptions(it.getPreAndPostImages())));
-
-		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> {
@@ -396,16 +258,6 @@ class EntityOperations {
 		 */
 		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.
 		 *
@@ -476,15 +328,6 @@ class EntityOperations {
 		 * @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);
-
 	}
 
 	/**
@@ -506,7 +349,7 @@ class EntityOperations {
 		T populateIdIfNecessary(@Nullable Object id);
 
 		/**
-		 * Initializes the version property of the current entity if available.
+		 * Initializes the version property of the of the current entity if available.
 		 *
 		 * @return the entity with the version property updated if available.
 		 */
@@ -532,33 +375,42 @@ class EntityOperations {
 	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) {
+		protected UnmappedEntity(T map) {
 			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 getPropertyValue(ID_FIELD);
-		}
-
-		@Override
-		public Object getPropertyValue(String key) {
-			return map.get(key);
+			return map.get(ID_FIELD);
 		}
 
+		/*
+		 * (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) {
@@ -568,96 +420,90 @@ class EntityOperations {
 			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 //
-					? document //
+			return MappedDocument.of(map instanceof Document //
+					? (Document) map //
 					: 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() {
 			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(p -> p.getFieldName()));
-		}
 	}
 
 	private static class SimpleMappedEntity<T extends Map<String, Object>> extends UnmappedEntity<T> {
 
-		protected SimpleMappedEntity(T map, EntityOperations entityOperations) {
-			super(map, entityOperations);
+		protected SimpleMappedEntity(T map) {
+			super(map);
 		}
 
+		/*
+		 * (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//
-					? document //
+			bean = (T) (bean instanceof Document //
+					? (Document) bean //
 					: new Document(bean));
 			Document document = new Document();
 			writer.write(bean, document);
@@ -671,48 +517,52 @@ class EntityOperations {
 		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) {
+				PersistentPropertyAccessor<T> propertyAccessor) {
 
 			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,
-				EntityOperations entityOperations) {
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
 
 			MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(bean.getClass());
 			IdentifierAccessor identifierAccessor = entity.getIdentifierAccessor(bean);
 			PersistentPropertyAccessor<T> propertyAccessor = entity.getPropertyAccessor(bean);
 
-			return new MappedEntity<>(entity, identifierAccessor, propertyAccessor, entityOperations);
+			return new MappedEntity<>(entity, identifierAccessor, propertyAccessor);
 		}
 
+		/*
+		 * (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();
 		}
 
-		@Override
-		public Object getPropertyValue(String key) {
-			return propertyAccessor.getProperty(entity.getRequiredPersistentProperty(key));
-		}
-
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getByIdQuery()
+		 */
 		@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();
@@ -720,6 +570,10 @@ class EntityOperations {
 			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() {
 
@@ -730,6 +584,10 @@ class EntityOperations {
 					.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) {
 
@@ -745,6 +603,10 @@ class EntityOperations {
 			return MappedDocument.of(document);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#assertUpdateableIdIfNotSet()
+		 */
 		public void assertUpdateableIdIfNotSet() {
 
 			if (!entity.hasIdProperty()) {
@@ -760,85 +622,47 @@ class EntityOperations {
 
 			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() {
 			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;
-		}
-
-		@Nullable
-		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) {
-					currentEntity = entityOperations.forEntity(currentValue);
-				}
-			}
-
-			return currentValue != null ? currentValue : BsonNull.VALUE;
-		}
 	}
 
 	private static class AdaptibleMappedEntity<T> extends MappedEntity<T> implements AdaptibleEntity<T> {
@@ -848,9 +672,9 @@ class EntityOperations {
 		private final IdentifierAccessor identifierAccessor;
 
 		private AdaptibleMappedEntity(MongoPersistentEntity<?> entity, IdentifierAccessor identifierAccessor,
-				ConvertingPropertyAccessor<T> propertyAccessor, EntityOperations entityOperations) {
+				ConvertingPropertyAccessor<T> propertyAccessor) {
 
-			super(entity, identifierAccessor, propertyAccessor, entityOperations);
+			super(entity, identifierAccessor, propertyAccessor);
 
 			this.entity = entity;
 			this.propertyAccessor = propertyAccessor;
@@ -859,16 +683,20 @@ class EntityOperations {
 
 		private static <T> AdaptibleEntity<T> of(T bean,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
-				ConversionService conversionService, EntityOperations entityOperations) {
+				ConversionService conversionService) {
 
 			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), entityOperations);
+					new ConvertingPropertyAccessor<>(propertyAccessor, conversionService));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#populateIdIfNecessary(java.lang.Object)
+		 */
 		@Nullable
 		@Override
 		public T populateIdIfNecessary(@Nullable Object id) {
@@ -890,6 +718,10 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.MappedEntity#getVersion()
+		 */
 		@Override
 		@Nullable
 		public Number getVersion() {
@@ -899,6 +731,10 @@ class EntityOperations {
 			return propertyAccessor.getProperty(versionProperty, Number.class);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#initializeVersionProperty()
+		 */
 		@Override
 		public T initializeVersionProperty() {
 
@@ -913,6 +749,10 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#incrementVersion()
+		 */
 		@Override
 		public T incrementVersion() {
 
@@ -967,14 +807,6 @@ class EntityOperations {
 		 * @since 3.3
 		 */
 		TimeSeriesOptions mapTimeSeriesOptions(TimeSeriesOptions options);
-
-		/**
-		 * @return the name of the id field.
-		 * @since 4.1
-		 */
-		default String getIdKeyName() {
-			return ID_FIELD;
-		}
 	}
 
 	/**
@@ -992,11 +824,19 @@ class EntityOperations {
 			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) {
 
@@ -1031,11 +871,19 @@ class EntityOperations {
 			this.entity = entity;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation()
+		 */
 		@Override
 		public Optional<Collation> getCollation() {
 			return Optional.ofNullable(entity.getCollation());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public Optional<Collation> getCollation(Query query) {
 
@@ -1097,11 +945,6 @@ class EntityOperations {
 			MongoPersistentProperty persistentProperty = entity.getPersistentProperty(name);
 			return persistentProperty != null ? persistentProperty.getFieldName() : name;
 		}
-
-		@Override
-		public String getIdKeyName() {
-			return entity.getIdProperty().getName();
-		}
 	}
 
 }