Release version 3.4 M2 (2021.2.0).

See #3936

Jenkinsfile

@@ -14,42 +14,74 @@ pipeline {
 	stages {
 		stage("Docker images") {
 			parallel {
-				stage('Publish JDK 17 + MongoDB 4.4') {
+			    stage('Publish JDK 8 + MongoDB 5.0') {
 					when {
-						changeset "ci/openjdk17-mongodb-4.4/**"
+						changeset "ci/openjdk8-mongodb-5.0/**"
 					}
 					agent { label 'data' }
 					options { timeout(time: 30, unit: 'MINUTES') }
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-data-openjdk17-with-mongodb-4.4.4", "ci/openjdk17-mongodb-4.4/")
+							def image = docker.build("springci/spring-data-openjdk8-with-mongodb-5.0.0", "ci/openjdk8-mongodb-5.0/")
+								docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+									image.push()
+								}
+							}
+						}
+					}
+				stage('Publish JDK 8 + MongoDB 4.0') {
+					when {
+						changeset "ci/openjdk8-mongodb-4.0/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.0.23", "ci/openjdk8-mongodb-4.0/")
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 								image.push()
 							}
 						}
 					}
 				}
-				stage('Publish JDK 17 + MongoDB 5.0') {
-                	when {
-                		changeset "ci/openjdk17-mongodb-5.0/**"
-                	}
-                	agent { label 'data' }
-                	options { timeout(time: 30, unit: 'MINUTES') }
+				stage('Publish JDK 8 + MongoDB 4.4') {
+					when {
+						changeset "ci/openjdk8-mongodb-4.4/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
 
-                	steps {
-                		script {
-                			def image = docker.build("springci/spring-data-openjdk17-with-mongodb-5.0.3", "ci/openjdk17-mongodb-5.0/")
-                			docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-                				image.push()
-                			}
-                		}
-                	}
-                }
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk8-with-mongodb-4.4.4", "ci/openjdk8-mongodb-4.4/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
+				stage('Publish JDK 16 + MongoDB 4.4') {
+					when {
+						changeset "ci/openjdk16-mongodb-4.4/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk16-with-mongodb-4.4.4", "ci/openjdk16-mongodb-4.4/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
 			}
 		}
 
-		stage("test: baseline Mongo 5.0 (jdk17)") {
+		stage("test: baseline (jdk8)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -67,7 +99,7 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('springci/spring-data-openjdk17-with-mongodb-5.0.3:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') {
 							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'
@@ -89,7 +121,7 @@ pipeline {
 				}
 			}
 			parallel {
-				stage("test: baseline MongoDB 4.4 (jdk17)") {
+				stage("test: mongodb 4.0 (jdk8)") {
 					agent {
 						label 'data'
 					}
@@ -100,7 +132,7 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('springci/spring-data-openjdk17-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') {
 									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'
@@ -112,6 +144,78 @@ pipeline {
 						}
 					}
 				}
+
+				stage("test: mongodb 4.4 (jdk8)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+					}
+					steps {
+						script {
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								docker.image('springci/spring-data-openjdk8-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
+									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 (jdk8)") {
+                	agent {
+                		label 'data'
+                	}
+                	options { timeout(time: 30, unit: 'MINUTES') }
+                	environment {
+                		ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+                	}
+                	steps {
+                		script {
+                			docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+                				docker.image('springci/spring-data-openjdk8-with-mongodb-5.0.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
+                					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: baseline (jdk16)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+					}
+					steps {
+						script {
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								docker.image('springci/spring-data-openjdk16-with-mongodb-4.4.4:latest').inside('-v $HOME:/tmp/jenkins-home') {
+									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 -Pjava11 clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+								}
+							}
+						}
+					}
+				}
 			}
 		}
 
@@ -135,7 +239,8 @@ pipeline {
 			steps {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-						docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
+						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+							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} " +

ci/openjdk11-mongodb-4.4/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-bullseye
+FROM adoptopenjdk/openjdk11:latest
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive

ci/openjdk16-mongodb-4.4/Dockerfile

@@ -0,0 +1,18 @@
+FROM adoptopenjdk/openjdk16:latest
+
+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=4.4.4 mongodb-org-server=4.4.4 mongodb-org-shell=4.4.4 mongodb-org-mongos=4.4.4 mongodb-org-tools=4.4.4 ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

ci/openjdk8-mongodb-4.0/Dockerfile

@@ -0,0 +1,18 @@
+FROM adoptopenjdk/openjdk8:latest
+
+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=4.0.23 mongodb-org-server=4.0.23 mongodb-org-shell=4.0.23 mongodb-org-mongos=4.0.23 mongodb-org-tools=4.0.23 ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

ci/openjdk8-mongodb-4.4/Dockerfile

@@ -0,0 +1,20 @@
+FROM adoptopenjdk/openjdk8:latest
+
+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=4.4.4 mongodb-org-server=4.4.4 mongodb-org-shell=4.4.4 mongodb-org-mongos=4.4.4 mongodb-org-tools=4.4.4 ; \
+	rm /usr/bin/systemctl ; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;

ci/openjdk8-mongodb-5.0/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-bullseye
+FROM adoptopenjdk/openjdk8:latest
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
@@ -18,4 +18,3 @@ RUN apt-get update; \
 	apt-get install -y mongodb-org=5.0.3 mongodb-org-server=5.0.3 mongodb-org-shell=5.0.3 mongodb-org-mongos=5.0.3 mongodb-org-tools=5.0.3; \
 	apt-get clean; \
 	rm -rf /var/lib/apt/lists/*;
-

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>4.0.0-M1</version>
+	<version>3.4.0-M2</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.0.0-M1</version>
+		<version>2.7.0-M2</version>
 	</parent>
 
 	<modules>
@@ -24,10 +24,9 @@
 	</modules>
 
 	<properties>
-		<source.level>16</source.level>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>3.0.0-M1</springdata.commons>
+		<springdata.commons>2.7.0-M2</springdata.commons>
 		<mongo>4.4.1</mongo>
 		<mongo.reactivestreams>${mongo}</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>

spring-data-mongodb-benchmarks/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.0.0-M1</version>
+		<version>3.4.0-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.0.0-M1</version>
+		<version>3.4.0-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-mongodb/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.0.0-M1</version>
+		<version>3.4.0-M2</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -122,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>
@@ -131,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>
@@ -140,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>
@@ -196,30 +206,28 @@
 		<dependency>
 			<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>
-		</dependency>
-
 		<dependency>
 			<groupId>org.glassfish</groupId>
-			<artifactId>jakarta.el</artifactId>
-			<version>4.0.2</version>
-			<scope>provided</scope>
-			<optional>true</optional>
+			<artifactId>javax.el</artifactId>
+			<version>3.0.1-b11</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.enterprise</groupId>
-			<artifactId>jakarta.enterprise.cdi-api</artifactId>
-			<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>
 
@@ -264,9 +272,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>
 

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

@@ -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/MongoDatabaseUtils.java

@@ -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/MongoTransactionManager.java

@@ -106,6 +106,10 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 		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) {
 
@@ -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();
@@ -461,11 +505,19 @@ public class MongoTransactionManager extends AbstractPlatformTransactionManager
 			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/ReactiveMongoDatabaseUtils.java

@@ -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/ReactiveMongoTransactionManager.java

@@ -110,6 +110,10 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 		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) {
@@ -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();
@@ -469,11 +509,19 @@ public class ReactiveMongoTransactionManager extends AbstractReactiveTransaction
 			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

@@ -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/config/ConnectionStringPropertyEditor.java

@@ -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/GridFsTemplateParser.java

@@ -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

@@ -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)
@@ -376,6 +376,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

@@ -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

@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.config;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -28,8 +27,6 @@ import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
 import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
 import org.springframework.util.Assert;
 
@@ -42,16 +39,28 @@ import org.springframework.util.Assert;
  */
 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
 	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
 
@@ -61,6 +70,10 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		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) {
 
@@ -68,13 +81,17 @@ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
 
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(org.springframework.data.repository.config.PersistentEntitiesFactoryBean.class);
-		definition.addConstructorArgValue(new RuntimeBeanReference(MappingContext.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) {

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

@@ -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/MongoCredentialPropertyEditor.java

@@ -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 {
 

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

@@ -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) {
 

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

@@ -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/MongoTemplateParser.java

@@ -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

@@ -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

@@ -38,16 +38,28 @@ import org.springframework.util.Assert;
  */
 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";
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration)
+	 */
 	@Override
 	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
 
@@ -62,6 +74,10 @@ class ReactiveMongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupp
 		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) {

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

@@ -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

@@ -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

@@ -46,6 +46,10 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address %s '%s'. Check your replica set configuration!";
 	private static final Log LOG = LogFactory.getLog(ServerAddressPropertyEditor.class);
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
+	 */
 	@Override
 	public void setAsText(@Nullable String replicaSetString) {
 

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

@@ -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

@@ -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/core/ChangeStreamEvent.java

@@ -189,6 +189,10 @@ public class ChangeStreamEvent<T> {
 				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 + '}';

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

@@ -109,6 +109,10 @@ class DefaultBulkOperations implements BulkOperations {
 		this.defaultWriteConcern = defaultWriteConcern;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object)
+	 */
 	@Override
 	public BulkOperations insert(Object document) {
 
@@ -121,6 +125,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List)
+	 */
 	@Override
 	public BulkOperations insert(List<? extends Object> documents) {
 
@@ -131,6 +139,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public BulkOperations updateOne(Query query, Update update) {
@@ -141,6 +153,10 @@ class DefaultBulkOperations implements BulkOperations {
 		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, Update>> updates) {
 
@@ -153,6 +169,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public BulkOperations updateMulti(Query query, Update update) {
@@ -163,6 +183,10 @@ class DefaultBulkOperations implements BulkOperations {
 		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, Update>> updates) {
 
@@ -175,11 +199,19 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
+	 */
 	@Override
 	public BulkOperations upsert(Query query, Update update) {
 		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) {
 
@@ -190,6 +222,10 @@ class DefaultBulkOperations implements BulkOperations {
 		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) {
 
@@ -203,6 +239,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List)
+	 */
 	@Override
 	public BulkOperations remove(List<Query> removes) {
 
@@ -215,6 +255,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#replaceOne(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions)
+	 */
 	@Override
 	public BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) {
 
@@ -234,6 +278,10 @@ class DefaultBulkOperations implements BulkOperations {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
+	 */
 	@Override
 	public com.mongodb.bulk.BulkWriteResult execute() {
 

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

@@ -112,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 -> {
@@ -146,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 -> {
@@ -155,10 +163,18 @@ public class DefaultIndexOperations implements IndexOperations {
 
 	}
 
+	/*
+	 * (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>>() {

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

@@ -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/DefaultReactiveIndexOperations.java

@@ -86,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 -> {
@@ -115,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

@@ -70,11 +70,19 @@ class DefaultScriptOperations implements ScriptOperations {
 		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) {
 
@@ -84,6 +92,10 @@ class DefaultScriptOperations implements ScriptOperations {
 		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) {
 
@@ -103,6 +115,10 @@ 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) {
 
@@ -119,6 +135,10 @@ class DefaultScriptOperations implements ScriptOperations {
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ScriptOperations#exists(java.lang.String)
+	 */
 	@Override
 	public boolean exists(String scriptName) {
 
@@ -127,6 +147,10 @@ class DefaultScriptOperations implements ScriptOperations {
 		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() {
 

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

@@ -403,21 +403,37 @@ class EntityOperations {
 			this.map = map;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getIdPropertyName()
+		 */
 		@Override
 		public String getIdFieldName() {
 			return ID_FIELD;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getId()
+		 */
 		@Override
 		public Object getId() {
 			return map.get(ID_FIELD);
 		}
 
+		/*
+		 * (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) {
@@ -427,11 +443,19 @@ 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!");
 		}
 
+		/*
+		 * (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 //
@@ -439,27 +463,47 @@ class EntityOperations {
 					: 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;
@@ -472,6 +516,10 @@ class EntityOperations {
 			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) {
@@ -511,16 +559,28 @@ class 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();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getByIdQuery()
+		 */
 		@Override
 		public Query getByIdQuery() {
 
@@ -533,6 +593,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() {
 
@@ -543,6 +607,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) {
 
@@ -558,6 +626,10 @@ class EntityOperations {
 			return MappedDocument.of(document);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#assertUpdateableIdIfNotSet()
+		 */
 		public void assertUpdateableIdIfNotSet() {
 
 			if (!entity.hasIdProperty()) {
@@ -578,22 +650,38 @@ class EntityOperations {
 			}
 		}
 
+		/*
+		 * (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());
@@ -628,6 +716,10 @@ class 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) {
@@ -649,6 +741,10 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.MappedEntity#getVersion()
+		 */
 		@Override
 		@Nullable
 		public Number getVersion() {
@@ -658,6 +754,10 @@ class EntityOperations {
 			return propertyAccessor.getProperty(versionProperty, Number.class);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#initializeVersionProperty()
+		 */
 		@Override
 		public T initializeVersionProperty() {
 
@@ -672,6 +772,10 @@ class EntityOperations {
 			return propertyAccessor.getBean();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#incrementVersion()
+		 */
 		@Override
 		public T incrementVersion() {
 
@@ -743,11 +847,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) {
 
@@ -782,11 +894,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) {
 

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

@@ -37,6 +37,10 @@ class ExecutableAggregationOperationSupport implements ExecutableAggregationOper
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType) {
 
@@ -65,6 +69,10 @@ class ExecutableAggregationOperationSupport implements ExecutableAggregationOper
 			this.collection = collection;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public AggregationWithAggregation<T> inCollection(String collection) {
 
@@ -73,6 +81,10 @@ class ExecutableAggregationOperationSupport implements ExecutableAggregationOper
 			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithAggregation#by(org.springframework.data.mongodb.core.aggregation.Aggregation)
+		 */
 		@Override
 		public TerminatingAggregation<T> by(Aggregation aggregation) {
 
@@ -81,11 +93,19 @@ class ExecutableAggregationOperationSupport implements ExecutableAggregationOper
 			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#all()
+		 */
 		@Override
 		public AggregationResults<T> all() {
 			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#stream()
+		 */
 		@Override
 		public CloseableIterator<T> stream() {
 			return template.aggregateStream(aggregation, getCollectionName(aggregation), domainType);

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

@@ -51,6 +51,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableFind<T> query(Class<T> domainType) {
 
@@ -82,6 +86,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			this.query = query;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public FindWithProjection<T> inCollection(String collection) {
 
@@ -90,6 +98,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithProjection#as(Class)
+		 */
 		@Override
 		public <T1> FindWithQuery<T1> as(Class<T1> returnType) {
 
@@ -98,6 +110,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public TerminatingFind<T> matching(Query query) {
 
@@ -106,6 +122,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#oneValue()
+		 */
 		@Override
 		public T oneValue() {
 
@@ -122,6 +142,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return result.iterator().next();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#firstValue()
+		 */
 		@Override
 		public T firstValue() {
 
@@ -130,31 +154,55 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return ObjectUtils.isEmpty(result) ? null : result.iterator().next();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#all()
+		 */
 		@Override
 		public List<T> all() {
 			return doFind(null);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#stream()
+		 */
 		@Override
 		public Stream<T> stream() {
 			return StreamUtils.createStreamFromIterator(doStream());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#near(org.springframework.data.mongodb.core.query.NearQuery)
+		 */
 		@Override
 		public TerminatingFindNear<T> near(NearQuery nearQuery) {
 			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#count()
+		 */
 		@Override
 		public long count() {
 			return template.count(query, domainType, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#exists()
+		 */
 		@Override
 		public boolean exists() {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindDistinct#distinct(java.lang.String)
+		 */
 		@SuppressWarnings("unchecked")
 		@Override
 		public TerminatingDistinct<Object> distinct(String field) {
@@ -209,6 +257,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			this.delegate = delegate;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.clientFindIterable)
+		 */
 		@Override
 		public FindIterable<Document> prepare(FindIterable<Document> iterable) {
 
@@ -243,6 +295,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			this.field = field;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithProjection#as(java.lang.Class)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public <R> TerminatingDistinct<R> as(Class<R> resultType) {
@@ -252,6 +308,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return new DistinctOperationSupport<>((ExecutableFindSupport) delegate.as(resultType), field);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public TerminatingDistinct<T> matching(Query query) {
 
@@ -260,6 +320,10 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation {
 			return new DistinctOperationSupport<>((ExecutableFindSupport<T>) delegate.matching(query), field);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingDistinct#all()
+		 */
 		@Override
 		public List<T> all() {
 			return delegate.doFindDistinct(field);

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

@@ -40,6 +40,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.coreExecutableInsertOperation#insert(java.lan.Class)
+	 */
 	@Override
 	public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 
@@ -67,6 +71,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 			this.bulkMode = bulkMode;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#insert(java.lang.Class)
+		 */
 		@Override
 		public T one(T object) {
 
@@ -75,6 +83,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 			return template.insert(object, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#all(java.util.Collection)
+		 */
 		@Override
 		public Collection<T> all(Collection<? extends T> objects) {
 
@@ -83,6 +95,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 			return template.insert(objects, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingBulkInsert#bulk(java.util.Collection)
+		 */
 		@Override
 		public BulkWriteResult bulk(Collection<? extends T> objects) {
 
@@ -92,6 +108,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 					.insert(new ArrayList<>(objects)).execute();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public InsertWithBulkMode<T> inCollection(String collection) {
 
@@ -100,6 +120,10 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 			return new ExecutableInsertSupport<>(template, domainType, collection, bulkMode);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithBulkMode#withBulkMode(org.springframework.data.mongodb.core.BulkMode)
+		 */
 		@Override
 		public TerminatingBulkInsert<T> withBulkMode(BulkMode bulkMode) {
 

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

@@ -41,6 +41,10 @@ class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
 		this.tempate = tempate;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableRemove<T> remove(Class<T> domainType) {
 
@@ -67,6 +71,10 @@ class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
 			this.collection = collection;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public RemoveWithQuery<T> inCollection(String collection) {
 
@@ -75,6 +83,10 @@ class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
 			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public TerminatingRemove<T> matching(Query query) {
 
@@ -83,16 +95,28 @@ class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
 			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#all()
+		 */
 		@Override
 		public DeleteResult all() {
 			return template.doRemove(getCollectionName(), query, domainType, true);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#one()
+		 */
 		@Override
 		public DeleteResult one() {
 			return template.doRemove(getCollectionName(), query, domainType, false);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#findAndRemove()
+		 */
 		@Override
 		public List<T> findAndRemove() {
 

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

@@ -40,6 +40,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableUpdate<T> update(Class<T> domainType) {
 
@@ -81,6 +85,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 			this.targetType = targetType;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition)
+		 */
 		@Override
 		public TerminatingUpdate<T> apply(UpdateDefinition update) {
 
@@ -90,6 +98,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public UpdateWithQuery<T> inCollection(String collection) {
 
@@ -99,6 +111,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions)
+		 */
 		@Override
 		public TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options) {
 
@@ -108,6 +124,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#replaceWith(Object)
+		 */
 		@Override
 		public FindAndReplaceWithProjection<T> replaceWith(T replacement) {
 
@@ -117,6 +137,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions)
+		 */
 		@Override
 		public FindAndReplaceWithProjection<T> withOptions(FindAndReplaceOptions options) {
 
@@ -126,6 +150,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					options, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public UpdateWithUpdate<T> matching(Query query) {
 
@@ -135,6 +163,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class)
+		 */
 		@Override
 		public <R> FindAndReplaceWithOptions<R> as(Class<R> resultType) {
 
@@ -144,21 +176,37 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					findAndReplaceOptions, replacement, resultType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#all()
+		 */
 		@Override
 		public UpdateResult all() {
 			return doUpdate(true, false);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#first()
+		 */
 		@Override
 		public UpdateResult first() {
 			return doUpdate(false, false);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#upsert()
+		 */
 		@Override
 		public UpdateResult upsert() {
 			return doUpdate(true, true);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndModify#findAndModifyValue()
+		 */
 		@Override
 		public @Nullable T findAndModifyValue() {
 
@@ -167,6 +215,10 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 					getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndReplace#findAndReplaceValue()
+		 */
 		@Override
 		public @Nullable T findAndReplaceValue() {
 

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

@@ -112,31 +112,55 @@ public class MappedDocument {
 			this.delegate = delegate;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject()
+		 */
 		@Override
 		public Document getUpdateObject() {
 			return delegate.getUpdateObject();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#modifies(java.lang.String)
+		 */
 		@Override
 		public boolean modifies(String key) {
 			return delegate.modifies(key);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String)
+		 */
 		@Override
 		public void inc(String version) {
 			delegate.inc(version);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated()
+		 */
 		@Override
 		public Boolean isIsolated() {
 			return delegate.isIsolated();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
+		 */
 		@Override
 		public List<ArrayFilter> getArrayFilters() {
 			return delegate.getArrayFilters();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#hasArrayFilters()
+		 */
 		@Override
 		public boolean hasArrayFilters() {
 			return delegate.hasArrayFilters();

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

@@ -91,6 +91,10 @@ class MappingMongoJsonSchemaCreator implements MongoJsonSchemaCreator {
 		return new MappingMongoJsonSchemaCreator(converter, mappingContext, filter);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * org.springframework.data.mongodb.core.MongoJsonSchemaCreator#createSchemaFor(java.lang.Class)
+	 */
 	@Override
 	public MongoJsonSchema createSchemaFor(Class<?> type) {
 

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

@@ -46,16 +46,25 @@ public class MongoAdmin implements MongoAdminOperations {
 		this.mongoClient = client;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#dropDatabase(java.lang.String)
+	 */
 	@ManagedOperation
 	public void dropDatabase(String databaseName) {
 		getDB(databaseName).drop();
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#createDatabase(java.lang.String)
+	 */
 	@ManagedOperation
 	public void createDatabase(String databaseName) {
 		getDB(databaseName);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#getDatabaseStats(java.lang.String)
+	 */
 	@ManagedOperation
 	public String getDatabaseStats(String databaseName) {
 		return getDB(databaseName).runCommand(new Document("dbStats", 1).append("scale", 1024)).toJson();

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

@@ -119,15 +119,27 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
 	public Class<? extends MongoClient> getObjectType() {
 		return MongoClient.class;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
 	@Nullable
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
+	 */
 	@Override
 	protected MongoClient createInstance() throws Exception {
 		return createMongoClient(computeClientSetting());
@@ -324,6 +336,10 @@ public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> imp
 		return !fromConnectionStringIsDefault ? fromConnectionString : defaultValue;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
+	 */
 	@Override
 	protected void destroyInstance(@Nullable MongoClient instance) throws Exception {
 

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

@@ -84,10 +84,18 @@ public abstract class MongoDatabaseFactorySupport<C> implements MongoDatabaseFac
 		this.writeConcern = writeConcern;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoDbFactory#getMongoDatabase()
+	 */
 	public MongoDatabase getMongoDatabase() throws DataAccessException {
 		return getMongoDatabase(getDefaultDatabaseName());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoDbFactory#getMongoDatabase(java.lang.String)
+	 */
 	@Override
 	public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
 
@@ -110,16 +118,28 @@ public abstract class MongoDatabaseFactorySupport<C> implements MongoDatabaseFac
 	 */
 	protected abstract MongoDatabase doGetMongoDatabase(String dbName);
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
+	 */
 	public void destroy() throws Exception {
 		if (mongoInstanceCreated) {
 			closeClient();
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
+	 */
 	public PersistenceExceptionTranslator getExceptionTranslator() {
 		return this.exceptionTranslator;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoDbFactory#withSession(com.mongodb.session.Session)
+	 */
 	public MongoDatabaseFactory withSession(ClientSession session) {
 		return new MongoDatabaseFactorySupport.ClientSessionBoundMongoDbFactory(session, this);
 	}
@@ -160,31 +180,55 @@ public abstract class MongoDatabaseFactorySupport<C> implements MongoDatabaseFac
 			this.delegate = delegate;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#getMongoDatabase()
+		 */
 		@Override
 		public MongoDatabase getMongoDatabase() throws DataAccessException {
 			return proxyMongoDatabase(delegate.getMongoDatabase());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#getMongoDatabase(java.lang.String)
+		 */
 		@Override
 		public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
 			return proxyMongoDatabase(delegate.getMongoDatabase(dbName));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
+		 */
 		@Override
 		public PersistenceExceptionTranslator getExceptionTranslator() {
 			return delegate.getExceptionTranslator();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
+		 */
 		@Override
 		public ClientSession getSession(ClientSessionOptions options) {
 			return delegate.getSession(options);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#withSession(com.mongodb.session.ClientSession)
+		 */
 		@Override
 		public MongoDatabaseFactory withSession(ClientSession session) {
 			return delegate.withSession(session);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.MongoDbFactory#isTransactionActive()
+		 */
 		@Override
 		public boolean isTransactionActive() {
 			return session != null && session.hasActiveTransaction();

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

@@ -88,6 +88,10 @@ public class MongoEncryptionSettingsFactoryBean implements FactoryBean<AutoEncry
 		this.schemaMap = schemaMap;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see  org.springframework.beans.factory.FactoryBean#getObject()
+	 */
 	@Override
 	public AutoEncryptionSettings getObject() {
 
@@ -105,6 +109,10 @@ public class MongoEncryptionSettingsFactoryBean implements FactoryBean<AutoEncry
 		return source != null ? source : Collections.emptyMap();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see  org.springframework.beans.factory.FactoryBean#getObjectType()
+	 */
 	@Override
 	public Class<?> getObjectType() {
 		return AutoEncryptionSettings.class;

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

@@ -68,6 +68,10 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator
 	private static final Set<String> DATA_INTEGRITY_EXCEPTIONS = new HashSet<>(
 			Arrays.asList("WriteConcernException", "MongoWriteException", "MongoBulkWriteException"));
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
+	 */
 	@Nullable
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 

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

@@ -308,6 +308,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		this.readPreference = readPreference;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		prepareIndexCreator(applicationContext);
@@ -374,11 +378,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return this.mongoConverter;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#executeAsStream(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	@Override
 	public <T> CloseableIterator<T> stream(Query query, Class<T> entityType) {
 		return stream(query, entityType, getCollectionName(entityType));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#stream(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName) {
 		return doStream(query, entityType, collectionName, entityType);
@@ -417,6 +429,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return this.operations.determineCollectionName(entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(java.lang.String)
+	 */
 	@Override
 	@SuppressWarnings("ConstantConditions")
 	public Document executeCommand(String jsonCommand) {
@@ -426,6 +442,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return execute(db -> db.runCommand(Document.parse(jsonCommand), Document.class));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(org.bson.Document)
+	 */
 	@Override
 	@SuppressWarnings("ConstantConditions")
 	public Document executeCommand(Document command) {
@@ -435,6 +455,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return execute(db -> db.runCommand(command, Document.class));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(org.bson.Document, com.mongodb.ReadPreference)
+	 */
+
 	@Override
 	@SuppressWarnings("ConstantConditions")
 	public Document executeCommand(Document command, @Nullable ReadPreference readPreference) {
@@ -446,6 +471,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				: db.runCommand(command, Document.class));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#executeQuery(org.springframework.data.mongodb.core.query.Query, java.lang.String, org.springframework.data.mongodb.core.DocumentCallbackHandler)
+	 */
 	@Override
 	public void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch) {
 		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query, null));
@@ -482,6 +511,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				preparer != null ? preparer : CursorPreparer.NO_OP_PREPARER, documentCallbackHandler, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(org.springframework.data.mongodb.core.DbCallback)
+	 */
 	public <T> T execute(DbCallback<T> action) {
 
 		Assert.notNull(action, "DbCallback must not be null!");
@@ -494,12 +527,20 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.DbCallback)
+	 */
 	public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
 
 		Assert.notNull(entityClass, "EntityClass must not be null!");
 		return execute(getCollectionName(entityClass), callback);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.DbCallback)
+	 */
 	public <T> T execute(String collectionName, CollectionCallback<T> callback) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -513,6 +554,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#withSession(com.mongodb.ClientSessionOptions)
+	 */
 	@Override
 	public SessionScoped withSession(ClientSessionOptions options) {
 
@@ -521,6 +566,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return withSession(() -> mongoDbFactory.getSession(options));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#withSession(com.mongodb.session.ClientSession)
+	 */
 	@Override
 	public MongoTemplate withSession(ClientSession session) {
 
@@ -540,10 +589,18 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		this.sessionSynchronization = sessionSynchronization;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class)
+	 */
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass) {
 		return createCollection(entityClass, operations.forType(entityClass).getCollectionOptions());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class, org.springframework.data.mongodb.core.CollectionOptions)
+	 */
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
 
@@ -558,6 +615,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return doCreateCollection(getCollectionName(entityClass), convertToDocument(options, entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String)
+	 */
 	public MongoCollection<Document> createCollection(String collectionName) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -565,6 +626,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return doCreateCollection(collectionName, new Document());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String, org.springframework.data.mongodb.core.CollectionOptions)
+	 */
 	public MongoCollection<Document> createCollection(String collectionName,
 			@Nullable CollectionOptions collectionOptions) {
 
@@ -572,6 +637,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return doCreateCollection(collectionName, convertToDocument(collectionOptions));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#getCollection(java.lang.String)
+	 */
 	@SuppressWarnings("ConstantConditions")
 	public MongoCollection<Document> getCollection(String collectionName) {
 
@@ -580,10 +649,18 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return execute(db -> db.getCollection(collectionName, Document.class));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.Class)
+	 */
 	public <T> boolean collectionExists(Class<T> entityClass) {
 		return collectionExists(getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.String)
+	 */
 	@SuppressWarnings("ConstantConditions")
 	public boolean collectionExists(String collectionName) {
 
@@ -600,10 +677,18 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.Class)
+	 */
 	public <T> void dropCollection(Class<T> entityClass) {
 		dropCollection(getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.String)
+	 */
 	public void dropCollection(String collectionName) {
 
 		Assert.notNull(collectionName, "CollectionName must not be null!");
@@ -623,22 +708,42 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return indexOps(collectionName, null);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.String)
+	 */
 	public IndexOperations indexOps(String collectionName, @Nullable Class<?> type) {
 		return new DefaultIndexOperations(this, collectionName, type);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.Class)
+	 */
 	public IndexOperations indexOps(Class<?> entityClass) {
 		return indexOps(getCollectionName(entityClass), entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.String)
+	 */
 	public BulkOperations bulkOps(BulkMode bulkMode, String collectionName) {
 		return bulkOps(bulkMode, null, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class)
+	 */
 	public BulkOperations bulkOps(BulkMode bulkMode, Class<?> entityClass) {
 		return bulkOps(bulkMode, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class, java.lang.String)
+	 */
 	public BulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName) {
 
 		Assert.notNull(mode, "BulkMode must not be null!");
@@ -653,6 +758,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return operations;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#scriptOps()
+	 */
 	@Override
 	public ScriptOperations scriptOps() {
 		return new DefaultScriptOperations(this);
@@ -713,11 +822,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 
 	// Find methods that take a Query to express the query and that return a List of objects.
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	@Override
 	public <T> List<T> find(Query query, Class<T> entityClass) {
 		return find(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> List<T> find(Query query, Class<T> entityClass, String collectionName) {
 
@@ -748,11 +865,19 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return doFindOne(collectionName, new Document(idKey, id), new Document(), entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.Class, java.lang.Class)
+	 */
 	@Override
 	public <T> List<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass) {
 		return findDistinct(query, field, getCollectionName(entityClass), entityClass, resultClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.String, java.lang.Class, java.lang.Class)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> List<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
@@ -902,6 +1027,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findAndReplace(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions, java.lang.Class, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
 			String collectionName, Class<T> resultType) {
@@ -977,6 +1106,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return count(query, null, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public long count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		Assert.notNull(query, "Query must not be null!");
@@ -1002,6 +1135,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				collection -> collection.countDocuments(CountQuery.of(filter).toQueryDocument(), options));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#estimatedCount(java.lang.String)
+	 */
 	@Override
 	public long estimatedCount(String collectionName) {
 		return doEstimatedCount(collectionName, new EstimatedDocumentCountOptions());
@@ -1011,6 +1148,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return execute(collectionName, collection -> collection.estimatedDocumentCount(options));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object)
+	 */
 	@Override
 	public <T> T insert(T objectToSave) {
 
@@ -1020,6 +1161,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object, java.lang.String)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T insert(T objectToSave, String collectionName) {
@@ -1833,11 +1978,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return new GroupByResults<>(mappedResults, commandResult);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
+	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
@@ -1847,6 +1998,9 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return aggregate(aggregation, inputCollectionName, outputType, null);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
+	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
@@ -1854,11 +2008,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType) {
 		return aggregate(aggregation, collectionName, outputType, null);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
@@ -1870,11 +2030,17 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return aggregateStream(aggregation, inputCollectionName, outputType, context);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
+	 */
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType) {
 		return aggregateStream(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
+	 */
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
@@ -1882,22 +2048,34 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 				new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType) {
 		return aggregateStream(aggregation, collectionName, outputType, null);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> List<T> findAllAndRemove(Query query, String collectionName) {
 		return (List<T>) findAllAndRemove(query, Object.class, collectionName);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	@Override
 	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass) {
 		return findAllAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName) {
 		return doFindAndDelete(collectionName, query, entityClass);
@@ -2065,31 +2243,55 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableFind<T> query(Class<T> domainType) {
 		return new ExecutableFindOperationSupport(this).query(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableUpdate<T> update(Class<T> domainType) {
 		return new ExecutableUpdateOperationSupport(this).update(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableRemove<T> remove(Class<T> domainType) {
 		return new ExecutableRemoveOperationSupport(this).remove(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType) {
 		return new ExecutableAggregationOperationSupport(this).aggregateAndReturn(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableMapReduce<T> mapReduce(Class<T> domainType) {
 		return new ExecutableMapReduceOperationSupport(this).mapReduce(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#insert(java.lang.Class)
+	 */
 	@Override
 	public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 		return new ExecutableInsertOperationSupport(this).insert(domainType);
@@ -2124,6 +2326,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		return func;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollectionNames()
+	 */
 	@SuppressWarnings("ConstantConditions")
 	public Set<String> getCollectionNames() {
 		return execute(db -> {
@@ -2950,6 +3156,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 			this.collation = collation;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.CollectionCallback#doInCollection(com.mongodb.client.MongoCollection)
+		 */
 		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
@@ -3041,6 +3251,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 			this.collectionName = collectionName;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.MongoTemplate.DocumentCallback#doWith(org.bson.Document)
+		 */
 		@SuppressWarnings("unchecked")
 		public T doWith(Document document) {
 
@@ -3072,6 +3286,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 			this.type = type;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.DBCursor)
+		 */
 		public FindIterable<Document> prepare(FindIterable<Document> iterable) {
 
 			FindIterable<Document> cursorToUse = iterable;
@@ -3330,6 +3548,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 			this.session = session;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.MongoTemplate#getCollection(java.lang.String)
+		 */
 		@Override
 		public MongoCollection<Document> getCollection(String collectionName) {
 
@@ -3337,6 +3559,10 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 			return delegate.getCollection(collectionName);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.MongoTemplate#getDb()
+		 */
 		@Override
 		public MongoDatabase getDb() {
 

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

@@ -46,6 +46,10 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveAggregation<T> aggregateAndReturn(Class<T> domainType) {
 
@@ -71,6 +75,10 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio
 			this.collection = collection;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.AggregationOperationWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public AggregationOperationWithAggregation<T> inCollection(String collection) {
 
@@ -79,6 +87,10 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio
 			return new ReactiveAggregationSupport<>(template, domainType, aggregation, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.AggregationOperationWithAggregation#by(org.springframework.data.mongodb.core.Aggregation)
+		 */
 		@Override
 		public TerminatingAggregationOperation<T> by(Aggregation aggregation) {
 
@@ -87,6 +99,10 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio
 			return new ReactiveAggregationSupport<>(template, domainType, aggregation, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.TerminatingAggregationOperation#all()
+		 */
 		@Override
 		public Flux<T> all() {
 			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);

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

@@ -46,6 +46,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveChangeStream<T> changeStream(Class<T> domainType) {
 
@@ -72,6 +76,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			this.options = options;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithCollection#watchCollection(java.lang.String)
+		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> watchCollection(String collection) {
 
@@ -80,6 +88,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return new ReactiveChangeStreamSupport<>(template, domainType, returnType, collection, options);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithCollection#watchCollection(java.lang.Class)
+		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> watchCollection(Class<?> entityClass) {
 
@@ -88,6 +100,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return watchCollection(template.getCollectionName(entityClass));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAt(java.lang.Object)
+		 */
 		@Override
 		public TerminatingChangeStream<T> resumeAt(Object token) {
 
@@ -101,6 +117,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			});
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAfter(java.lang.Object)
+		 */
 		@Override
 		public TerminatingChangeStream<T> resumeAfter(Object token) {
 
@@ -109,6 +129,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return withOptions(builder -> builder.resumeAfter((BsonValue) token));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#startAfter(java.lang.Object)
+		 */
 		@Override
 		public TerminatingChangeStream<T> startAfter(Object token) {
 
@@ -117,6 +141,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return withOptions(builder -> builder.startAfter((BsonValue) token));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithOptions#withOptions(java.util.function.Consumer)
+		 */
 		@Override
 		public ReactiveChangeStreamSupport<T> withOptions(Consumer<ChangeStreamOptionsBuilder> optionsConsumer) {
 
@@ -126,6 +154,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return new ReactiveChangeStreamSupport<>(template, domainType, returnType, collection, builder.build());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithProjection#as(java.lang.Class)
+		 */
 		@Override
 		public <R> ChangeStreamWithFilterAndProjection<R> as(Class<R> resultType) {
 
@@ -134,11 +166,19 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return new ReactiveChangeStreamSupport<>(template, domainType, resultType, collection, options);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithFilter#filter(org.springframework.data.mongodb.core.aggregation.Aggregation)
+		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> filter(Aggregation filter) {
 			return withOptions(builder -> builder.filter(filter));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithFilter#filter(org.springframework.data.mongodb.core.query.CriteriaDefinition)
+		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> filter(CriteriaDefinition by) {
 
@@ -148,6 +188,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 			return filter(aggregation);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.TerminatingChangeStream#listen()
+		 */
 		@Override
 		public Flux<ChangeStreamEvent<T>> listen() {
 			return template.changeStream(collection, options != null ? options : ChangeStreamOptions.empty(), returnType);

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

@@ -44,6 +44,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveFind<T> query(Class<T> domainType) {
 
@@ -77,6 +81,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			this.query = query;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public FindWithProjection<T> inCollection(String collection) {
 
@@ -85,6 +93,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithProjection#as(java.lang.Class)
+		 */
 		@Override
 		public <T1> FindWithQuery<T1> as(Class<T1> returnType) {
 
@@ -93,6 +105,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+		 */
 		@Override
 		public TerminatingFind<T> matching(Query query) {
 
@@ -101,6 +117,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#first()
+		 */
 		@Override
 		public Mono<T> first() {
 
@@ -110,6 +130,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			return result.next();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#one()
+		 */
 		@Override
 		public Mono<T> one() {
 
@@ -131,31 +155,55 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 			});
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#all()
+		 */
 		@Override
 		public Flux<T> all() {
 			return doFind(null);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#tail()
+		 */
 		@Override
 		public Flux<T> tail() {
 			return doFind(template.new TailingQueryFindPublisherPreparer(query, domainType));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery#near(org.springframework.data.mongodb.core.query.NearQuery)
+		 */
 		@Override
 		public TerminatingFindNear<T> near(NearQuery nearQuery) {
 			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#count()
+		 */
 		@Override
 		public Mono<Long> count() {
 			return template.count(query, domainType, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#exists()
+		 */
 		@Override
 		public Mono<Boolean> exists() {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindDistinct#distinct(java.lang.String)
+		 */
 		@Override
 		public TerminatingDistinct<Object> distinct(String field) {
 
@@ -207,6 +255,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 				this.field = field;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithProjection#as(java.lang.Class)
+			 */
 			@Override
 			public <R> TerminatingDistinct<R> as(Class<R> resultType) {
 
@@ -215,6 +267,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 				return new DistinctOperationSupport<>((ReactiveFindSupport) delegate.as(resultType), field);
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
+			 */
 			@Override
 			@SuppressWarnings("unchecked")
 			public TerminatingDistinct<T> matching(Query query) {
@@ -224,6 +280,10 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation {
 				return new DistinctOperationSupport<>((ReactiveFindSupport<T>) delegate.matching(query), field);
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core..ReactiveFindOperation.TerminatingDistinct#all()
+			 */
 			@Override
 			public Flux<T> all() {
 				return delegate.doFindDistinct(field);

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

@@ -38,6 +38,10 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveInsert<T> insert(Class<T> domainType) {
 
@@ -59,6 +63,10 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation {
 			this.collection = collection;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#one(java.lang.Object)
+		 */
 		@Override
 		public Mono<T> one(T object) {
 
@@ -67,6 +75,10 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation {
 			return template.insert(object, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#all(java.util.Collection)
+		 */
 		@Override
 		public Flux<T> all(Collection<? extends T> objects) {
 
@@ -75,6 +87,10 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation {
 			return template.insert(objects, getCollectionName());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.InsertWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public ReactiveInsert<T> inCollection(String collection) {
 

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

@@ -333,6 +333,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		this.readPreference = readPreference;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+	 */
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		prepareIndexCreator(applicationContext);
@@ -400,10 +404,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return this.mongoConverter;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.String)
+	 */
 	public ReactiveIndexOperations indexOps(String collectionName) {
 		return new DefaultReactiveIndexOperations(this, collectionName, this.queryMapper);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.Class)
+	 */
 	public ReactiveIndexOperations indexOps(Class<?> entityClass) {
 		return new DefaultReactiveIndexOperations(this, getCollectionName(entityClass), this.queryMapper, entityClass);
 	}
@@ -412,6 +424,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return operations.determineCollectionName(entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(java.lang.String)
+	 */
 	public Mono<Document> executeCommand(String jsonCommand) {
 
 		Assert.notNull(jsonCommand, "Command must not be empty!");
@@ -419,10 +435,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return executeCommand(Document.parse(jsonCommand));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(org.bson.Document)
+	 */
 	public Mono<Document> executeCommand(Document command) {
 		return executeCommand(command, null);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(org.bson.Document, com.mongodb.ReadPreference)
+	 */
 	public Mono<Document> executeCommand(Document command, @Nullable ReadPreference readPreference) {
 
 		Assert.notNull(command, "Command must not be null!");
@@ -431,16 +455,28 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				: db.runCommand(command, Document.class)).next();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.ReactiveCollectionCallback)
+	 */
 	@Override
 	public <T> Flux<T> execute(Class<?> entityClass, ReactiveCollectionCallback<T> action) {
 		return createFlux(getCollectionName(entityClass), action);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(org.springframework.data.mongodb.core.ReactiveDbCallback)
+	 */
 	@Override
 	public <T> Flux<T> execute(ReactiveDatabaseCallback<T> action) {
 		return createFlux(action);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.ReactiveCollectionCallback)
+	 */
 	public <T> Flux<T> execute(String collectionName, ReactiveCollectionCallback<T> callback) {
 
 		Assert.notNull(callback, "ReactiveCollectionCallback must not be null!");
@@ -448,6 +484,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return createFlux(collectionName, callback);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(org.reactivestreams.Publisher, java.util.function.Consumer)
+	 */
 	@Override
 	public ReactiveSessionScoped withSession(Publisher<ClientSession> sessionProvider) {
 
@@ -480,12 +520,20 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		this.sessionSynchronization = sessionSynchronization;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction()
+	 */
 	@Override
 	public ReactiveSessionScoped inTransaction() {
 		return inTransaction(
 				mongoDatabaseFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build()));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction(org.reactivestreams.Publisher)
+	 */
 	@Override
 	public ReactiveSessionScoped inTransaction(Publisher<ClientSession> sessionProvider) {
 
@@ -522,10 +570,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				.contextWrite(ctx -> ReactiveMongoContext.setSession(ctx, Mono.just(session)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(com.mongodb.session.ClientSession)
+	 */
 	public ReactiveMongoOperations withSession(ClientSession session) {
 		return new ReactiveSessionBoundMongoTemplate(session, ReactiveMongoTemplate.this);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(com.mongodb.ClientSessionOptions)
+	 */
 	@Override
 	public ReactiveSessionScoped withSession(ClientSessionOptions sessionOptions) {
 		return withSession(mongoDatabaseFactory.getSession(sessionOptions));
@@ -599,10 +655,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				.onErrorMap(translateException());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class)
+	 */
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass) {
 		return createCollection(entityClass, operations.forType(entityClass).getCollectionOptions());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class, org.springframework.data.mongodb.core.CollectionOptions)
+	 */
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
 
@@ -617,15 +681,27 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return doCreateCollection(getCollectionName(entityClass), convertToCreateCollectionOptions(options, entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.String)
+	 */
 	public Mono<MongoCollection<Document>> createCollection(String collectionName) {
 		return doCreateCollection(collectionName, new CreateCollectionOptions());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.String, org.springframework.data.mongodb.core.CollectionOptions)
+	 */
 	public Mono<MongoCollection<Document>> createCollection(String collectionName,
 			@Nullable CollectionOptions collectionOptions) {
 		return doCreateCollection(collectionName, convertToCreateCollectionOptions(collectionOptions));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollection(java.lang.String)
+	 */
 	public Mono<MongoCollection<Document>> getCollection(String collectionName) {
 
 		Assert.notNull(collectionName, "Collection name must not be null!");
@@ -633,10 +709,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return createMono(db -> Mono.just(db.getCollection(collectionName)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.Class)
+	 */
 	public <T> Mono<Boolean> collectionExists(Class<T> entityClass) {
 		return collectionExists(getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.String)
+	 */
 	public Mono<Boolean> collectionExists(String collectionName) {
 		return createMono(db -> Flux.from(db.listCollectionNames()) //
 				.filter(s -> s.equals(collectionName)) //
@@ -644,10 +728,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				.single(false));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.Class)
+	 */
 	public <T> Mono<Void> dropCollection(Class<T> entityClass) {
 		return dropCollection(getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.String)
+	 */
 	public Mono<Void> dropCollection(String collectionName) {
 
 		return createMono(collectionName, MongoCollection::drop).doOnSuccess(success -> {
@@ -657,6 +749,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}).then();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollectionNames()
+	 */
 	public Flux<String> getCollectionNames() {
 		return createFlux(MongoDatabase::listCollectionNames);
 	}
@@ -669,10 +765,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return ReactiveMongoDatabaseUtils.getDatabase(mongoDatabaseFactory, sessionSynchronization);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public <T> Mono<T> findOne(Query query, Class<T> entityClass) {
 		return findOne(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public <T> Mono<T> findOne(Query query, Class<T> entityClass, String collectionName) {
 
 		if (ObjectUtils.isEmpty(query.getSortObject())) {
@@ -684,14 +788,26 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return find(query, entityClass, collectionName).next();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public Mono<Boolean> exists(Query query, Class<?> entityClass) {
 		return exists(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.String)
+	 */
 	public Mono<Boolean> exists(Query query, String collectionName) {
 		return exists(query, null, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public Mono<Boolean> exists(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		if (query == null) {
@@ -716,10 +832,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}).hasElements();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#find(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public <T> Flux<T> find(Query query, Class<T> entityClass) {
 		return find(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#find(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public <T> Flux<T> find(@Nullable Query query, Class<T> entityClass, String collectionName) {
 
 		if (query == null) {
@@ -730,10 +854,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				new QueryFindPublisherPreparer(query, entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findById(java.lang.Object, java.lang.Class)
+	 */
 	public <T> Mono<T> findById(Object id, Class<T> entityClass) {
 		return findById(id, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findById(java.lang.Object, java.lang.Class, java.lang.String)
+	 */
 	public <T> Mono<T> findById(Object id, Class<T> entityClass, String collectionName) {
 
 		String idKey = operations.getIdPropertyName(entityClass);
@@ -741,10 +873,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return doFindOne(collectionName, new Document(idKey, id), null, entityClass, (Collation) null);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.Class, java.lang.Class)
+	 */
 	public <T> Flux<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass) {
 		return findDistinct(query, field, getCollectionName(entityClass), entityClass, resultClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.String, java.lang.Class, java.lang.Class)
+	 */
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
 			Class<T> resultClass) {
@@ -790,6 +930,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return (Flux<T>) result;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName, Class<O> outputType) {
 
@@ -798,16 +942,28 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return doAggregate(aggregation, inputCollectionName, aggregation.getInputType(), outputType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
+	 */
 	@Override
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
+	 */
 	@Override
 	public <O> Flux<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 		return doAggregate(aggregation, getCollectionName(inputType), inputType, outputType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <O> Flux<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType) {
 		return doAggregate(aggregation, collectionName, null, outputType);
@@ -864,11 +1020,19 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return Flux.from(cursor).concatMap(readCallback::doWith);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#geoNear(org.springframework.data.mongodb.core.query.NearQuery, java.lang.Class)
+	 */
 	@Override
 	public <T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass) {
 		return geoNear(near, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#geoNear(org.springframework.data.mongodb.core.query.NearQuery, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName) {
 		return geoNear(near, entityClass, collectionName, entityClass);
@@ -901,19 +1065,35 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				.concatMap(callback::doWith);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
+	 */
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
+	 */
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, org.springframework.data.mongodb.core.FindAndModifyOptions, java.lang.Class)
+	 */
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
 			Class<T> entityClass) {
 		return findAndModify(query, update, options, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, org.springframework.data.mongodb.core.FindAndModifyOptions, java.lang.Class, java.lang.String)
+	 */
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
 			Class<T> entityClass, String collectionName) {
 
@@ -935,6 +1115,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndReplace(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions, java.lang.Class, java.lang.String, java.lang.Class)
+	 */
 	@Override
 	public <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
 			String collectionName, Class<T> resultType) {
@@ -985,10 +1169,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass) {
 		return findAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String collectionName) {
 
 		operations.forType(entityClass).getCollation(query);
@@ -997,6 +1189,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public Mono<Long> count(Query query, Class<?> entityClass) {
 
 		Assert.notNull(entityClass, "Entity class must not be null!");
@@ -1004,10 +1200,18 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return count(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.String)
+	 */
 	public Mono<Long> count(Query query, String collectionName) {
 		return count(query, null, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		Assert.notNull(query, "Query must not be null!");
@@ -1029,6 +1233,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#estimatedCount(java.lang.String)
+	 */
 	@Override
 	public Mono<Long> estimatedCount(String collectionName) {
 		return doEstimatedCount(collectionName, new EstimatedDocumentCountOptions());
@@ -1053,6 +1261,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return createMono(collectionName, collection -> collection.estimatedDocumentCount(options));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono)
+	 */
 	@Override
 	public <T> Mono<T> insert(Mono<? extends T> objectToSave) {
 
@@ -1061,11 +1273,19 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return objectToSave.flatMap(this::insert);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono, java.lang.Class)
+	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, Class<?> entityClass) {
 		return insertAll(batchToSave, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono, java.lang.String)
+	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, String collectionName) {
 
@@ -1074,6 +1294,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return Flux.from(batchToSave).flatMap(collection -> insert(collection, collectionName));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object)
+	 */
 	public <T> Mono<T> insert(T objectToSave) {
 
 		Assert.notNull(objectToSave, "Object to insert must not be null!");
@@ -1082,6 +1306,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object, java.lang.String)
+	 */
 	public <T> Mono<T> insert(T objectToSave, String collectionName) {
 
 		Assert.notNull(objectToSave, "Object to insert must not be null!");
@@ -1120,18 +1348,34 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.util.Collection, java.lang.Class)
+	 */
 	public <T> Flux<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass) {
 		return doInsertBatch(getCollectionName(entityClass), batchToSave, this.mongoConverter);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.util.Collection, java.lang.String)
+	 */
 	public <T> Flux<T> insert(Collection<? extends T> batchToSave, String collectionName) {
 		return doInsertBatch(collectionName, batchToSave, this.mongoConverter);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(java.util.Collection)
+	 */
 	public <T> Flux<T> insertAll(Collection<? extends T> objectsToSave) {
 		return doInsertAll(objectsToSave, this.mongoConverter);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(reactor.core.publisher.Mono)
+	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> objectsToSave) {
 		return Flux.from(objectsToSave).flatMap(this::insertAll);
@@ -1196,6 +1440,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		});
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(reactor.core.publisher.Mono)
+	 */
 	@Override
 	public <T> Mono<T> save(Mono<? extends T> objectToSave) {
 
@@ -1204,6 +1452,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return objectToSave.flatMap(this::save);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(reactor.core.publisher.Mono, java.lang.String)
+	 */
 	@Override
 	public <T> Mono<T> save(Mono<? extends T> objectToSave, String collectionName) {
 
@@ -1212,12 +1464,20 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return objectToSave.flatMap(o -> save(o, collectionName));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(java.lang.Object)
+	 */
 	public <T> Mono<T> save(T objectToSave) {
 
 		Assert.notNull(objectToSave, "Object to save must not be null!");
 		return save(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(java.lang.Object, java.lang.String)
+	 */
 	public <T> Mono<T> save(T objectToSave, String collectionName) {
 
 		Assert.notNull(objectToSave, "Object to save must not be null!");
@@ -1409,14 +1669,26 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
+	 */
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, Class<?> entityClass) {
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, true, false);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
+	 */
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, true, false);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
+	 */
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, true, false);
 	}
@@ -1429,23 +1701,43 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, false, false);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateFirst(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
+	 */
 	public Mono<UpdateResult> updateFirst(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, false, false);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateFirst(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
+	 */
 	public Mono<UpdateResult> updateFirst(Query query, UpdateDefinition update, Class<?> entityClass,
 			String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, false, false);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
+	 */
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, Class<?> entityClass) {
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, false, true);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
+	 */
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, false, true);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
+	 */
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, Class<?> entityClass,
 			String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, false, true);
@@ -1557,16 +1849,28 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return document.containsKey(persistentEntity.getRequiredVersionProperty().getFieldName());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(reactor.core.publisher.Mono)
+	 */
 	@Override
 	public Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove) {
 		return objectToRemove.flatMap(this::remove);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(reactor.core.publisher.Mono, java.lang.String)
+	 */
 	@Override
 	public Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collectionName) {
 		return objectToRemove.flatMap(it -> remove(it, collectionName));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(java.lang.Object)
+	 */
 	public Mono<DeleteResult> remove(Object object) {
 
 		Assert.notNull(object, "Object must not be null!");
@@ -1574,6 +1878,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		return remove(operations.forEntity(object).getRemoveByQuery(), object.getClass());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(java.lang.Object, java.lang.String)
+	 */
 	public Mono<DeleteResult> remove(Object object, String collectionName) {
 
 		Assert.notNull(object, "Object must not be null!");
@@ -1603,14 +1911,26 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
+	 */
 	public Mono<DeleteResult> remove(Query query, String collectionName) {
 		return remove(query, null, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	public Mono<DeleteResult> remove(Query query, Class<?> entityClass) {
 		return remove(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	public Mono<DeleteResult> remove(Query query, @Nullable Class<?> entityClass, String collectionName) {
 		return doRemove(collectionName, query, entityClass);
 	}
@@ -1665,36 +1985,64 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				.next();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class)
+	 */
 	public <T> Flux<T> findAll(Class<T> entityClass) {
 		return findAll(entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class, java.lang.String)
+	 */
 	public <T> Flux<T> findAll(Class<T> entityClass, String collectionName) {
 		return executeFindMultiInternal(new FindCallback(null), FindPublisherPreparer.NO_OP_PREPARER,
 				new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName), collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
+	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> findAllAndRemove(Query query, String collectionName) {
 		return (Flux<T>) findAllAndRemove(query, Object.class, collectionName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	@Override
 	public <T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass) {
 		return findAllAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName) {
 		return doFindAndDelete(collectionName, query, entityClass);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#tail(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
+	 */
 	@Override
 	public <T> Flux<T> tail(Query query, Class<T> entityClass) {
 		return tail(query, entityClass, getCollectionName(entityClass));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#tail(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
+	 */
 	@Override
 	public <T> Flux<T> tail(@Nullable Query query, Class<T> entityClass, String collectionName) {
 
@@ -1764,6 +2112,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				"ChangeStreamRequestOptions.filter mut be either an Aggregation or a plain list of Documents");
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions)
+	 */
 	public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, Class<T> resultType, String mapFunction,
 			String reduceFunction, MapReduceOptions options) {
 
@@ -1771,6 +2123,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 				options);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions)
+	 */
 	public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inputCollectionName, Class<T> resultType,
 			String mapFunction, String reduceFunction, MapReduceOptions options) {
 
@@ -1877,36 +2233,64 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveFind<T> query(Class<T> domainType) {
 		return new ReactiveFindOperationSupport(this).query(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveUpdate<T> update(Class<T> domainType) {
 		return new ReactiveUpdateOperationSupport(this).update(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveRemove<T> remove(Class<T> domainType) {
 		return new ReactiveRemoveOperationSupport(this).remove(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveInsert<T> insert(Class<T> domainType) {
 		return new ReactiveInsertOperationSupport(this).insert(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveAggregation<T> aggregateAndReturn(Class<T> domainType) {
 		return new ReactiveAggregationOperationSupport(this).aggregateAndReturn(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMapReduceOperation#mapReduce(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveMapReduce<T> mapReduce(Class<T> domainType) {
 		return new ReactiveMapReduceOperationSupport(this).mapReduce(domainType);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveChangeStream<T> changeStream(Class<T> domainType) {
 		return new ReactiveChangeStreamOperationSupport(this).changeStream(domainType);
@@ -2713,6 +3097,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			this.options = options;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveCollectionCallback#doInCollection(com.mongodb.reactivestreams.client.MongoCollection)
+		 */
 		@Override
 		public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
@@ -3035,6 +3423,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			this.session = session;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getCollection(java.lang.String)
+		 */
 		@Override
 		public Mono<MongoCollection<Document>> getCollection(String collectionName) {
 
@@ -3042,6 +3434,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 			return delegate.getCollection(collectionName);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getMongoDatabase()
+		 */
 		@Override
 		public Mono<MongoDatabase> getMongoDatabase() {
 

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

@@ -41,6 +41,10 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 		this.tempate = tempate;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveRemove<T> remove(Class<T> domainType) {
 
@@ -64,6 +68,10 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 			this.collection = collection;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.RemoveWithCollection#inCollection(String)
+		 */
 		@Override
 		public RemoveWithQuery<T> inCollection(String collection) {
 
@@ -72,6 +80,10 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 			return new ReactiveRemoveSupport<>(template, domainType, query, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.RemoveWithQuery#matching(org.springframework.data.mongodb.core.Query)
+		 */
 		@Override
 		public TerminatingRemove<T> matching(Query query) {
 
@@ -80,6 +92,10 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 			return new ReactiveRemoveSupport<>(template, domainType, query, collection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#all()
+		 */
 		@Override
 		public Mono<DeleteResult> all() {
 
@@ -88,6 +104,10 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 			return template.doRemove(collectionName, query, domainType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#findAndRemove()
+		 */
 		@Override
 		public Flux<T> findAndRemove() {
 

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

@@ -42,6 +42,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 		this.template = template;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class)
+	 */
 	@Override
 	public <T> ReactiveUpdate<T> update(Class<T> domainType) {
 
@@ -79,6 +83,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 			this.targetType = targetType;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition)
+		 */
 		@Override
 		public TerminatingUpdate<T> apply(org.springframework.data.mongodb.core.query.UpdateDefinition update) {
 
@@ -88,6 +96,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithCollection#inCollection(java.lang.String)
+		 */
 		@Override
 		public UpdateWithQuery<T> inCollection(String collection) {
 
@@ -97,16 +109,28 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#first()
+		 */
 		@Override
 		public Mono<UpdateResult> first() {
 			return doUpdate(false, false);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#upsert()
+		 */
 		@Override
 		public Mono<UpdateResult> upsert() {
 			return doUpdate(true, true);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndModify#findAndModify()
+		 */
 		@Override
 		public Mono<T> findAndModify() {
 
@@ -117,6 +141,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					collectionName);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndReplace#findAndReplace()
+		 */
 		@Override
 		public Mono<T> findAndReplace() {
 			return template.findAndReplace(query, replacement,
@@ -124,6 +152,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					getCollectionName(), targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.Query)
+		 */
 		@Override
 		public UpdateWithUpdate<T> matching(Query query) {
 
@@ -133,11 +165,19 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#all()
+		 */
 		@Override
 		public Mono<UpdateResult> all() {
 			return doUpdate(true, false);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions)
+		 */
 		@Override
 		public TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options) {
 
@@ -147,6 +187,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#replaceWith(java.lang.Object)
+		 */
 		@Override
 		public FindAndReplaceWithProjection<T> replaceWith(T replacement) {
 
@@ -156,6 +200,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					findAndReplaceOptions, replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions)
+		 */
 		@Override
 		public FindAndReplaceWithProjection<T> withOptions(FindAndReplaceOptions options) {
 
@@ -165,6 +213,10 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 					replacement, targetType);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class)
+		 */
 		@Override
 		public <R> FindAndReplaceWithOptions<R> as(Class<R> resultType) {
 

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

@@ -75,16 +75,28 @@ public class SimpleMongoClientDatabaseFactory extends MongoDatabaseFactorySuppor
 		super(mongoClient, databaseName, mongoInstanceCreated, new MongoExceptionTranslator());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.MongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
+	 */
 	@Override
 	public ClientSession getSession(ClientSessionOptions options) {
 		return getMongoClient().startSession(options);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#closeClient()
+	 */
 	@Override
 	protected void closeClient() {
 		getMongoClient().close();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#doGetMongoDatabase(java.lang.String)
+	 */
 	@Override
 	protected MongoDatabase doGetMongoDatabase(String dbName) {
 		return getMongoClient().getDatabase(dbName);

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

@@ -97,10 +97,18 @@ public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, React
 		this.writeConcern = writeConcern;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase()
+	 */
 	public Mono<MongoDatabase> getMongoDatabase() throws DataAccessException {
 		return getMongoDatabase(databaseName);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase(java.lang.String)
+	 */
 	public Mono<MongoDatabase> getMongoDatabase(String dbName) throws DataAccessException {
 
 		Assert.hasText(dbName, "Database name must not be empty.");
@@ -125,20 +133,36 @@ public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, React
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getExceptionTranslator()
+	 */
 	public PersistenceExceptionTranslator getExceptionTranslator() {
 		return this.exceptionTranslator;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getCodecRegistry()
+	 */
 	@Override
 	public CodecRegistry getCodecRegistry() {
 		return this.mongo.getDatabase(databaseName).getCodecRegistry();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
+	 */
 	@Override
 	public Mono<ClientSession> getSession(ClientSessionOptions options) {
 		return Mono.from(mongo.startSession(options));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#withSession(com.mongodb.session.ClientSession)
+	 */
 	@Override
 	public ReactiveMongoDatabaseFactory withSession(ClientSession session) {
 		return new ClientSessionBoundMongoDbFactory(session, this);
@@ -162,36 +186,64 @@ public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, React
 			this.delegate = delegate;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase()
+		 */
 		@Override
 		public Mono<MongoDatabase> getMongoDatabase() throws DataAccessException {
 			return delegate.getMongoDatabase().map(this::decorateDatabase);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase(java.lang.String)
+		 */
 		@Override
 		public Mono<MongoDatabase> getMongoDatabase(String dbName) throws DataAccessException {
 			return delegate.getMongoDatabase(dbName).map(this::decorateDatabase);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getExceptionTranslator()
+		 */
 		@Override
 		public PersistenceExceptionTranslator getExceptionTranslator() {
 			return delegate.getExceptionTranslator();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getCodecRegistry()
+		 */
 		@Override
 		public CodecRegistry getCodecRegistry() {
 			return delegate.getCodecRegistry();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getSession(com.mongodb.ClientSessionOptions)
+		 */
 		@Override
 		public Mono<ClientSession> getSession(ClientSessionOptions options) {
 			return delegate.getSession(options);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#withSession(com.mongodb.session.ClientSession)
+		 */
 		@Override
 		public ReactiveMongoDatabaseFactory withSession(ClientSession session) {
 			return delegate.withSession(session);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#isTransactionActive()
+		 */
 		@Override
 		public boolean isTransactionActive() {
 			return session != null && session.hasActiveTransaction();

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

@@ -44,6 +44,9 @@ abstract class AbstractAggregationExpression implements AggregationExpression {
 		this.value = value;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return toDocument(this.value, context);

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

@@ -334,6 +334,9 @@ public class AccumulatorOperators {
 			return new Sum(append(value));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
@@ -414,6 +417,9 @@ public class AccumulatorOperators {
 			return new Avg(append(expression));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
@@ -494,6 +500,9 @@ public class AccumulatorOperators {
 			return new Max(append(expression));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
@@ -574,6 +583,9 @@ public class AccumulatorOperators {
 			return new Min(append(expression));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
@@ -654,6 +666,9 @@ public class AccumulatorOperators {
 			return new StdDevPop(append(expression));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
@@ -734,6 +749,9 @@ public class AccumulatorOperators {
 			return new StdDevSamp(append(expression));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {

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

@@ -99,6 +99,10 @@ public class AddFieldsOperation extends DocumentEnhancingOperation {
 		return new AddFieldsOperationBuilder(getValueMap());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.DocumentEnhancingOperation#mongoOperator()
+	 */
 	@Override
 	protected String mongoOperator() {
 		return "$addFields";

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

@@ -741,6 +741,10 @@ public class Aggregation {
 		return options.applyAndReturnPotentiallyChangedCommand(command);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString() {
 		return SerializationUtils.serializeToJsonSafely(toDocument("__collection__", DEFAULT_CONTEXT));
@@ -784,6 +788,10 @@ public class Aggregation {
 			return false;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Enum#toString()
+		 */
 		@Override
 		public String toString() {
 			return PREFIX.concat(name());

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

@@ -76,6 +76,10 @@ public enum AggregationFunctionExpressions {
 			this.values = Arrays.asList(values);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 

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

@@ -80,16 +80,28 @@ class AggregationOperationRenderer {
 	 */
 	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+		 */
 		@Override
 		public Document getMappedObject(Document document, @Nullable Class<?> type) {
 			return document;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
+		 */
 		@Override
 		public FieldReference getReference(Field field) {
 			return new DirectFieldReference(new ExposedField(field, true));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+		 */
 		@Override
 		public FieldReference getReference(String name) {
 			return new DirectFieldReference(new ExposedField(new AggregationField(name), true));

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

@@ -339,6 +339,9 @@ public class AggregationOptions {
 		return !maxTime.isZero() && !maxTime.isNegative();
 	}
 
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
 	@Override
 	public String toString() {
 		return toDocument().toJson();

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

@@ -77,6 +77,10 @@ public class AggregationResults<T> implements Iterable<T> {
 		return mappedResults.size() == 1 ? mappedResults.get(0) : null;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
 	public Iterator<T> iterator() {
 		return mappedResults.iterator();
 	}

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

@@ -64,6 +64,9 @@ public class AggregationSpELExpression implements AggregationExpression {
 		return new AggregationSpELExpression(expressionString, parameters);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return (Document) TRANSFORMER.transform(rawExpression, context, parameters);

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

@@ -242,26 +242,48 @@ public class AggregationUpdate extends Aggregation implements UpdateDefinition {
 		return this;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated()
+	 */
 	@Override
 	public Boolean isIsolated() {
 		return isolated;
 	}
 
+	/*
+	 * Returns a update document containing the update pipeline.
+	 * The resulting document needs to be unwrapped to be used with update operations.
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject()
+	 */
 	@Override
 	public Document getUpdateObject() {
 		return new Document("", toPipeline(Aggregation.DEFAULT_CONTEXT));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#modifies(java.lang.String)
+	 */
 	@Override
 	public boolean modifies(String key) {
 		return keysTouched.contains(key);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String)
+	 */
 	@Override
 	public void inc(String key) {
 		set(new SetOperation(key, ArithmeticOperators.valueOf(key).add(1)));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
+	 */
 	@Override
 	public List<ArrayFilter> getArrayFilters() {
 		return Collections.emptyList();

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

@@ -612,6 +612,10 @@ public class ArrayOperators {
 			return new FilterExpressionBuilder().filter(values);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(final AggregationOperationContext context) {
 			return toFilter(ExposedFields.from(as), context);
@@ -732,6 +736,10 @@ public class ArrayOperators {
 				return new FilterExpressionBuilder();
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.InputBuilder#filter(java.util.List)
+			 */
 			@Override
 			public AsBuilder filter(List<?> array) {
 
@@ -740,6 +748,10 @@ public class ArrayOperators {
 				return this;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.InputBuilder#filter(org.springframework.data.mongodb.core.aggregation.Field)
+			 */
 			@Override
 			public AsBuilder filter(Field field) {
 
@@ -748,6 +760,10 @@ public class ArrayOperators {
 				return this;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.AsBuilder#as(java.lang.String)
+			 */
 			@Override
 			public ConditionBuilder as(String variableName) {
 
@@ -756,6 +772,10 @@ public class ArrayOperators {
 				return this;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			@Override
 			public Filter by(AggregationExpression condition) {
 
@@ -764,6 +784,10 @@ public class ArrayOperators {
 				return filter;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(java.lang.String)
+			 */
 			@Override
 			public Filter by(String expression) {
 
@@ -772,6 +796,10 @@ public class ArrayOperators {
 				return filter;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.bson.Document)
+			 */
 			@Override
 			public Filter by(Document expression) {
 
@@ -1216,6 +1244,9 @@ public class ArrayOperators {
 			this.reduceExpressions = reduceExpressions;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -1402,6 +1433,9 @@ public class ArrayOperators {
 				};
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(propertyName, aggregationExpression.toDocument(context));
@@ -1769,6 +1803,10 @@ public class ArrayOperators {
 			return new ArrayToObject(expression);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
+		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$arrayToObject";

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

@@ -88,6 +88,9 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 		this.granularity = granularity;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -104,6 +107,10 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 		return new Document(getOperator(), options);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$bucketAuto";
@@ -137,21 +144,33 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 		return new BucketAutoOperation(this, buckets, granularity.getMongoRepresentation());
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
+	 */
 	@Override
 	protected BucketAutoOperation newBucketOperation(Outputs outputs) {
 		return new BucketAutoOperation(this, outputs);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
+	 */
 	@Override
 	public ExpressionBucketAutoOperationBuilder andOutputExpression(String expression, Object... params) {
 		return new ExpressionBucketAutoOperationBuilder(expression, this, params);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+	 */
 	@Override
 	public BucketAutoOperationOutputBuilder andOutput(AggregationExpression expression) {
 		return new BucketAutoOperationOutputBuilder(expression, this);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
+	 */
 	@Override
 	public BucketAutoOperationOutputBuilder andOutput(String fieldName) {
 		return new BucketAutoOperationOutputBuilder(Fields.field(fieldName), this);
@@ -173,6 +192,9 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 			super(value, operation);
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
+		 */
 		@Override
 		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
@@ -201,6 +223,9 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 			super(expression, operation, parameters);
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
+		 */
 		@Override
 		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
@@ -245,6 +270,9 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 			this.granularity = granularity;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GranularitytoMongoGranularity()
+		 */
 		@Override
 		public String getMongoRepresentation() {
 			return granularity;

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

@@ -84,6 +84,9 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 		this.defaultBucket = defaultBucket;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -100,6 +103,10 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 		return new Document(getOperator(), options);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$bucket";
@@ -136,21 +143,33 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 		return new BucketOperation(this, newBoundaries, defaultBucket);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
+	 */
 	@Override
 	protected BucketOperation newBucketOperation(Outputs outputs) {
 		return new BucketOperation(this, outputs);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
+	 */
 	@Override
 	public ExpressionBucketOperationBuilder andOutputExpression(String expression, Object... params) {
 		return new ExpressionBucketOperationBuilder(expression, this, params);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+	 */
 	@Override
 	public BucketOperationOutputBuilder andOutput(AggregationExpression expression) {
 		return new BucketOperationOutputBuilder(expression, this);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
+	 */
 	@Override
 	public BucketOperationOutputBuilder andOutput(String fieldName) {
 		return new BucketOperationOutputBuilder(Fields.field(fieldName), this);
@@ -172,6 +191,9 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 			super(value, operation);
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
+		 */
 		@Override
 		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketOperationOutputBuilder(operationOutput, this.operation);
@@ -199,6 +221,9 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 			super(expression, operation, parameters);
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
+		 */
 		@Override
 		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketOperationOutputBuilder(operationOutput, this.operation);

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

@@ -141,6 +141,9 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 		});
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -156,6 +159,9 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 		return document;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 		return outputs.asExposedFields();
@@ -448,6 +454,9 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 			return outputs.isEmpty();
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -531,6 +540,10 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 			this.values = operationOutput.values;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -623,6 +636,9 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 			this.params = parameters.clone();
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return (Document) TRANSFORMER.transform(expression, context, params);
@@ -649,6 +665,9 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 			this.expression = expression;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return expression.toDocument(context);

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

@@ -275,6 +275,10 @@ public class ConditionalOperators {
 			return new IfNullOperatorBuilder().ifNull(expression);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -404,6 +408,9 @@ public class ConditionalOperators {
 				return new IfNullOperatorBuilder();
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(java.lang.String)
+			 */
 			public ThenBuilder ifNull(String fieldReference) {
 
 				Assert.hasText(fieldReference, "FieldReference name must not be null or empty!");
@@ -411,6 +418,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			@Override
 			public ThenBuilder ifNull(AggregationExpression expression) {
 
@@ -429,16 +439,25 @@ public class ConditionalOperators {
 				return ifNull(expression);
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#then(java.lang.Object)
+			 */
 			public IfNull then(Object value) {
 				return new IfNull(conditions, value);
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(java.lang.String)
+			 */
 			public IfNull thenValueOf(String fieldReference) {
 
 				Assert.notNull(fieldReference, "FieldReference must not be null!");
 				return new IfNull(conditions, Fields.field(fieldReference));
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			public IfNull thenValueOf(AggregationExpression expression) {
 
 				Assert.notNull(expression, "Expression must not be null!");
@@ -524,6 +543,9 @@ public class ConditionalOperators {
 				};
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
@@ -611,6 +633,10 @@ public class ConditionalOperators {
 			this.otherwiseValue = otherwiseValue;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -889,6 +915,9 @@ public class ConditionalOperators {
 				return new ConditionalExpressionBuilder();
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.bson.Document)
+			 */
 			@Override
 			public ConditionalExpressionBuilder when(Document booleanExpression) {
 
@@ -898,6 +927,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.query.CriteriaDefinition)
+			 */
 			@Override
 			public ThenBuilder when(CriteriaDefinition criteria) {
 
@@ -906,6 +938,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			@Override
 			public ThenBuilder when(AggregationExpression expression) {
 
@@ -914,6 +949,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(java.lang.String)
+			 */
 			@Override
 			public ThenBuilder when(String booleanField) {
 
@@ -922,6 +960,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#then(java.lang.Object)
+			 */
 			@Override
 			public OtherwiseBuilder then(Object thenValue) {
 
@@ -930,6 +971,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(java.lang.String)
+			 */
 			@Override
 			public OtherwiseBuilder thenValueOf(String fieldReference) {
 
@@ -938,6 +982,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			@Override
 			public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
 
@@ -946,6 +993,9 @@ public class ConditionalOperators {
 				return this;
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwise(java.lang.Object)
+			 */
 			@Override
 			public Cond otherwise(Object otherwiseValue) {
 
@@ -953,6 +1003,9 @@ public class ConditionalOperators {
 				return new Cond(condition, thenValue, otherwiseValue);
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(java.lang.String)
+			 */
 			@Override
 			public Cond otherwiseValueOf(String fieldReference) {
 
@@ -960,6 +1013,9 @@ public class ConditionalOperators {
 				return new Cond(condition, thenValue, Fields.field(fieldReference));
 			}
 
+			/* (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
+			 */
 			@Override
 			public Cond otherwiseValueOf(AggregationExpression expression) {
 

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

@@ -43,6 +43,9 @@ public class CountOperation implements FieldsExposingAggregationOperation {
 		this.fieldName = fieldName;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return new Document(getOperator(), fieldName);
@@ -53,6 +56,9 @@ public class CountOperation implements FieldsExposingAggregationOperation {
 		return "$count";
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from(new ExposedField(fieldName, true));

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

@@ -46,6 +46,10 @@ abstract class DocumentEnhancingOperation implements InheritsFieldsAggregationOp
 		}
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -67,6 +71,10 @@ abstract class DocumentEnhancingOperation implements InheritsFieldsAggregationOp
 	 */
 	protected abstract String mongoOperator();
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return mongoOperator();
@@ -79,6 +87,10 @@ abstract class DocumentEnhancingOperation implements InheritsFieldsAggregationOp
 		return this.valueMap;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 		return exposedFields;

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

@@ -209,6 +209,10 @@ public final class ExposedFields implements Iterable<ExposedField> {
 		return originalFields.size() + syntheticFields.size();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
 	@Override
 	public Iterator<ExposedField> iterator() {
 
@@ -256,16 +260,28 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			this.synthetic = synthetic;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
+		 */
 		@Override
 		public String getName() {
 			return field.getName();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getTarget()
+		 */
 		@Override
 		public String getTarget() {
 			return field.getTarget();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
+		 */
 		@Override
 		public boolean isAliased() {
 			return field.isAliased();
@@ -288,11 +304,19 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			return getName().equals(name) || getTarget().equals(name);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
 		@Override
 		public String toString() {
 			return String.format("AggregationField: %s, synthetic: %s", field, synthetic);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
 		@Override
 		public boolean equals(Object obj) {
 
@@ -309,6 +333,10 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			return this.field.equals(that.field) && this.synthetic == that.synthetic;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
 		@Override
 		public int hashCode() {
 
@@ -366,16 +394,28 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			this.field = field;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw()
+		 */
 		public String getRaw() {
 
 			String target = field.getTarget();
 			return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue()
+		 */
 		public Object getReferenceValue() {
 			return field.synthetic && !field.isAliased() ? 1 : toString();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
 		@Override
 		public String toString() {
 
@@ -386,6 +426,10 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			return String.format("$%s", getRaw());
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
 		@Override
 		public boolean equals(Object obj) {
 
@@ -402,6 +446,10 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			return this.field.equals(that.field);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
 		@Override
 		public int hashCode() {
 			return field.hashCode();
@@ -427,11 +475,19 @@ public final class ExposedFields implements Iterable<ExposedField> {
 			delegate = field;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw()
+		 */
 		@Override
 		public String getRaw() {
 			return delegate.getRaw();
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue()
+		 */
 		@Override
 		public Object getReferenceValue() {
 			return delegate.getReferenceValue();

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

@@ -54,11 +54,19 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 		this.rootContext = rootContext;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+	 */
 	@Override
 	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return rootContext.getMappedObject(document, type);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
+	 */
 	@Override
 	public FieldReference getReference(Field field) {
 
@@ -69,11 +77,19 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 		return getReference(field, field.getTarget());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return getReference(null, name);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
+	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return rootContext.getFields(type);

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

@@ -78,16 +78,26 @@ public class FacetOperation implements FieldsExposingAggregationOperation {
 		return new FacetOperationBuilder(facets, Arrays.asList(operations));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return new Document(getOperator(), facets.toDocument(context));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$facet";
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 		return facets.asExposedFields();

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

@@ -179,6 +179,10 @@ public final class Fields implements Iterable<Field> {
 		return null;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Iterable#iterator()
+	 */
 	@Override
 	public Iterator<Field> iterator() {
 		return fields.iterator();
@@ -249,10 +253,18 @@ public final class Fields implements Iterable<Field> {
 			return dollarIndex == -1 ? source : source.substring(dollarIndex + 1);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
+		 */
 		public String getName() {
 			return name;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#getAlias()
+		 */
 		public String getTarget() {
 
 			if (isLocalVar()) {
@@ -262,6 +274,10 @@ public final class Fields implements Iterable<Field> {
 			return StringUtils.hasText(this.target) ? this.target : this.name;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
+		 */
 		@Override
 		public boolean isAliased() {
 			return !getName().equals(getTarget());
@@ -288,11 +304,19 @@ public final class Fields implements Iterable<Field> {
 			return raw;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
 		@Override
 		public String toString() {
 			return String.format("AggregationField - name: %s, target: %s", name, target);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
 		@Override
 		public boolean equals(Object obj) {
 
@@ -309,6 +333,10 @@ public final class Fields implements Iterable<Field> {
 			return this.name.equals(that.name) && ObjectUtils.nullSafeEquals(this.target, that.target);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see java.lang.Object#hashCode()
+		 */
 		@Override
 		public int hashCode() {
 

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

@@ -46,6 +46,10 @@ public interface FieldsExposingAggregationOperation extends AggregationOperation
 	 */
 	interface InheritsFieldsAggregationOperation extends FieldsExposingAggregationOperation {
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields()
+		 */
 		@Override
 		default boolean inheritsFields() {
 			return true;

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

@@ -84,6 +84,10 @@ public class GeoNearOperation implements AggregationOperation {
 		return new GeoNearOperation(nearQuery, distanceField, key);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -103,11 +107,19 @@ public class GeoNearOperation implements AggregationOperation {
 		return new Document(getOperator(), command);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$geoNear";
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toPipelineStages(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public List<Document> toPipelineStages(AggregationOperationContext context) {
 

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

@@ -77,6 +77,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 		return new GraphLookupOperationFromBuilder();
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -123,6 +126,10 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 		return "$graphLookup";
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -222,6 +229,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 		private @Nullable List<? extends Object> startWith;
 		private @Nullable String connectFrom;
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.FromBuilder#from(java.lang.String)
+		 */
 		@Override
 		public StartWithBuilder from(String collectionName) {
 
@@ -231,6 +241,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 			return this;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(java.lang.String[])
+		 */
 		@Override
 		public ConnectFromBuilder startWith(String... fieldReferences) {
 
@@ -247,6 +260,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 			return this;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(org.springframework.data.mongodb.core.aggregation.AggregationExpression[])
+		 */
 		@Override
 		public ConnectFromBuilder startWith(AggregationExpression... expressions) {
 
@@ -298,6 +314,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 					String.format("Expression must be any of %s but was %s", ALLOWED_START_TYPES, expression.getClass()));
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectFromBuilder#connectFrom(java.lang.String)
+		 */
 		@Override
 		public ConnectToBuilder connectFrom(String fieldName) {
 
@@ -307,6 +326,9 @@ public class GraphLookupOperation implements InheritsFieldsAggregationOperation
 			return this;
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectToBuilder#connectTo(java.lang.String)
+		 */
 		@Override
 		public GraphLookupOperationBuilder connectTo(String fieldName) {
 

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

@@ -391,6 +391,10 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		return new GroupOperationBuilder(this, new Operation(keyword, null, reference, value));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -403,6 +407,10 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		return fields;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -436,6 +444,10 @@ public class GroupOperation implements FieldsExposingAggregationOperation {
 		return new Document(getOperator(), operationObject);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$group";

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

@@ -43,6 +43,10 @@ class InheritingExposedFieldsAggregationOperationContext extends ExposedFieldsAg
 		this.previousContext = previousContext;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.ExposedFieldsAggregationOperationContext#resolveExposedField(org.springframework.data.mongodb.core.aggregation.Field, java.lang.String)
+	 */
 	@Override
 	protected FieldReference resolveExposedField(Field field, String name) {
 

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

@@ -43,11 +43,19 @@ public class LimitOperation implements AggregationOperation {
 		this.maxElements = maxElements;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return new Document(getOperator(), Long.valueOf(maxElements));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$limit";

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

@@ -76,6 +76,10 @@ public class LiteralOperators {
 			super(value);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
+		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$literal";

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

@@ -60,11 +60,19 @@ public class LookupOperation implements FieldsExposingAggregationOperation, Inhe
 		this.as = new ExposedField(as, true);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from(as);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -78,6 +86,10 @@ public class LookupOperation implements FieldsExposingAggregationOperation, Inhe
 		return new Document(getOperator(), lookupObject);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$lookup";

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

@@ -67,6 +67,10 @@ public class MatchOperation implements AggregationOperation {
 		this.expression = expression;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -74,6 +78,10 @@ public class MatchOperation implements AggregationOperation {
 				context.getMappedObject(expression != null ? expression.toDocument() : criteriaDefinition.getCriteriaObject()));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$match";

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

@@ -92,6 +92,10 @@ public class MergeOperation implements FieldsExposingAggregationOperation, Inher
 		return new MergeOperationBuilder();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.Aggregation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -121,11 +125,19 @@ public class MergeOperation implements FieldsExposingAggregationOperation, Inher
 		return new Document(getOperator(), $merge);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$merge";
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -136,6 +148,10 @@ public class MergeOperation implements FieldsExposingAggregationOperation, Inher
 		return ExposedFields.synthetic(Fields.fields(let.getVariableNames()));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation#inheritsFields()
+	 */
 	@Override
 	public boolean inheritsFields() {
 		return true;

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

@@ -50,16 +50,28 @@ class NestedDelegatingExpressionAggregationOperationContext implements Aggregati
 		this.inners = inners;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
+	 */
 	@Override
 	public Document getMappedObject(Document document) {
 		return delegate.getMappedObject(document);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+	 */
 	@Override
 	public Document getMappedObject(Document document, Class<?> type) {
 		return delegate.getMappedObject(document, type);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
+	 */
 	@Override
 	public FieldReference getReference(Field field) {
 
@@ -83,11 +95,19 @@ class NestedDelegatingExpressionAggregationOperationContext implements Aggregati
 		return false;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return new ExpressionFieldReference(delegate.getReference(name));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
+	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return delegate.getFields(type);

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

@@ -206,6 +206,10 @@ public class ObjectOperators {
 			return new MergeObjects(append(Arrays.asList(values)));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(Object value, AggregationOperationContext context) {
 			return super.toDocument(potentiallyExtractSingleValue(value), context);
@@ -224,6 +228,10 @@ public class ObjectOperators {
 			return value;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
+		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$mergeObjects";
@@ -278,6 +286,10 @@ public class ObjectOperators {
 			return new ObjectToArray(value);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
+		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$objectToArray";

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

@@ -186,6 +186,10 @@ public class OutOperation implements AggregationOperation {
 		return mode(OutMode.INSERT);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -209,6 +213,10 @@ public class OutOperation implements AggregationOperation {
 		return new Document(getOperator(), $out);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$out";

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

@@ -55,26 +55,46 @@ public class PrefixingDelegatingAggregationOperationContext implements Aggregati
 		this.denylist = new HashSet<>(denylist);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
+	 */
 	@Override
 	public Document getMappedObject(Document document) {
 		return doPrefix(delegate.getMappedObject(document));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
+	 */
 	@Override
 	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return doPrefix(delegate.getMappedObject(document, type));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
+	 */
 	@Override
 	public FieldReference getReference(Field field) {
 		return delegate.getReference(field);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
+	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return delegate.getReference(name);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
+	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return delegate.getFields(type);

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

@@ -219,6 +219,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		return builder;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
+	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -232,6 +236,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		return fields != null ? fields : ExposedFields.empty();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields()
+	 */
 	@Override
 	public boolean inheritsFields() {
 
@@ -240,6 +248,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				.anyMatch(FieldProjection::isExcluded);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -252,6 +264,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 		return new Document(getOperator(), fieldObject);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$project";
@@ -282,6 +298,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			this.operation = operation;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return this.operation.toDocument(context);
@@ -339,6 +359,9 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			this.params = parameters.clone();
 		}
 
+		/* (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder#project(java.lang.String, java.lang.Object[])
+		 */
 		@Override
 		public ProjectionOperationBuilder project(String operation, final Object... values) {
 
@@ -359,6 +382,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String)
+		 */
 		@Override
 		public ProjectionOperation as(String alias) {
 
@@ -397,6 +424,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				this.params = parameters.clone();
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(getExposedField().getName(), toMongoExpression(context, expression, params));
@@ -499,6 +530,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return this.operation.and(new FieldProjection(Fields.field(alias, getRequiredName()), null));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.ConditionalOperator)
+		 */
 		@Override
 		public ProjectionOperation applyCondition(Cond cond) {
 
@@ -506,6 +541,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return this.operation.and(new ExpressionProjection(Fields.field(getRequiredName()), cond));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.IfNullOperator)
+		 */
 		@Override
 		public ProjectionOperation applyCondition(IfNull ifNull) {
 
@@ -1275,6 +1314,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			return name;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return this.operation.toDocument(context);
@@ -1312,6 +1355,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				this.name = name;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(name, Fields.UNDERSCORE_ID_REF);
@@ -1385,6 +1432,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return Boolean.FALSE.equals(value);
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(field.getName(), renderFieldValue(context));
@@ -1445,6 +1496,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				this.values = Arrays.asList(values);
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
@@ -1485,6 +1540,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				return field;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#getExposedField()
+			 */
 			@Override
 			public ExposedField getExposedField() {
 
@@ -1506,6 +1565,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				final Field aliasedField = Fields.field(alias, this.field.getName());
 				return new OperationProjection(aliasedField, operation, values.toArray()) {
 
+					/*
+					 * (non-Javadoc)
+					 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.OperationProjection#getField()
+					 */
 					@Override
 					protected Field getField() {
 						return aliasedField;
@@ -1535,6 +1598,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 				this.fields = fields;
 			}
 
+			/*
+			 * (non-Javadoc)
+			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
@@ -1699,6 +1766,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			this.expression = expression;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return new Document(field.getName(), expression.toDocument(context));
@@ -1722,6 +1793,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			this.type = type;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -1820,6 +1895,10 @@ public class ProjectionOperation implements FieldsExposingAggregationOperation {
 			this.projections = projections;
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 

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

@@ -67,11 +67,19 @@ public class RedactOperation implements AggregationOperation {
 		this.condition = condition;
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return new Document(getOperator(), condition.toDocument(context));
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
+	 */
 	@Override
 	public String getOperator() {
 		return "$redact";

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

@@ -47,6 +47,10 @@ public class RelaxedTypeBasedAggregationOperationContext extends TypeBasedAggreg
 		super(type, mappingContext, mapper);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext#getReferenceFor(rg.springframework.data.mongodb.core.aggregation.Field)
+	 */
 	@Override
 	protected FieldReference getReferenceFor(Field field) {