diff --git a/Jenkinsfile b/Jenkinsfile index a7e2d38bb9..1e1d3e0908 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,74 +14,42 @@ pipeline { stages { stage("Docker images") { parallel { - stage('Publish JDK 8 + MongoDB 5.0') { + stage('Publish JDK 17 + MongoDB 4.4') { when { - changeset "ci/openjdk8-mongodb-5.0/**" + changeset "ci/openjdk17-mongodb-4.4/**" } agent { label 'data' } options { timeout(time: 30, unit: 'MINUTES') } steps { script { - 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/") + def image = docker.build("springci/spring-data-openjdk17-with-mongodb-4.4.4", "ci/openjdk17-mongodb-4.4/") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } } } } - 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-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') } + stage('Publish JDK 17 + MongoDB 5.0') { + when { + changeset "ci/openjdk17-mongodb-5.0/**" + } + 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() - } - } - } - } + 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() + } + } + } + } } } - stage("test: baseline (jdk8)") { + stage("test: baseline Mongo 5.0 (jdk17)") { when { beforeAgent(true) anyOf { @@ -99,7 +67,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk17-with-mongodb-5.0.3: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' @@ -121,7 +89,7 @@ pipeline { } } parallel { - stage("test: mongodb 4.0 (jdk8)") { + stage("test: baseline MongoDB 4.4 (jdk17)") { agent { label 'data' } @@ -132,7 +100,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-mongodb-4.0.23:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk17-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' @@ -144,78 +112,6 @@ 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' - } - } - } - } - } } } @@ -239,7 +135,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') { 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} " + diff --git a/ci/openjdk16-mongodb-4.4/Dockerfile b/ci/openjdk16-mongodb-4.4/Dockerfile deleted file mode 100644 index 5f49272c4a..0000000000 --- a/ci/openjdk16-mongodb-4.4/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -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/*; diff --git a/ci/openjdk11-mongodb-4.4/Dockerfile b/ci/openjdk17-mongodb-4.4/Dockerfile similarity index 95% rename from ci/openjdk11-mongodb-4.4/Dockerfile rename to ci/openjdk17-mongodb-4.4/Dockerfile index 7de227c4d9..ee919db3b6 100644 --- a/ci/openjdk11-mongodb-4.4/Dockerfile +++ b/ci/openjdk17-mongodb-4.4/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:latest +FROM openjdk:17-bullseye ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive diff --git a/ci/openjdk8-mongodb-5.0/Dockerfile b/ci/openjdk17-mongodb-5.0/Dockerfile similarity index 96% rename from ci/openjdk8-mongodb-5.0/Dockerfile rename to ci/openjdk17-mongodb-5.0/Dockerfile index 53509efd05..3b1d5d0687 100644 --- a/ci/openjdk8-mongodb-5.0/Dockerfile +++ b/ci/openjdk17-mongodb-5.0/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk8:latest +FROM openjdk:17-bullseye ENV TZ=Etc/UTC ENV DEBIAN_FRONTEND=noninteractive @@ -18,3 +18,4 @@ 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/*; + diff --git a/ci/openjdk8-mongodb-4.0/Dockerfile b/ci/openjdk8-mongodb-4.0/Dockerfile deleted file mode 100644 index bb75ccfc14..0000000000 --- a/ci/openjdk8-mongodb-4.0/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -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/*; diff --git a/ci/openjdk8-mongodb-4.4/Dockerfile b/ci/openjdk8-mongodb-4.4/Dockerfile deleted file mode 100644 index f9a814533b..0000000000 --- a/ci/openjdk8-mongodb-4.4/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -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/*; diff --git a/pom.xml b/pom.xml index 63af8ca470..c10356e222 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-mongodb-parent - 3.4.0-SNAPSHOT + 4.0.0-SNAPSHOT pom Spring Data MongoDB @@ -15,7 +15,7 @@ org.springframework.data.build spring-data-parent - 2.7.0-SNAPSHOT + 3.0.0-GH-1617-SNAPSHOT @@ -26,7 +26,7 @@ multi spring-data-mongodb - 2.7.0-SNAPSHOT + 3.0.0-SNAPSHOT 4.4.1 ${mongo} 1.19 diff --git a/spring-data-mongodb-benchmarks/pom.xml b/spring-data-mongodb-benchmarks/pom.xml index e2704a6753..c28a240d2c 100644 --- a/spring-data-mongodb-benchmarks/pom.xml +++ b/spring-data-mongodb-benchmarks/pom.xml @@ -7,7 +7,7 @@ org.springframework.data spring-data-mongodb-parent - 3.4.0-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml index b75f8bf624..2a20c7861b 100644 --- a/spring-data-mongodb-distribution/pom.xml +++ b/spring-data-mongodb-distribution/pom.xml @@ -14,13 +14,19 @@ org.springframework.data spring-data-mongodb-parent - 3.4.0-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml ${basedir}/.. SDMONGO + + + 1.0.0-M1 + ${maven.multiModuleProjectDirectory}/spring-data-mongodb/ + .* + ${maven.multiModuleProjectDirectory}/target/ @@ -29,6 +35,58 @@ org.apache.maven.plugins maven-assembly-plugin + + org.codehaus.mojo + exec-maven-plugin + + + generate-metrics-metadata + prepare-package + + java + + + io.micrometer.docs.metrics.DocsFromSources + + + + generate-tracing-metadata + prepare-package + + java + + + io.micrometer.docs.spans.DocsFromSources + + + + + + io.micrometer + + micrometer-docs-generator-spans + ${micrometer-docs-generator.version} + + jar + + + io.micrometer + + micrometer-docs-generator-metrics + ${micrometer-docs-generator.version} + + jar + + + + true + + ${micrometer-docs-generator.inputPath} + ${micrometer-docs-generator.inclusionPattern} + ${micrometer-docs-generator.outputPath} + + + org.asciidoctor asciidoctor-maven-plugin diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index ca96626cc9..c3b6f62b23 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-mongodb-parent - 3.4.0-SNAPSHOT + 4.0.0-SNAPSHOT ../pom.xml @@ -122,27 +122,6 @@ true - - io.reactivex - rxjava - ${rxjava} - true - - - - io.reactivex - rxjava-reactive-streams - ${rxjava-reactive-streams} - true - - - - io.reactivex.rxjava2 - rxjava - ${rxjava2} - true - - io.reactivex.rxjava3 rxjava @@ -152,12 +131,6 @@ - - org.apache.geronimo.specs - geronimo-jcdi_2.0_spec - 1.0.1 - test - javax.interceptor @@ -167,31 +140,48 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api ${cdi} provided true - javax.annotation - javax.annotation-api - ${javax-annotation-api} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-api} test org.apache.openwebbeans openwebbeans-se + jakarta + ${webbeans} + test + + + + org.apache.openwebbeans + openwebbeans-spi + jakarta + ${webbeans} + test + + + + org.apache.openwebbeans + openwebbeans-impl + jakarta ${webbeans} test - javax.validation - validation-api + jakarta.validation + jakarta.validation-api ${validation} true @@ -203,31 +193,39 @@ true + + io.micrometer + micrometer-tracing + true + + org.hibernate hibernate-validator - 5.4.3.Final + 7.0.1.Final test - org.glassfish - javax.el - 3.0.1-b11 - test + jakarta.el + jakarta.el-api + 4.0.0 + provided + true - joda-time - joda-time - ${jodatime} - test + org.glassfish + jakarta.el + 4.0.2 + provided + true - org.threeten - threetenbp - ${threetenbp} + jakarta.enterprise + jakarta.enterprise.cdi-api + provided true @@ -272,9 +270,9 @@ - javax.transaction - jta - 1.1 + jakarta.transaction + jakarta.transaction-api + 2.0.0 test @@ -310,6 +308,17 @@ test + + io.micrometer + micrometer-test + test + + + io.micrometer + micrometer-tracing-test + test + + diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java index ac735be37f..7c58664196 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java @@ -103,19 +103,11 @@ public BindableMongoExpression bind(Object... args) { 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=" diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java index f0b6c2228a..90c7de073e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java @@ -193,19 +193,11 @@ private static class MongoSessionSynchronization extends ResourceHolderSynchroni 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) { @@ -214,10 +206,6 @@ protected void processResourceAfterCommit(MongoResourceHolder resourceHolder) { } } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.ResourceHolderSynchronization#afterCompletion(int) - */ @Override public void afterCompletion(int status) { @@ -228,10 +216,6 @@ public void afterCompletion(int status) { super.afterCompletion(status); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.ResourceHolderSynchronization#releaseResource(java.lang.Object, java.lang.Object) - */ @Override protected void releaseResource(MongoResourceHolder resourceHolder, Object resourceKey) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java index d244da6296..7f03d3f557 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java @@ -106,10 +106,6 @@ public MongoTransactionManager(MongoDatabaseFactory dbFactory, @Nullable Transac this.options = options; } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doGetTransaction() - */ @Override protected Object doGetTransaction() throws TransactionException { @@ -118,19 +114,11 @@ protected Object doGetTransaction() throws TransactionException { return new MongoTransactionObject(resourceHolder); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#isExistingTransaction(java.lang.Object) - */ @Override protected boolean isExistingTransaction(Object transaction) throws TransactionException { return extractMongoTransaction(transaction).hasResourceHolder(); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doBegin(java.lang.Object, org.springframework.transaction.TransactionDefinition) - */ @Override protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException { @@ -160,10 +148,6 @@ protected void doBegin(Object transaction, TransactionDefinition definition) thr TransactionSynchronizationManager.bindResource(getRequiredDbFactory(), resourceHolder); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSuspend(java.lang.Object) - */ @Override protected Object doSuspend(Object transaction) throws TransactionException { @@ -173,19 +157,11 @@ protected Object doSuspend(Object transaction) throws TransactionException { return TransactionSynchronizationManager.unbindResource(getRequiredDbFactory()); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doResume(java.lang.Object, java.lang.Object) - */ @Override protected void doResume(@Nullable Object transaction, Object suspendedResources) { TransactionSynchronizationManager.bindResource(getRequiredDbFactory(), suspendedResources); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doCommit(org.springframework.transaction.support.DefaultTransactionStatus) - */ @Override protected final void doCommit(DefaultTransactionStatus status) throws TransactionException { @@ -236,10 +212,6 @@ protected void doCommit(MongoTransactionObject transactionObject) throws Excepti transactionObject.commitTransaction(); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doRollback(org.springframework.transaction.support.DefaultTransactionStatus) - */ @Override protected void doRollback(DefaultTransactionStatus status) throws TransactionException { @@ -259,10 +231,6 @@ protected void doRollback(DefaultTransactionStatus status) throws TransactionExc } } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSetRollbackOnly(org.springframework.transaction.support.DefaultTransactionStatus) - */ @Override protected void doSetRollbackOnly(DefaultTransactionStatus status) throws TransactionException { @@ -270,10 +238,6 @@ protected void doSetRollbackOnly(DefaultTransactionStatus status) throws Transac transactionObject.getRequiredResourceHolder().setRollbackOnly(); } - /* - * (non-Javadoc) - * org.springframework.transaction.support.AbstractPlatformTransactionManager#doCleanupAfterCompletion(java.lang.Object) - */ @Override protected void doCleanupAfterCompletion(Object transaction) { @@ -325,19 +289,11 @@ public MongoDatabaseFactory getDbFactory() { 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(); @@ -505,19 +461,11 @@ private ClientSession getRequiredSession() { return session; } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.SmartTransactionObject#isRollbackOnly() - */ @Override public boolean isRollbackOnly() { return this.resourceHolder != null && this.resourceHolder.isRollbackOnly(); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.SmartTransactionObject#flush() - */ @Override public void flush() { TransactionSynchronizationUtils.triggerFlush(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java index 4ae9e227f1..76172ea843 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java @@ -214,19 +214,11 @@ private static class MongoSessionSynchronization this.resourceHolder = resourceHolder; } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#shouldReleaseBeforeCompletion() - */ @Override protected boolean shouldReleaseBeforeCompletion() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#processResourceAfterCommit(java.lang.Object) - */ @Override protected Mono processResourceAfterCommit(ReactiveMongoResourceHolder resourceHolder) { @@ -237,10 +229,6 @@ protected Mono processResourceAfterCommit(ReactiveMongoResourceHolder reso return Mono.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#afterCompletion(int) - */ @Override public Mono afterCompletion(int status) { @@ -256,10 +244,6 @@ public Mono afterCompletion(int status) { }); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#releaseResource(java.lang.Object, java.lang.Object) - */ @Override protected Mono releaseResource(ReactiveMongoResourceHolder resourceHolder, Object resourceKey) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java index 711af76f53..d35eaf4adc 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java @@ -110,10 +110,6 @@ public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFact 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 { @@ -123,19 +119,11 @@ protected Object doGetTransaction(TransactionSynchronizationManager synchronizat return new ReactiveMongoTransactionObject(resourceHolder); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#isExistingTransaction(java.lang.Object) - */ @Override protected boolean isExistingTransaction(Object transaction) throws TransactionException { return extractMongoTransaction(transaction).hasResourceHolder(); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doBegin(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, org.springframework.transaction.TransactionDefinition) - */ @Override protected Mono doBegin(TransactionSynchronizationManager synchronizationManager, Object transaction, TransactionDefinition definition) throws TransactionException { @@ -175,10 +163,6 @@ protected Mono doBegin(TransactionSynchronizationManager synchronizationMa }); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSuspend(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object) - */ @Override protected Mono doSuspend(TransactionSynchronizationManager synchronizationManager, Object transaction) throws TransactionException { @@ -192,10 +176,6 @@ protected Mono doSuspend(TransactionSynchronizationManager synchronizati }); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doResume(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, java.lang.Object) - */ @Override protected Mono doResume(TransactionSynchronizationManager synchronizationManager, @Nullable Object transaction, Object suspendedResources) { @@ -203,10 +183,6 @@ protected Mono doResume(TransactionSynchronizationManager synchronizationM .fromRunnable(() -> synchronizationManager.bindResource(getRequiredDatabaseFactory(), suspendedResources)); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCommit(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction) - */ @Override protected final Mono doCommit(TransactionSynchronizationManager synchronizationManager, GenericReactiveTransaction status) throws TransactionException { @@ -243,10 +219,6 @@ protected Mono doCommit(TransactionSynchronizationManager synchronizationM return transactionObject.commitTransaction(); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doRollback(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction) - */ @Override protected Mono doRollback(TransactionSynchronizationManager synchronizationManager, GenericReactiveTransaction status) { @@ -268,10 +240,6 @@ protected Mono doRollback(TransactionSynchronizationManager synchronizatio }); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSetRollbackOnly(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction) - */ @Override protected Mono doSetRollbackOnly(TransactionSynchronizationManager synchronizationManager, GenericReactiveTransaction status) throws TransactionException { @@ -282,10 +250,6 @@ protected Mono doSetRollbackOnly(TransactionSynchronizationManager synchro }); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCleanupAfterCompletion(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object) - */ @Override protected Mono doCleanupAfterCompletion(TransactionSynchronizationManager synchronizationManager, Object transaction) { @@ -340,10 +304,6 @@ public ReactiveMongoDatabaseFactory getDatabaseFactory() { return databaseFactory; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { getRequiredDatabaseFactory(); @@ -509,19 +469,11 @@ private ClientSession getRequiredSession() { return session; } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.SmartTransactionObject#isRollbackOnly() - */ @Override public boolean isRollbackOnly() { return this.resourceHolder != null && this.resourceHolder.isRollbackOnly(); } - /* - * (non-Javadoc) - * @see org.springframework.transaction.support.SmartTransactionObject#flush() - */ @Override public void flush() { throw new UnsupportedOperationException("flush() not supported"); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java index b9b2c88130..54ce5ae878 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java @@ -95,10 +95,6 @@ public SessionAwareMethodInterceptor(ClientSession session, T target, Class< this.sessionType = sessionType; } - /* - * (non-Javadoc) - * @see org.aopalliance.intercept.MethodInterceptor(org.aopalliance.intercept.MethodInvocation) - */ @Nullable @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java index 2141063afc..cf284218fe 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java @@ -30,10 +30,6 @@ */ public class ConnectionStringPropertyEditor extends PropertyEditorSupport { - /* - * (non-Javadoc) - * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String) - */ @Override public void setAsText(@Nullable String connectionString) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java index d6653e8999..c5627ebf0f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java @@ -34,10 +34,6 @@ */ class GridFsTemplateParser extends AbstractBeanDefinitionParser { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -46,10 +42,6 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE_BEAN_NAME; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java index 0e825afe1a..02972e9933 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java @@ -80,7 +80,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser { private static final String BASE_PACKAGE = "base-package"; - private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator", + private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator", MappingMongoConverterParser.class.getClassLoader()); /* (non-Javadoc) @@ -376,10 +376,6 @@ public NegatingFilter(TypeFilter... filters) { 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 { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java index 241080afb1..1fd10f952f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java @@ -47,28 +47,16 @@ 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java index ff73015899..7eb00ede13 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java @@ -18,6 +18,7 @@ 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; @@ -27,6 +28,8 @@ 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; @@ -39,28 +42,16 @@ */ class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class 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) { @@ -70,10 +61,6 @@ public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanD 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) { @@ -81,17 +68,13 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class); - BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class); - definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR); + BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(org.springframework.data.repository.config.PersistentEntitiesFactoryBean.class); + definition.addConstructorArgValue(new RuntimeBeanReference(MappingContext.class)); 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java index 91b89593c2..84f94a69f3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java @@ -35,10 +35,6 @@ */ public class MongoClientParser implements BeanDefinitionParser { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ public BeanDefinition parse(Element element, ParserContext parserContext) { Object source = parserContext.extractSource(element); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java index 5991a683ef..cb4b3a6bc6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java @@ -51,10 +51,6 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport { private static final String OPTIONS_DELIMITER = "?"; private static final String OPTION_VALUE_DELIMITER = "&"; - /* - * (non-Javadoc) - * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String) - */ @Override public void setAsText(@Nullable String text) throws IllegalArgumentException { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java index d4e1c65358..0d4e5f4a50 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java @@ -62,10 +62,6 @@ 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 { @@ -74,10 +70,6 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY_BEAN_NAME; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java index 5bdb199a50..a54069bfea 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java @@ -26,10 +26,6 @@ */ public class MongoNamespaceHandler extends NamespaceHandlerSupport { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.NamespaceHandler#init() - */ public void init() { registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java index dc02a1eee4..b599912b35 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java @@ -39,10 +39,6 @@ */ class MongoTemplateParser extends AbstractBeanDefinitionParser { - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { @@ -51,10 +47,6 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE_BEAN_NAME; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) - */ @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java index 29d606c4de..53ecbe2a26 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java @@ -41,19 +41,11 @@ public PersistentEntitiesFactoryBean(MappingMongoConverter converter) { 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; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java index 01123cb7d6..46a4ee7de6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java @@ -38,28 +38,16 @@ */ class ReactiveMongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class 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) { @@ -74,10 +62,6 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java index c7b6479a24..5cb2ee33d6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java @@ -32,10 +32,6 @@ */ 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java index acf952069f..ccfc19c120 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java @@ -29,10 +29,6 @@ */ public class ReadPreferencePropertyEditor extends PropertyEditorSupport { - /* - * (non-Javadoc) - * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String) - */ @Override public void setAsText(@Nullable String readPreferenceString) throws IllegalArgumentException { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java index 2b96add6bc..7dfb8348dd 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java @@ -46,10 +46,6 @@ 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java index 359e165061..85279edf1a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java @@ -26,10 +26,6 @@ */ public class StringToWriteConcernConverter implements Converter { - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ public WriteConcern convert(String source) { WriteConcern writeConcern = WriteConcern.valueOf(source); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java index 5e9e6b39ee..a6f9670802 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java @@ -29,10 +29,6 @@ */ public class UUidRepresentationPropertyEditor extends PropertyEditorSupport { - /* - * (non-Javadoc) - * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String) - */ @Override public void setAsText(@Nullable String value) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java index 55a65a2baa..fee61b71da 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java @@ -189,10 +189,6 @@ private Object doGetConverted(Document fullDocument) { 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 + '}'; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java index f4d72f648b..27fca99993 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java @@ -109,10 +109,6 @@ void setDefaultWriteConcern(@Nullable WriteConcern defaultWriteConcern) { this.defaultWriteConcern = defaultWriteConcern; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object) - */ @Override public BulkOperations insert(Object document) { @@ -125,10 +121,6 @@ public BulkOperations insert(Object document) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List) - */ @Override public BulkOperations insert(List documents) { @@ -139,10 +131,6 @@ public BulkOperations insert(List documents) { 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) { @@ -153,10 +141,6 @@ public BulkOperations updateOne(Query query, Update update) { 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> updates) { @@ -169,10 +153,6 @@ public BulkOperations updateOne(List> updates) { 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) { @@ -183,10 +163,6 @@ public BulkOperations updateMulti(Query query, Update update) { 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> updates) { @@ -199,19 +175,11 @@ public BulkOperations updateMulti(List> updates) { 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> updates) { @@ -222,10 +190,6 @@ public BulkOperations upsert(List> updates) { 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) { @@ -239,10 +203,6 @@ public BulkOperations remove(Query query) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List) - */ @Override public BulkOperations remove(List removes) { @@ -255,10 +215,6 @@ public BulkOperations remove(List removes) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.BulkOperations#replaceOne(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions) - */ @Override public BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) { @@ -278,10 +234,6 @@ public BulkOperations replaceOne(Query query, Object replacement, FindAndReplace return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk() - */ @Override public com.mongodb.bulk.BulkWriteResult execute() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java index 010f494f6a..bf9adedca7 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java @@ -112,10 +112,6 @@ public DefaultIndexOperations(MongoOperations mongoOperations, String collection this.type = type; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition) - */ public String ensureIndex(final IndexDefinition indexDefinition) { return execute(collection -> { @@ -150,10 +146,6 @@ private MongoPersistentEntity lookupPersistentEntity(@Nullable Class entit return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexOperations#dropIndex(java.lang.String) - */ public void dropIndex(final String name) { execute(collection -> { @@ -163,18 +155,10 @@ public void dropIndex(final String name) { } - /* - * (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 getIndexInfo() { return execute(new CollectionCallback>() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java index 4ca69116df..5c70ed4cd3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java @@ -42,10 +42,6 @@ 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); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java index 832d91a1a7..08f54cfa28 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java @@ -86,10 +86,6 @@ private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, this.type = type; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition) - */ public Mono ensureIndex(final IndexDefinition indexDefinition) { return mongoOperations.execute(collectionName, collection -> { @@ -119,26 +115,14 @@ private MongoPersistentEntity lookupPersistentEntity(String collection) { .orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropIndex(java.lang.String) - */ public Mono 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 dropAllIndexes() { return dropIndex("*"); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#getIndexInfo() - */ public Flux getIndexInfo() { return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) // diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java index 309b064310..fb1ce6212f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java @@ -70,19 +70,11 @@ public DefaultScriptOperations(MongoOperations mongoOperations) { 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) { @@ -92,10 +84,6 @@ public NamedMongoScript register(NamedMongoScript script) { 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) { @@ -115,10 +103,6 @@ public Object doInDB(MongoDatabase db) throws MongoException, DataAccessExceptio }); } - /* - * (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) { @@ -135,10 +119,6 @@ public Object doInDB(MongoDatabase db) throws MongoException, DataAccessExceptio }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ScriptOperations#exists(java.lang.String) - */ @Override public boolean exists(String scriptName) { @@ -147,10 +127,6 @@ public boolean exists(String scriptName) { 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 getScriptNames() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java index 450ac2cd4a..ec019f4a76 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java @@ -403,37 +403,21 @@ protected UnmappedEntity(T map) { 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) { @@ -443,19 +427,11 @@ public T populateIdIfNecessary(@Nullable Object id) { return map; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getQueryForVersion() - */ @Override public Query getQueryForVersion() { throw new MappingException("Cannot query for version on plain Documents!"); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter) - */ @Override public MappedDocument toMappedDocument(MongoWriter writer) { return MappedDocument.of(map instanceof Document // @@ -463,47 +439,27 @@ public MappedDocument toMappedDocument(MongoWriter writer) { : 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; @@ -516,10 +472,6 @@ protected SimpleMappedEntity(T map) { super(map); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter) - */ @Override @SuppressWarnings("unchecked") public MappedDocument toMappedDocument(MongoWriter writer) { @@ -559,28 +511,16 @@ private static MappedEntity of(T bean, 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() { @@ -593,10 +533,6 @@ public Query getByIdQuery() { return Query.query(Criteria.where(idProperty.getName()).is(getId())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getQueryForVersion(java.lang.Object) - */ @Override public Query getQueryForVersion() { @@ -607,10 +543,6 @@ public Query getQueryForVersion() { .and(versionProperty.getName()).is(getVersion())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter) - */ @Override public MappedDocument toMappedDocument(MongoWriter writer) { @@ -626,10 +558,6 @@ public MappedDocument toMappedDocument(MongoWriter writer) { return MappedDocument.of(document); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.Entity#assertUpdateableIdIfNotSet() - */ public void assertUpdateableIdIfNotSet() { if (!entity.hasIdProperty()) { @@ -650,38 +578,22 @@ public void assertUpdateableIdIfNotSet() { } } - /* - * (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()); @@ -716,10 +628,6 @@ private static AdaptibleEntity of(T bean, 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) { @@ -741,10 +649,6 @@ public T populateIdIfNecessary(@Nullable Object id) { return propertyAccessor.getBean(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.MappedEntity#getVersion() - */ @Override @Nullable public Number getVersion() { @@ -754,10 +658,6 @@ public Number getVersion() { return propertyAccessor.getProperty(versionProperty, Number.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#initializeVersionProperty() - */ @Override public T initializeVersionProperty() { @@ -772,10 +672,6 @@ public T initializeVersionProperty() { return propertyAccessor.getBean(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#incrementVersion() - */ @Override public T incrementVersion() { @@ -847,19 +743,11 @@ public static TypedOperations instance() { return (TypedOperations) INSTANCE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation() - */ @Override public Optional 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 getCollation(Query query) { @@ -894,19 +782,11 @@ protected TypedEntityOperations(MongoPersistentEntity entity) { this.entity = entity; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation() - */ @Override public Optional 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 getCollation(Query query) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java index c45ad0404d..9ac2497d09 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java @@ -37,10 +37,6 @@ class ExecutableAggregationOperationSupport implements ExecutableAggregationOper this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class) - */ @Override public ExecutableAggregation aggregateAndReturn(Class domainType) { @@ -69,10 +65,6 @@ public ExecutableAggregationSupport(MongoTemplate template, Class domainType, this.collection = collection; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithCollection#inCollection(java.lang.String) - */ @Override public AggregationWithAggregation inCollection(String collection) { @@ -81,10 +73,6 @@ public AggregationWithAggregation inCollection(String collection) { 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 by(Aggregation aggregation) { @@ -93,19 +81,11 @@ public TerminatingAggregation by(Aggregation aggregation) { return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#all() - */ @Override public AggregationResults all() { return template.aggregate(aggregation, getCollectionName(aggregation), domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#stream() - */ @Override public CloseableIterator stream() { return template.aggregateStream(aggregation, getCollectionName(aggregation), domainType); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java index c196babfa0..127ddb8aa8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java @@ -51,10 +51,6 @@ class ExecutableFindOperationSupport implements ExecutableFindOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class) - */ @Override public ExecutableFind query(Class domainType) { @@ -86,10 +82,6 @@ static class ExecutableFindSupport this.query = query; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithCollection#inCollection(java.lang.String) - */ @Override public FindWithProjection inCollection(String collection) { @@ -98,10 +90,6 @@ public FindWithProjection inCollection(String collection) { return new ExecutableFindSupport<>(template, domainType, returnType, collection, query); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithProjection#as(Class) - */ @Override public FindWithQuery as(Class returnType) { @@ -110,10 +98,6 @@ public FindWithQuery as(Class returnType) { 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 matching(Query query) { @@ -122,10 +106,6 @@ public TerminatingFind matching(Query query) { return new ExecutableFindSupport<>(template, domainType, returnType, collection, query); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#oneValue() - */ @Override public T oneValue() { @@ -142,10 +122,6 @@ public T oneValue() { return result.iterator().next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#firstValue() - */ @Override public T firstValue() { @@ -154,55 +130,31 @@ public T firstValue() { return ObjectUtils.isEmpty(result) ? null : result.iterator().next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#all() - */ @Override public List all() { return doFind(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#stream() - */ @Override public Stream 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 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 distinct(String field) { @@ -257,10 +209,6 @@ static class DelegatingQueryCursorPreparer implements CursorPreparer { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.clientFindIterable) - */ @Override public FindIterable prepare(FindIterable iterable) { @@ -295,10 +243,6 @@ public DistinctOperationSupport(ExecutableFindSupport delegate, String field) this.field = field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithProjection#as(java.lang.Class) - */ @Override @SuppressWarnings("unchecked") public TerminatingDistinct as(Class resultType) { @@ -308,10 +252,6 @@ public TerminatingDistinct as(Class resultType) { 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 matching(Query query) { @@ -320,10 +260,6 @@ public TerminatingDistinct matching(Query query) { return new DistinctOperationSupport<>((ExecutableFindSupport) delegate.matching(query), field); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingDistinct#all() - */ @Override public List all() { return delegate.doFindDistinct(field); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java index 3565aad04c..947bd1bc4b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java @@ -40,10 +40,6 @@ class ExecutableInsertOperationSupport implements ExecutableInsertOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.coreExecutableInsertOperation#insert(java.lan.Class) - */ @Override public ExecutableInsert insert(Class domainType) { @@ -71,10 +67,6 @@ static class ExecutableInsertSupport implements ExecutableInsert { this.bulkMode = bulkMode; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#insert(java.lang.Class) - */ @Override public T one(T object) { @@ -83,10 +75,6 @@ public T one(T object) { return template.insert(object, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#all(java.util.Collection) - */ @Override public Collection all(Collection objects) { @@ -95,10 +83,6 @@ public Collection all(Collection objects) { return template.insert(objects, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingBulkInsert#bulk(java.util.Collection) - */ @Override public BulkWriteResult bulk(Collection objects) { @@ -108,10 +92,6 @@ public BulkWriteResult bulk(Collection objects) { .insert(new ArrayList<>(objects)).execute(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithCollection#inCollection(java.lang.String) - */ @Override public InsertWithBulkMode inCollection(String collection) { @@ -120,10 +100,6 @@ public InsertWithBulkMode inCollection(String collection) { 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 withBulkMode(BulkMode bulkMode) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java index 7cc90b4676..54176d24ad 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java @@ -41,10 +41,6 @@ public ExecutableRemoveOperationSupport(MongoTemplate tempate) { this.tempate = tempate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class) - */ @Override public ExecutableRemove remove(Class domainType) { @@ -71,10 +67,6 @@ public ExecutableRemoveSupport(MongoTemplate template, Class domainType, Quer this.collection = collection; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithCollection#inCollection(java.lang.String) - */ @Override public RemoveWithQuery inCollection(String collection) { @@ -83,10 +75,6 @@ public RemoveWithQuery inCollection(String collection) { 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 matching(Query query) { @@ -95,28 +83,16 @@ public TerminatingRemove matching(Query query) { 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 findAndRemove() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java index 0a57d77458..2a0ae1d008 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java @@ -40,10 +40,6 @@ class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class) - */ @Override public ExecutableUpdate update(Class domainType) { @@ -85,10 +81,6 @@ static class ExecutableUpdateSupport this.targetType = targetType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition) - */ @Override public TerminatingUpdate apply(UpdateDefinition update) { @@ -98,10 +90,6 @@ public TerminatingUpdate apply(UpdateDefinition update) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithCollection#inCollection(java.lang.String) - */ @Override public UpdateWithQuery inCollection(String collection) { @@ -111,10 +99,6 @@ public UpdateWithQuery inCollection(String collection) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions) - */ @Override public TerminatingFindAndModify withOptions(FindAndModifyOptions options) { @@ -124,10 +108,6 @@ public TerminatingFindAndModify withOptions(FindAndModifyOptions options) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#replaceWith(Object) - */ @Override public FindAndReplaceWithProjection replaceWith(T replacement) { @@ -137,10 +117,6 @@ public FindAndReplaceWithProjection replaceWith(T replacement) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions) - */ @Override public FindAndReplaceWithProjection withOptions(FindAndReplaceOptions options) { @@ -150,10 +126,6 @@ public FindAndReplaceWithProjection withOptions(FindAndReplaceOptions options options, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.query.Query) - */ @Override public UpdateWithUpdate matching(Query query) { @@ -163,10 +135,6 @@ public UpdateWithUpdate matching(Query query) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class) - */ @Override public FindAndReplaceWithOptions as(Class resultType) { @@ -176,37 +144,21 @@ public FindAndReplaceWithOptions as(Class resultType) { 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() { @@ -215,10 +167,6 @@ public UpdateResult upsert() { getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndReplace#findAndReplaceValue() - */ @Override public @Nullable T findAndReplaceValue() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java index e3c1f3d64c..f5cc526472 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java @@ -112,55 +112,31 @@ class MappedUpdate implements UpdateDefinition { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject() - */ @Override public Document getUpdateObject() { return delegate.getUpdateObject(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#modifies(java.lang.String) - */ @Override public boolean modifies(String key) { return delegate.modifies(key); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String) - */ @Override public void inc(String version) { delegate.inc(version); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated() - */ @Override public Boolean isIsolated() { return delegate.isIsolated(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters() - */ @Override public List getArrayFilters() { return delegate.getArrayFilters(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#hasArrayFilters() - */ @Override public boolean hasArrayFilters() { return delegate.hasArrayFilters(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java index 2f56c2dce6..1045ce7990 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java @@ -91,10 +91,6 @@ public MongoJsonSchemaCreator filter(Predicate filter return new MappingMongoJsonSchemaCreator(converter, mappingContext, filter); } - /* - * (non-Javadoc) - * org.springframework.data.mongodb.core.MongoJsonSchemaCreator#createSchemaFor(java.lang.Class) - */ @Override public MongoJsonSchema createSchemaFor(Class type) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java index 1e3465cd8b..f0afee565b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java @@ -46,25 +46,16 @@ public MongoAdmin(MongoClient client) { 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(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java index 22194a451a..cf218e5813 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java @@ -119,27 +119,15 @@ public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exce this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ public Class 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()); @@ -336,10 +324,6 @@ private T computeSettingsValue(T defaultValue, T fromSettings, T fromConnect 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 { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java index 9c8419a154..bdbcc6f347 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java @@ -84,18 +84,10 @@ public void setWriteConcern(WriteConcern writeConcern) { 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 { @@ -118,28 +110,16 @@ public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException */ 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); } @@ -180,55 +160,31 @@ public ClientSessionBoundMongoDbFactory(ClientSession session, MongoDatabaseFact 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(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java index 907e180d13..89fe290ae5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java @@ -88,10 +88,6 @@ public void setSchemaMap(Map schemaMap) { this.schemaMap = schemaMap; } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObject() - */ @Override public AutoEncryptionSettings getObject() { @@ -109,10 +105,6 @@ private Map orEmpty(@Nullable Map source) { return source != null ? source : Collections.emptyMap(); } - /* - * (non-Javadoc) - * @see org.springframework.beans.factory.FactoryBean#getObjectType() - */ @Override public Class getObjectType() { return AutoEncryptionSettings.class; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java index b060d43262..6b0fe3d265 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java @@ -68,10 +68,6 @@ public class MongoExceptionTranslator implements PersistenceExceptionTranslator private static final Set 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index a07e3fee76..bf8386a2d4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -308,10 +308,6 @@ public void setReadPreference(@Nullable ReadPreference readPreference) { this.readPreference = readPreference; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { prepareIndexCreator(applicationContext); @@ -378,19 +374,11 @@ public MongoConverter getConverter() { return this.mongoConverter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#executeAsStream(org.springframework.data.mongodb.core.query.Query, java.lang.Class) - */ @Override public CloseableIterator stream(Query query, Class 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 CloseableIterator stream(Query query, Class entityType, String collectionName) { return doStream(query, entityType, collectionName, entityType); @@ -429,10 +417,6 @@ public String getCollectionName(Class entityClass) { return this.operations.determineCollectionName(entityClass); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(java.lang.String) - */ @Override @SuppressWarnings("ConstantConditions") public Document executeCommand(String jsonCommand) { @@ -442,10 +426,6 @@ public Document executeCommand(String jsonCommand) { 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) { @@ -455,11 +435,6 @@ public Document executeCommand(Document command) { 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) { @@ -471,10 +446,6 @@ public Document executeCommand(Document command, @Nullable ReadPreference readPr : 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)); @@ -511,10 +482,6 @@ protected void executeQuery(Query query, String collectionName, DocumentCallback 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 execute(DbCallback action) { Assert.notNull(action, "DbCallback must not be null!"); @@ -527,20 +494,12 @@ public T execute(DbCallback action) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.DbCallback) - */ public T execute(Class entityClass, CollectionCallback 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 execute(String collectionName, CollectionCallback callback) { Assert.notNull(collectionName, "CollectionName must not be null!"); @@ -554,10 +513,6 @@ public T execute(String collectionName, CollectionCallback callback) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#withSession(com.mongodb.ClientSessionOptions) - */ @Override public SessionScoped withSession(ClientSessionOptions options) { @@ -566,10 +521,6 @@ public SessionScoped withSession(ClientSessionOptions options) { 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) { @@ -589,18 +540,10 @@ public void setSessionSynchronization(SessionSynchronization sessionSynchronizat this.sessionSynchronization = sessionSynchronization; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class) - */ public MongoCollection createCollection(Class 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 MongoCollection createCollection(Class entityClass, @Nullable CollectionOptions collectionOptions) { @@ -615,10 +558,6 @@ public MongoCollection createCollection(Class entityClass, return doCreateCollection(getCollectionName(entityClass), convertToDocument(options, entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String) - */ public MongoCollection createCollection(String collectionName) { Assert.notNull(collectionName, "CollectionName must not be null!"); @@ -626,10 +565,6 @@ public MongoCollection createCollection(String collectionName) { 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 createCollection(String collectionName, @Nullable CollectionOptions collectionOptions) { @@ -637,10 +572,6 @@ public MongoCollection createCollection(String collectionName, return doCreateCollection(collectionName, convertToDocument(collectionOptions)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#getCollection(java.lang.String) - */ @SuppressWarnings("ConstantConditions") public MongoCollection getCollection(String collectionName) { @@ -649,18 +580,10 @@ public MongoCollection getCollection(String collectionName) { return execute(db -> db.getCollection(collectionName, Document.class)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.Class) - */ public boolean collectionExists(Class 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) { @@ -677,18 +600,10 @@ public boolean collectionExists(String collectionName) { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.Class) - */ public void dropCollection(Class 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!"); @@ -708,42 +623,22 @@ public IndexOperations indexOps(String collectionName) { 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!"); @@ -758,10 +653,6 @@ public BulkOperations bulkOps(BulkMode mode, @Nullable Class entityType, Stri return operations; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#scriptOps() - */ @Override public ScriptOperations scriptOps() { return new DefaultScriptOperations(this); @@ -822,19 +713,11 @@ public boolean exists(Query query, @Nullable Class entityClass, String collec // 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 List find(Query query, Class 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 List find(Query query, Class entityClass, String collectionName) { @@ -865,19 +748,11 @@ public T findById(Object id, Class entityClass, String collectionName) { 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 List findDistinct(Query query, String field, Class entityClass, Class 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 List findDistinct(Query query, String field, String collectionName, Class entityClass, @@ -1027,10 +902,6 @@ public T findAndModify(Query query, UpdateDefinition update, FindAndModifyOp 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 T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class entityType, String collectionName, Class resultType) { @@ -1106,10 +977,6 @@ public long count(Query query, String collectionName) { 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!"); @@ -1135,10 +1002,6 @@ protected long doCount(String collectionName, Document filter, CountOptions opti 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()); @@ -1148,10 +1011,6 @@ protected long doEstimatedCount(String collectionName, EstimatedDocumentCountOpt return execute(collectionName, collection -> collection.estimatedDocumentCount(options)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object) - */ @Override public T insert(T objectToSave) { @@ -1161,10 +1020,6 @@ public T insert(T objectToSave) { return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object, java.lang.String) - */ @Override @SuppressWarnings("unchecked") public T insert(T objectToSave, String collectionName) { @@ -1978,17 +1833,11 @@ public GroupByResults group(@Nullable Criteria criteria, String inputColl 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 AggregationResults aggregate(TypedAggregation aggregation, Class 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 AggregationResults aggregate(TypedAggregation aggregation, String inputCollectionName, Class outputType) { @@ -1998,9 +1847,6 @@ public AggregationResults aggregate(TypedAggregation aggregation, Stri 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 AggregationResults aggregate(Aggregation aggregation, Class inputType, Class outputType) { @@ -2008,17 +1854,11 @@ public AggregationResults aggregate(Aggregation aggregation, Class inp 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 AggregationResults aggregate(Aggregation aggregation, String collectionName, Class 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 CloseableIterator aggregateStream(TypedAggregation aggregation, String inputCollectionName, Class outputType) { @@ -2030,17 +1870,11 @@ public CloseableIterator aggregateStream(TypedAggregation aggregation, 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 CloseableIterator aggregateStream(TypedAggregation aggregation, Class 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 CloseableIterator aggregateStream(Aggregation aggregation, Class inputType, Class outputType) { @@ -2048,34 +1882,22 @@ public CloseableIterator aggregateStream(Aggregation aggregation, Class CloseableIterator aggregateStream(Aggregation aggregation, String collectionName, Class 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 List findAllAndRemove(Query query, String collectionName) { return (List) 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 List findAllAndRemove(Query query, Class 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 List findAllAndRemove(Query query, Class entityClass, String collectionName) { return doFindAndDelete(collectionName, query, entityClass); @@ -2243,55 +2065,31 @@ protected CloseableIterator aggregateStream(Aggregation aggregation, Stri }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class) - */ @Override public ExecutableFind query(Class domainType) { return new ExecutableFindOperationSupport(this).query(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class) - */ @Override public ExecutableUpdate update(Class domainType) { return new ExecutableUpdateOperationSupport(this).update(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class) - */ @Override public ExecutableRemove remove(Class domainType) { return new ExecutableRemoveOperationSupport(this).remove(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class) - */ @Override public ExecutableAggregation aggregateAndReturn(Class domainType) { return new ExecutableAggregationOperationSupport(this).aggregateAndReturn(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class) - */ @Override public ExecutableMapReduce mapReduce(Class domainType) { return new ExecutableMapReduceOperationSupport(this).mapReduce(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#insert(java.lang.Class) - */ @Override public ExecutableInsert insert(Class domainType) { return new ExecutableInsertOperationSupport(this).insert(domainType); @@ -2326,10 +2124,6 @@ protected String replaceWithResourceIfNecessary(String function) { return func; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollectionNames() - */ @SuppressWarnings("ConstantConditions") public Set getCollectionNames() { return execute(db -> { @@ -3156,10 +2950,6 @@ private static class FindAndReplaceCallback implements CollectionCallback collection) throws MongoException, DataAccessException { @@ -3251,10 +3041,6 @@ private class ProjectingReadCallback implements DocumentCallback { this.collectionName = collectionName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoTemplate.DocumentCallback#doWith(org.bson.Document) - */ @SuppressWarnings("unchecked") public T doWith(Document document) { @@ -3286,10 +3072,6 @@ class QueryCursorPreparer implements CursorPreparer { this.type = type; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.DBCursor) - */ public FindIterable prepare(FindIterable iterable) { FindIterable cursorToUse = iterable; @@ -3548,10 +3330,6 @@ static class SessionBoundMongoTemplate extends MongoTemplate { this.session = session; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoTemplate#getCollection(java.lang.String) - */ @Override public MongoCollection getCollection(String collectionName) { @@ -3559,10 +3337,6 @@ public MongoCollection getCollection(String collectionName) { return delegate.getCollection(collectionName); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.MongoTemplate#getDb() - */ @Override public MongoDatabase getDb() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java index 35c8052e72..791706e23d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java @@ -46,10 +46,6 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class) - */ @Override public ReactiveAggregation aggregateAndReturn(Class domainType) { @@ -75,10 +71,6 @@ static class ReactiveAggregationSupport this.collection = collection; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.AggregationOperationWithCollection#inCollection(java.lang.String) - */ @Override public AggregationOperationWithAggregation inCollection(String collection) { @@ -87,10 +79,6 @@ public AggregationOperationWithAggregation inCollection(String collection) { 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 by(Aggregation aggregation) { @@ -99,10 +87,6 @@ public TerminatingAggregationOperation by(Aggregation aggregation) { return new ReactiveAggregationSupport<>(template, domainType, aggregation, collection); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.TerminatingAggregationOperation#all() - */ @Override public Flux all() { return template.aggregate(aggregation, getCollectionName(aggregation), domainType); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java index 25d23322a0..4f11de82d9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java @@ -46,10 +46,6 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class) - */ @Override public ReactiveChangeStream changeStream(Class domainType) { @@ -76,10 +72,6 @@ private ReactiveChangeStreamSupport(ReactiveMongoTemplate template, Class dom this.options = options; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithCollection#watchCollection(java.lang.String) - */ @Override public ChangeStreamWithFilterAndProjection watchCollection(String collection) { @@ -88,10 +80,6 @@ public ChangeStreamWithFilterAndProjection watchCollection(String collection) 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 watchCollection(Class entityClass) { @@ -100,10 +88,6 @@ public ChangeStreamWithFilterAndProjection watchCollection(Class entityCla return watchCollection(template.getCollectionName(entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAt(java.lang.Object) - */ @Override public TerminatingChangeStream resumeAt(Object token) { @@ -117,10 +101,6 @@ public TerminatingChangeStream resumeAt(Object token) { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAfter(java.lang.Object) - */ @Override public TerminatingChangeStream resumeAfter(Object token) { @@ -129,10 +109,6 @@ public TerminatingChangeStream resumeAfter(Object token) { return withOptions(builder -> builder.resumeAfter((BsonValue) token)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#startAfter(java.lang.Object) - */ @Override public TerminatingChangeStream startAfter(Object token) { @@ -141,10 +117,6 @@ public TerminatingChangeStream startAfter(Object token) { return withOptions(builder -> builder.startAfter((BsonValue) token)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithOptions#withOptions(java.util.function.Consumer) - */ @Override public ReactiveChangeStreamSupport withOptions(Consumer optionsConsumer) { @@ -154,10 +126,6 @@ public ReactiveChangeStreamSupport withOptions(Consumer(template, domainType, returnType, collection, builder.build()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithProjection#as(java.lang.Class) - */ @Override public ChangeStreamWithFilterAndProjection as(Class resultType) { @@ -166,19 +134,11 @@ public ChangeStreamWithFilterAndProjection as(Class resultType) { 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 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 filter(CriteriaDefinition by) { @@ -188,10 +148,6 @@ public ChangeStreamWithFilterAndProjection filter(CriteriaDefinition by) { return filter(aggregation); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.TerminatingChangeStream#listen() - */ @Override public Flux> listen() { return template.changeStream(collection, options != null ? options : ChangeStreamOptions.empty(), returnType); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java index 9e8dc8d8b2..2c420d103a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java @@ -44,10 +44,6 @@ class ReactiveFindOperationSupport implements ReactiveFindOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class) - */ @Override public ReactiveFind query(Class domainType) { @@ -81,10 +77,6 @@ static class ReactiveFindSupport this.query = query; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithCollection#inCollection(java.lang.String) - */ @Override public FindWithProjection inCollection(String collection) { @@ -93,10 +85,6 @@ public FindWithProjection inCollection(String collection) { return new ReactiveFindSupport<>(template, domainType, returnType, collection, query); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithProjection#as(java.lang.Class) - */ @Override public FindWithQuery as(Class returnType) { @@ -105,10 +93,6 @@ public FindWithQuery as(Class returnType) { 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 matching(Query query) { @@ -117,10 +101,6 @@ public TerminatingFind matching(Query query) { return new ReactiveFindSupport<>(template, domainType, returnType, collection, query); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#first() - */ @Override public Mono first() { @@ -130,10 +110,6 @@ public Mono first() { return result.next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#one() - */ @Override public Mono one() { @@ -155,55 +131,31 @@ public Mono one() { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#all() - */ @Override public Flux all() { return doFind(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#tail() - */ @Override public Flux 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 near(NearQuery nearQuery) { return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#count() - */ @Override public Mono count() { return template.count(query, domainType, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#exists() - */ @Override public Mono exists() { return template.exists(query, domainType, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindDistinct#distinct(java.lang.String) - */ @Override public TerminatingDistinct distinct(String field) { @@ -255,10 +207,6 @@ public DistinctOperationSupport(ReactiveFindSupport delegate, String field) { this.field = field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithProjection#as(java.lang.Class) - */ @Override public TerminatingDistinct as(Class resultType) { @@ -267,10 +215,6 @@ public TerminatingDistinct as(Class resultType) { 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 matching(Query query) { @@ -280,10 +224,6 @@ public TerminatingDistinct matching(Query query) { return new DistinctOperationSupport<>((ReactiveFindSupport) delegate.matching(query), field); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core..ReactiveFindOperation.TerminatingDistinct#all() - */ @Override public Flux all() { return delegate.doFindDistinct(field); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java index 928c4426a5..eb24c832a8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java @@ -38,10 +38,6 @@ class ReactiveInsertOperationSupport implements ReactiveInsertOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class) - */ @Override public ReactiveInsert insert(Class domainType) { @@ -63,10 +59,6 @@ static class ReactiveInsertSupport implements ReactiveInsert { this.collection = collection; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#one(java.lang.Object) - */ @Override public Mono one(T object) { @@ -75,10 +67,6 @@ public Mono one(T object) { return template.insert(object, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#all(java.util.Collection) - */ @Override public Flux all(Collection objects) { @@ -87,10 +75,6 @@ public Flux all(Collection objects) { return template.insert(objects, getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.InsertWithCollection#inCollection(java.lang.String) - */ @Override public ReactiveInsert inCollection(String collection) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java index 6f95d2ca30..94364ddc2a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java @@ -333,10 +333,6 @@ public void setReadPreference(ReadPreference readPreference) { this.readPreference = readPreference; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { prepareIndexCreator(applicationContext); @@ -404,18 +400,10 @@ public MongoConverter getConverter() { 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); } @@ -424,10 +412,6 @@ public String getCollectionName(Class entityClass) { return operations.determineCollectionName(entityClass); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(java.lang.String) - */ public Mono executeCommand(String jsonCommand) { Assert.notNull(jsonCommand, "Command must not be empty!"); @@ -435,18 +419,10 @@ public Mono executeCommand(String jsonCommand) { return executeCommand(Document.parse(jsonCommand)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(org.bson.Document) - */ public Mono 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 executeCommand(Document command, @Nullable ReadPreference readPreference) { Assert.notNull(command, "Command must not be null!"); @@ -455,28 +431,16 @@ public Mono executeCommand(Document command, @Nullable ReadPreference : 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 Flux execute(Class entityClass, ReactiveCollectionCallback action) { return createFlux(getCollectionName(entityClass), action); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(org.springframework.data.mongodb.core.ReactiveDbCallback) - */ @Override public Flux execute(ReactiveDatabaseCallback action) { return createFlux(action); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.ReactiveCollectionCallback) - */ public Flux execute(String collectionName, ReactiveCollectionCallback callback) { Assert.notNull(callback, "ReactiveCollectionCallback must not be null!"); @@ -484,10 +448,6 @@ public Flux execute(String collectionName, ReactiveCollectionCallback 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 sessionProvider) { @@ -520,20 +480,12 @@ public void setSessionSynchronization(SessionSynchronization sessionSynchronizat this.sessionSynchronization = sessionSynchronization; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction() - */ @Override public ReactiveSessionScoped inTransaction() { return inTransaction( mongoDatabaseFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction(org.reactivestreams.Publisher) - */ @Override public ReactiveSessionScoped inTransaction(Publisher sessionProvider) { @@ -570,18 +522,10 @@ private Flux withSession(ReactiveSessionCallback action, ClientSession .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)); @@ -655,18 +599,10 @@ public Mono createMono(String collectionName, ReactiveCollectionCallback< .onErrorMap(translateException()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class) - */ public Mono> createCollection(Class 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 Mono> createCollection(Class entityClass, @Nullable CollectionOptions collectionOptions) { @@ -681,27 +617,15 @@ public Mono> createCollection(Class entityClass return doCreateCollection(getCollectionName(entityClass), convertToCreateCollectionOptions(options, entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.String) - */ public Mono> 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> 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> getCollection(String collectionName) { Assert.notNull(collectionName, "Collection name must not be null!"); @@ -709,18 +633,10 @@ public Mono> getCollection(String collectionName) { return createMono(db -> Mono.just(db.getCollection(collectionName))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.Class) - */ public Mono collectionExists(Class entityClass) { return collectionExists(getCollectionName(entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.String) - */ public Mono collectionExists(String collectionName) { return createMono(db -> Flux.from(db.listCollectionNames()) // .filter(s -> s.equals(collectionName)) // @@ -728,18 +644,10 @@ public Mono collectionExists(String collectionName) { .single(false)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.Class) - */ public Mono dropCollection(Class entityClass) { return dropCollection(getCollectionName(entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.String) - */ public Mono dropCollection(String collectionName) { return createMono(collectionName, MongoCollection::drop).doOnSuccess(success -> { @@ -749,10 +657,6 @@ public Mono dropCollection(String collectionName) { }).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollectionNames() - */ public Flux getCollectionNames() { return createFlux(MongoDatabase::listCollectionNames); } @@ -765,18 +669,10 @@ protected Mono doGetDatabase() { return ReactiveMongoDatabaseUtils.getDatabase(mongoDatabaseFactory, sessionSynchronization); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class) - */ public Mono findOne(Query query, Class 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 Mono findOne(Query query, Class entityClass, String collectionName) { if (ObjectUtils.isEmpty(query.getSortObject())) { @@ -788,26 +684,14 @@ public Mono findOne(Query query, Class entityClass, String collectionN 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 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 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 exists(Query query, @Nullable Class entityClass, String collectionName) { if (query == null) { @@ -832,18 +716,10 @@ public Mono exists(Query query, @Nullable Class entityClass, String }).hasElements(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#find(org.springframework.data.mongodb.core.query.Query, java.lang.Class) - */ public Flux find(Query query, Class 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 Flux find(@Nullable Query query, Class entityClass, String collectionName) { if (query == null) { @@ -854,18 +730,10 @@ public Flux find(@Nullable Query query, Class entityClass, String coll new QueryFindPublisherPreparer(query, entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findById(java.lang.Object, java.lang.Class) - */ public Mono findById(Object id, Class 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 Mono findById(Object id, Class entityClass, String collectionName) { String idKey = operations.getIdPropertyName(entityClass); @@ -873,18 +741,10 @@ public Mono findById(Object id, Class entityClass, String collectionNa 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 Flux findDistinct(Query query, String field, Class entityClass, Class 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 Flux findDistinct(Query query, String field, String collectionName, Class entityClass, Class resultClass) { @@ -930,10 +790,6 @@ public Flux findDistinct(Query query, String field, String collectionName return (Flux) 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 Flux aggregate(TypedAggregation aggregation, String inputCollectionName, Class outputType) { @@ -942,28 +798,16 @@ public Flux aggregate(TypedAggregation aggregation, String inputCollec 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 Flux aggregate(TypedAggregation aggregation, Class 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 Flux aggregate(Aggregation aggregation, Class inputType, Class 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 Flux aggregate(Aggregation aggregation, String collectionName, Class outputType) { return doAggregate(aggregation, collectionName, null, outputType); @@ -1020,19 +864,11 @@ private Flux aggregateAndMap(MongoCollection collection, List Flux> geoNear(NearQuery near, Class 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 Flux> geoNear(NearQuery near, Class entityClass, String collectionName) { return geoNear(near, entityClass, collectionName, entityClass); @@ -1065,35 +901,19 @@ protected Flux> geoNear(NearQuery near, Class entityClass, S .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 Mono findAndModify(Query query, UpdateDefinition update, Class 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 Mono findAndModify(Query query, UpdateDefinition update, Class 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 Mono findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class 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 Mono findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class entityClass, String collectionName) { @@ -1115,10 +935,6 @@ public Mono findAndModify(Query query, UpdateDefinition update, FindAndMo 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 Mono findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class entityType, String collectionName, Class resultType) { @@ -1169,18 +985,10 @@ public Mono findAndReplace(Query query, S replacement, FindAndReplaceO }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class) - */ public Mono findAndRemove(Query query, Class 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 Mono findAndRemove(Query query, Class entityClass, String collectionName) { operations.forType(entityClass).getCollation(query); @@ -1189,10 +997,6 @@ public Mono findAndRemove(Query query, Class entityClass, String colle entityClass); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class) - */ public Mono count(Query query, Class entityClass) { Assert.notNull(entityClass, "Entity class must not be null!"); @@ -1200,18 +1004,10 @@ public Mono count(Query query, Class entityClass) { 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 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 count(Query query, @Nullable Class entityClass, String collectionName) { Assert.notNull(query, "Query must not be null!"); @@ -1233,10 +1029,6 @@ public Mono count(Query query, @Nullable Class entityClass, String coll }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#estimatedCount(java.lang.String) - */ @Override public Mono estimatedCount(String collectionName) { return doEstimatedCount(collectionName, new EstimatedDocumentCountOptions()); @@ -1261,10 +1053,6 @@ protected Mono doEstimatedCount(String collectionName, EstimatedDocumentCo return createMono(collectionName, collection -> collection.estimatedDocumentCount(options)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono) - */ @Override public Mono insert(Mono objectToSave) { @@ -1273,19 +1061,11 @@ public Mono insert(Mono objectToSave) { return objectToSave.flatMap(this::insert); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono, java.lang.Class) - */ @Override public Flux insertAll(Mono> 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 Flux insertAll(Mono> batchToSave, String collectionName) { @@ -1294,10 +1074,6 @@ public Flux insertAll(Mono> batchToSave return Flux.from(batchToSave).flatMap(collection -> insert(collection, collectionName)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object) - */ public Mono insert(T objectToSave) { Assert.notNull(objectToSave, "Object to insert must not be null!"); @@ -1306,10 +1082,6 @@ public Mono insert(T objectToSave) { return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object, java.lang.String) - */ public Mono insert(T objectToSave, String collectionName) { Assert.notNull(objectToSave, "Object to insert must not be null!"); @@ -1348,34 +1120,18 @@ protected Mono doInsert(String collectionName, T objectToSave, MongoWrite }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.util.Collection, java.lang.Class) - */ public Flux insert(Collection 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 Flux insert(Collection batchToSave, String collectionName) { return doInsertBatch(collectionName, batchToSave, this.mongoConverter); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(java.util.Collection) - */ public Flux insertAll(Collection objectsToSave) { return doInsertAll(objectsToSave, this.mongoConverter); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(reactor.core.publisher.Mono) - */ @Override public Flux insertAll(Mono> objectsToSave) { return Flux.from(objectsToSave).flatMap(this::insertAll); @@ -1440,10 +1196,6 @@ protected Flux doInsertBatch(String collectionName, Collection Mono save(Mono objectToSave) { @@ -1452,10 +1204,6 @@ public Mono save(Mono objectToSave) { return objectToSave.flatMap(this::save); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(reactor.core.publisher.Mono, java.lang.String) - */ @Override public Mono save(Mono objectToSave, String collectionName) { @@ -1464,20 +1212,12 @@ public Mono save(Mono objectToSave, String collectionName) { return objectToSave.flatMap(o -> save(o, collectionName)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(java.lang.Object) - */ public Mono 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 Mono save(T objectToSave, String collectionName) { Assert.notNull(objectToSave, "Object to save must not be null!"); @@ -1669,26 +1409,14 @@ protected Mono saveDocument(String collectionName, Document document, Cl } - /* - * (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 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 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 upsert(Query query, UpdateDefinition update, Class entityClass, String collectionName) { return doUpdate(collectionName, query, update, entityClass, true, false); } @@ -1701,43 +1429,23 @@ public Mono updateFirst(Query query, UpdateDefinition update, Clas 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 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 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 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 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 updateMulti(Query query, UpdateDefinition update, Class entityClass, String collectionName) { return doUpdate(collectionName, query, update, entityClass, false, true); @@ -1849,28 +1557,16 @@ private boolean containsVersionProperty(Document document, @Nullable MongoPersis return document.containsKey(persistentEntity.getRequiredVersionProperty().getFieldName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(reactor.core.publisher.Mono) - */ @Override public Mono remove(Mono 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 remove(Mono 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 remove(Object object) { Assert.notNull(object, "Object must not be null!"); @@ -1878,10 +1574,6 @@ public Mono remove(Object object) { 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 remove(Object object, String collectionName) { Assert.notNull(object, "Object must not be null!"); @@ -1911,26 +1603,14 @@ private void assertUpdateableIdIfNotSet(Object value) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.String) - */ public Mono 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 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 remove(Query query, @Nullable Class entityClass, String collectionName) { return doRemove(collectionName, query, entityClass); } @@ -1985,64 +1665,36 @@ protected Mono doRemove(String collectionName, Query query, @N .next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class) - */ public Flux findAll(Class entityClass) { return findAll(entityClass, getCollectionName(entityClass)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class, java.lang.String) - */ public Flux findAll(Class 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 Flux findAllAndRemove(Query query, String collectionName) { return (Flux) 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 Flux findAllAndRemove(Query query, Class 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 Flux findAllAndRemove(Query query, Class 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 Flux tail(Query query, Class 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 Flux tail(@Nullable Query query, Class entityClass, String collectionName) { @@ -2112,10 +1764,6 @@ List prepareFilter(ChangeStreamOptions options) { "ChangeStreamRequestOptions.filter mut be either an Aggregation or a plain list of Documents"); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions) - */ public Flux mapReduce(Query filterQuery, Class domainType, Class resultType, String mapFunction, String reduceFunction, MapReduceOptions options) { @@ -2123,10 +1771,6 @@ public Flux mapReduce(Query filterQuery, Class domainType, Class re options); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions) - */ public Flux mapReduce(Query filterQuery, Class domainType, String inputCollectionName, Class resultType, String mapFunction, String reduceFunction, MapReduceOptions options) { @@ -2233,64 +1877,36 @@ private static void assertLocalFunctionNames(String... functions) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class) - */ @Override public ReactiveFind query(Class domainType) { return new ReactiveFindOperationSupport(this).query(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class) - */ @Override public ReactiveUpdate update(Class domainType) { return new ReactiveUpdateOperationSupport(this).update(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class) - */ @Override public ReactiveRemove remove(Class domainType) { return new ReactiveRemoveOperationSupport(this).remove(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class) - */ @Override public ReactiveInsert insert(Class domainType) { return new ReactiveInsertOperationSupport(this).insert(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class) - */ @Override public ReactiveAggregation aggregateAndReturn(Class domainType) { return new ReactiveAggregationOperationSupport(this).aggregateAndReturn(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMapReduceOperation#mapReduce(java.lang.Class) - */ @Override public ReactiveMapReduce mapReduce(Class domainType) { return new ReactiveMapReduceOperationSupport(this).mapReduce(domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class) - */ @Override public ReactiveChangeStream changeStream(Class domainType) { return new ReactiveChangeStreamOperationSupport(this).changeStream(domainType); @@ -3097,10 +2713,6 @@ private static class FindAndReplaceCallback implements ReactiveCollectionCallbac this.options = options; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveCollectionCallback#doInCollection(com.mongodb.reactivestreams.client.MongoCollection) - */ @Override public Publisher doInCollection(MongoCollection collection) throws MongoException, DataAccessException { @@ -3423,10 +3035,6 @@ static class ReactiveSessionBoundMongoTemplate extends ReactiveMongoTemplate { this.session = session; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getCollection(java.lang.String) - */ @Override public Mono> getCollection(String collectionName) { @@ -3434,10 +3042,6 @@ public Mono> getCollection(String collectionName) { return delegate.getCollection(collectionName); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getMongoDatabase() - */ @Override public Mono getMongoDatabase() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java index 3cb11c0626..9f72598f8d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java @@ -41,10 +41,6 @@ class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation { this.tempate = tempate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class) - */ @Override public ReactiveRemove remove(Class domainType) { @@ -68,10 +64,6 @@ static class ReactiveRemoveSupport implements ReactiveRemove, RemoveWithCo this.collection = collection; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.RemoveWithCollection#inCollection(String) - */ @Override public RemoveWithQuery inCollection(String collection) { @@ -80,10 +72,6 @@ public RemoveWithQuery inCollection(String collection) { 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 matching(Query query) { @@ -92,10 +80,6 @@ public TerminatingRemove matching(Query query) { return new ReactiveRemoveSupport<>(template, domainType, query, collection); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#all() - */ @Override public Mono all() { @@ -104,10 +88,6 @@ public Mono all() { return template.doRemove(collectionName, query, domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#findAndRemove() - */ @Override public Flux findAndRemove() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java index 598f691b1d..af50026fbb 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java @@ -42,10 +42,6 @@ class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation { this.template = template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class) - */ @Override public ReactiveUpdate update(Class domainType) { @@ -83,10 +79,6 @@ static class ReactiveUpdateSupport this.targetType = targetType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition) - */ @Override public TerminatingUpdate apply(org.springframework.data.mongodb.core.query.UpdateDefinition update) { @@ -96,10 +88,6 @@ public TerminatingUpdate apply(org.springframework.data.mongodb.core.query.Up findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithCollection#inCollection(java.lang.String) - */ @Override public UpdateWithQuery inCollection(String collection) { @@ -109,28 +97,16 @@ public UpdateWithQuery inCollection(String collection) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#first() - */ @Override public Mono first() { return doUpdate(false, false); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#upsert() - */ @Override public Mono upsert() { return doUpdate(true, true); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndModify#findAndModify() - */ @Override public Mono findAndModify() { @@ -141,10 +117,6 @@ public Mono findAndModify() { collectionName); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndReplace#findAndReplace() - */ @Override public Mono findAndReplace() { return template.findAndReplace(query, replacement, @@ -152,10 +124,6 @@ public Mono findAndReplace() { getCollectionName(), targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.Query) - */ @Override public UpdateWithUpdate matching(Query query) { @@ -165,19 +133,11 @@ public UpdateWithUpdate matching(Query query) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#all() - */ @Override public Mono 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 withOptions(FindAndModifyOptions options) { @@ -187,10 +147,6 @@ public TerminatingFindAndModify withOptions(FindAndModifyOptions options) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#replaceWith(java.lang.Object) - */ @Override public FindAndReplaceWithProjection replaceWith(T replacement) { @@ -200,10 +156,6 @@ public FindAndReplaceWithProjection replaceWith(T replacement) { findAndReplaceOptions, replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions) - */ @Override public FindAndReplaceWithProjection withOptions(FindAndReplaceOptions options) { @@ -213,10 +165,6 @@ public FindAndReplaceWithProjection withOptions(FindAndReplaceOptions options replacement, targetType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class) - */ @Override public FindAndReplaceWithOptions as(Class resultType) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java index df7a4b5a4c..631063d333 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java @@ -75,28 +75,16 @@ public SimpleMongoClientDatabaseFactory(MongoClient mongoClient, String database 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); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java index 337109c349..26f70df2d2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java @@ -97,18 +97,10 @@ public void setWriteConcern(WriteConcern writeConcern) { this.writeConcern = writeConcern; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase() - */ public Mono getMongoDatabase() throws DataAccessException { return getMongoDatabase(databaseName); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase(java.lang.String) - */ public Mono getMongoDatabase(String dbName) throws DataAccessException { Assert.hasText(dbName, "Database name must not be empty."); @@ -133,36 +125,20 @@ public void destroy() throws Exception { } } - /* - * (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 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); @@ -186,64 +162,36 @@ static final class ClientSessionBoundMongoDbFactory implements ReactiveMongoData this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase() - */ @Override public Mono getMongoDatabase() throws DataAccessException { return delegate.getMongoDatabase().map(this::decorateDatabase); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase(java.lang.String) - */ @Override public Mono 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 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(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java index 07fa9023cc..f8c5ff92ba 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java @@ -44,9 +44,6 @@ protected AbstractAggregationExpression(Object value) { this.value = value; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return toDocument(this.value, context); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java index ba2c34edab..92fad4d33d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java @@ -334,9 +334,6 @@ public Sum and(Number value) { 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) { @@ -417,9 +414,6 @@ public Avg and(AggregationExpression expression) { 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) { @@ -500,9 +494,6 @@ public Max and(AggregationExpression expression) { 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) { @@ -583,9 +574,6 @@ public Min and(AggregationExpression expression) { 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) { @@ -666,9 +654,6 @@ public StdDevPop and(AggregationExpression expression) { 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) { @@ -749,9 +734,6 @@ public StdDevSamp and(AggregationExpression expression) { 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java index 90cc828591..5911c0f4ac 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java @@ -99,10 +99,6 @@ public AddFieldsOperationBuilder and() { return new AddFieldsOperationBuilder(getValueMap()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.DocumentEnhancingOperation#mongoOperator() - */ @Override protected String mongoOperator() { return "$addFields"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java index e4894fbef0..f1e759452a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java @@ -741,10 +741,6 @@ public Document toDocument(String inputCollectionName, AggregationOperationConte return options.applyAndReturnPotentiallyChangedCommand(command); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return SerializationUtils.serializeToJsonSafely(toDocument("__collection__", DEFAULT_CONTEXT)); @@ -788,10 +784,6 @@ public static boolean isReferingToSystemVariable(@Nullable String fieldRef) { return false; } - /* - * (non-Javadoc) - * @see java.lang.Enum#toString() - */ @Override public String toString() { return PREFIX.concat(name()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java index 9e26c3e6f6..cf1848d69d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java @@ -76,10 +76,6 @@ public FunctionExpression(String name, Object[] values) { 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java index cc7ffbdc55..ca054c200a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java @@ -80,28 +80,16 @@ static List toDocument(List operations, Aggregat */ private static class NoOpAggregationOperationContext implements AggregationOperationContext { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class) - */ @Override public Document getMappedObject(Document document, @Nullable Class type) { return document; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField) - */ @Override public FieldReference getReference(Field field) { return new DirectFieldReference(new ExposedField(field, true)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String) - */ @Override public FieldReference getReference(String name) { return new DirectFieldReference(new ExposedField(new AggregationField(name), true)); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java index e1afc84945..dcf4433bdb 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java @@ -339,9 +339,6 @@ public boolean hasExecutionTimeLimit() { return !maxTime.isZero() && !maxTime.isNegative(); } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return toDocument().toJson(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java index 5170986f93..c775b26a63 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java @@ -77,10 +77,6 @@ public T getUniqueMappedResult() { return mappedResults.size() == 1 ? mappedResults.get(0) : null; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return mappedResults.iterator(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java index e406f57874..3d3f314a21 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java @@ -64,9 +64,6 @@ public static AggregationSpELExpression expressionOf(String expressionString, Ob 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); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java index 3cbb5f8735..c9f3a2adb5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java @@ -242,48 +242,26 @@ public AggregationUpdate isolated() { 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 getArrayFilters() { return Collections.emptyList(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java index dba40d94d5..3664684a3f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java @@ -612,10 +612,6 @@ public static AsBuilder filter(List values) { 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); @@ -736,10 +732,6 @@ public static InputBuilder newBuilder() { 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) { @@ -748,10 +740,6 @@ public AsBuilder filter(List array) { 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) { @@ -760,10 +748,6 @@ public AsBuilder filter(Field field) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.AsBuilder#as(java.lang.String) - */ @Override public ConditionBuilder as(String variableName) { @@ -772,10 +756,6 @@ public ConditionBuilder as(String variableName) { 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) { @@ -784,10 +764,6 @@ public Filter by(AggregationExpression condition) { return filter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(java.lang.String) - */ @Override public Filter by(String expression) { @@ -796,10 +772,6 @@ public Filter by(String expression) { return filter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.bson.Document) - */ @Override public Filter by(Document expression) { @@ -1244,9 +1216,6 @@ private Reduce(Object input, Object initialValue, List re this.reduceExpressions = reduceExpressions; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -1433,9 +1402,6 @@ public PropertyExpression definedAs(AggregationExpression expression) { }; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(propertyName, aggregationExpression.toDocument(context)); @@ -1803,10 +1769,6 @@ public static ArrayToObject arrayValueOfToObject(AggregationExpression expressio return new ArrayToObject(expression); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod() - */ @Override protected String getMongoMethod() { return "$arrayToObject"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java index f5755346bb..5d387a5f93 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java @@ -88,9 +88,6 @@ private BucketAutoOperation(BucketAutoOperation bucketOperation, int buckets, St this.granularity = granularity; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -107,10 +104,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), options); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$bucketAuto"; @@ -144,33 +137,21 @@ public BucketAutoOperation withGranularity(Granularity granularity) { 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); @@ -192,9 +173,6 @@ protected BucketAutoOperationOutputBuilder(Object value, BucketAutoOperation ope super(value, operation); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput) - */ @Override protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) { return new BucketAutoOperationOutputBuilder(operationOutput, this.operation); @@ -223,9 +201,6 @@ protected ExpressionBucketAutoOperationBuilder(String expression, BucketAutoOper 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); @@ -270,9 +245,6 @@ public enum Granularities implements Granularity { this.granularity = granularity; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.GranularitytoMongoGranularity() - */ @Override public String getMongoRepresentation() { return granularity; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java index 937ec029cb..a6bb1dc46a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java @@ -84,9 +84,6 @@ private BucketOperation(BucketOperation bucketOperation, List boundaries this.defaultBucket = defaultBucket; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -103,10 +100,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), options); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$bucket"; @@ -143,33 +136,21 @@ public BucketOperation withBoundaries(Object... boundaries) { return new BucketOperation(this, newBoundaries, defaultBucket); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs) - */ @Override protected BucketOperation newBucketOperation(Outputs outputs) { return new BucketOperation(this, outputs); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[]) - */ @Override public ExpressionBucketOperationBuilder andOutputExpression(String expression, Object... params) { return new ExpressionBucketOperationBuilder(expression, this, params); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression) - */ @Override public BucketOperationOutputBuilder andOutput(AggregationExpression expression) { return new BucketOperationOutputBuilder(expression, this); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String) - */ @Override public BucketOperationOutputBuilder andOutput(String fieldName) { return new BucketOperationOutputBuilder(Fields.field(fieldName), this); @@ -191,9 +172,6 @@ protected BucketOperationOutputBuilder(Object value, BucketOperation operation) super(value, operation); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput) - */ @Override protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) { return new BucketOperationOutputBuilder(operationOutput, this.operation); @@ -221,9 +199,6 @@ protected ExpressionBucketOperationBuilder(String expression, BucketOperation op super(expression, operation, parameters); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput) - */ @Override protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) { return new BucketOperationOutputBuilder(operationOutput, this.operation); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java index 6a768a6172..02282dc7a0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java @@ -141,9 +141,6 @@ public Document toDocument(AggregationOperationContext context) { }); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -159,9 +156,6 @@ public Document toDocument(AggregationOperationContext context) { return document; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return outputs.asExposedFields(); @@ -454,9 +448,6 @@ protected boolean isEmpty() { return outputs.isEmpty(); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -540,10 +531,6 @@ private OperationOutput(Field field, OperationOutput operationOutput) { this.values = operationOutput.values; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -636,9 +623,6 @@ public SpelExpressionOutput(String expression, Object[] parameters) { 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); @@ -665,9 +649,6 @@ protected AggregationExpressionOutput(Field field, AggregationExpression express this.expression = expression; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return expression.toDocument(context); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java index 1979ec78f4..3848598705 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java @@ -275,10 +275,6 @@ public static ThenBuilder ifNull(AggregationExpression expression) { 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) { @@ -408,9 +404,6 @@ public static IfNullOperatorBuilder newBuilder() { 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!"); @@ -418,9 +411,6 @@ public ThenBuilder ifNull(String fieldReference) { 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) { @@ -439,25 +429,16 @@ public ThenBuilder orIfNull(AggregationExpression expression) { 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!"); @@ -543,9 +524,6 @@ public CaseOperator then(Object 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) { @@ -633,10 +611,6 @@ private Cond(Object condition, Object thenValue, Object otherwiseValue) { this.otherwiseValue = otherwiseValue; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -915,9 +889,6 @@ public static ConditionalExpressionBuilder newBuilder() { 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) { @@ -927,9 +898,6 @@ public ConditionalExpressionBuilder when(Document booleanExpression) { 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) { @@ -938,9 +906,6 @@ public ThenBuilder when(CriteriaDefinition criteria) { 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) { @@ -949,9 +914,6 @@ public ThenBuilder when(AggregationExpression expression) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(java.lang.String) - */ @Override public ThenBuilder when(String booleanField) { @@ -960,9 +922,6 @@ public ThenBuilder when(String booleanField) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#then(java.lang.Object) - */ @Override public OtherwiseBuilder then(Object thenValue) { @@ -971,9 +930,6 @@ public OtherwiseBuilder then(Object thenValue) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(java.lang.String) - */ @Override public OtherwiseBuilder thenValueOf(String fieldReference) { @@ -982,9 +938,6 @@ public OtherwiseBuilder thenValueOf(String fieldReference) { 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) { @@ -993,9 +946,6 @@ public OtherwiseBuilder thenValueOf(AggregationExpression expression) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwise(java.lang.Object) - */ @Override public Cond otherwise(Object otherwiseValue) { @@ -1003,9 +953,6 @@ public Cond otherwise(Object otherwiseValue) { 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) { @@ -1013,9 +960,6 @@ public Cond otherwiseValueOf(String fieldReference) { 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java index 95e63ac8f7..6264243d97 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java @@ -43,9 +43,6 @@ public CountOperation(String fieldName) { 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); @@ -56,9 +53,6 @@ public String getOperator() { return "$count"; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return ExposedFields.from(new ExposedField(fieldName, true)); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java index 51f570d61c..f650f4f2ae 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java @@ -46,10 +46,6 @@ protected DocumentEnhancingOperation(Map source) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -71,10 +67,6 @@ public Document toDocument(AggregationOperationContext context) { */ protected abstract String mongoOperator(); - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return mongoOperator(); @@ -87,10 +79,6 @@ protected Map getValueMap() { return this.valueMap; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return exposedFields; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java index c72abd636a..bfdb8cb8f9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java @@ -209,10 +209,6 @@ private int exposedFieldsCount() { return originalFields.size() + syntheticFields.size(); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { @@ -260,28 +256,16 @@ public ExposedField(Field delegate, boolean synthetic) { this.synthetic = synthetic; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Field#getKey() - */ @Override public String getName() { return field.getName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Field#getTarget() - */ @Override public String getTarget() { return field.getTarget(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased() - */ @Override public boolean isAliased() { return field.isAliased(); @@ -304,19 +288,11 @@ public boolean canBeReferredToBy(String name) { return getName().equals(name) || getTarget().equals(name); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("AggregationField: %s, synthetic: %s", field, synthetic); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -333,10 +309,6 @@ public boolean equals(Object obj) { return this.field.equals(that.field) && this.synthetic == that.synthetic; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -394,28 +366,16 @@ public DirectFieldReference(ExposedField field) { this.field = field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw() - */ public String getRaw() { String target = field.getTarget(); return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue() - */ public Object getReferenceValue() { return field.synthetic && !field.isAliased() ? 1 : toString(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -426,10 +386,6 @@ public String toString() { return String.format("$%s", getRaw()); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -446,10 +402,6 @@ public boolean equals(Object obj) { return this.field.equals(that.field); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return field.hashCode(); @@ -475,19 +427,11 @@ public ExpressionFieldReference(FieldReference field) { delegate = field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw() - */ @Override public String getRaw() { return delegate.getRaw(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue() - */ @Override public Object getReferenceValue() { return delegate.getReferenceValue(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java index b1db4fb262..2450e48153 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java @@ -54,19 +54,11 @@ public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields, 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) { @@ -77,19 +69,11 @@ public FieldReference getReference(Field field) { return getReference(field, field.getTarget()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String) - */ @Override public FieldReference getReference(String name) { return getReference(null, name); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class) - */ @Override public Fields getFields(Class type) { return rootContext.getFields(type); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java index 118965b7c4..bbff7e0c41 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java @@ -78,26 +78,16 @@ public FacetOperationBuilder and(AggregationOperation... operations) { 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(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java index 1ab2d30763..65a29c92e2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java @@ -179,10 +179,6 @@ public Field getField(String name) { return null; } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { return fields.iterator(); @@ -253,18 +249,10 @@ private static String cleanUp(String source) { return dollarIndex == -1 ? source : source.substring(dollarIndex + 1); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Field#getKey() - */ public String getName() { return name; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Field#getAlias() - */ public String getTarget() { if (isLocalVar()) { @@ -274,10 +262,6 @@ public String getTarget() { 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()); @@ -304,19 +288,11 @@ public String getRaw() { return raw; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("AggregationField - name: %s, target: %s", name, target); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -333,10 +309,6 @@ public boolean equals(Object obj) { return this.name.equals(that.name) && ObjectUtils.nullSafeEquals(this.target, that.target); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java index 7fd95d2c6f..21bac1950f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java @@ -46,10 +46,6 @@ default boolean inheritsFields() { */ interface InheritsFieldsAggregationOperation extends FieldsExposingAggregationOperation { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields() - */ @Override default boolean inheritsFields() { return true; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java index 56d87f6d45..d85bf173b6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java @@ -84,10 +84,6 @@ public GeoNearOperation useIndex(String key) { return new GeoNearOperation(nearQuery, distanceField, key); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -107,19 +103,11 @@ public Document toDocument(AggregationOperationContext context) { 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 toPipelineStages(AggregationOperationContext context) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java index c11c6dccf2..eeeab12df3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java @@ -77,9 +77,6 @@ public static FromBuilder builder() { return new GraphLookupOperationFromBuilder(); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -126,10 +123,6 @@ public String getOperator() { return "$graphLookup"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { @@ -229,9 +222,6 @@ static final class GraphLookupOperationFromBuilder private @Nullable List 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) { @@ -241,9 +231,6 @@ public StartWithBuilder from(String collectionName) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(java.lang.String[]) - */ @Override public ConnectFromBuilder startWith(String... fieldReferences) { @@ -260,9 +247,6 @@ public ConnectFromBuilder startWith(String... fieldReferences) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(org.springframework.data.mongodb.core.aggregation.AggregationExpression[]) - */ @Override public ConnectFromBuilder startWith(AggregationExpression... expressions) { @@ -314,9 +298,6 @@ private void assertStartWithType(Object expression) { String.format("Expression must be any of %s but was %s", ALLOWED_START_TYPES, expression.getClass())); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectFromBuilder#connectFrom(java.lang.String) - */ @Override public ConnectToBuilder connectFrom(String fieldName) { @@ -326,9 +307,6 @@ public ConnectToBuilder connectFrom(String fieldName) { return this; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectToBuilder#connectTo(java.lang.String) - */ @Override public GraphLookupOperationBuilder connectTo(String fieldName) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java index 1f21657781..6e3f9c78cb 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java @@ -391,10 +391,6 @@ private GroupOperationBuilder newBuilder(Keyword keyword, @Nullable String refer 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() { @@ -407,10 +403,6 @@ public ExposedFields getFields() { return fields; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -444,10 +436,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), operationObject); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$group"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java index cd14d89ed0..f18a9db8af 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java @@ -43,10 +43,6 @@ public InheritingExposedFieldsAggregationOperationContext(ExposedFields exposedF 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java index e3c6a73537..4bcd4e2c46 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java @@ -43,19 +43,11 @@ public LimitOperation(long maxElements) { 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"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java index f692008de6..69afe01440 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java @@ -76,10 +76,6 @@ private Literal(Object value) { super(value); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod() - */ @Override protected String getMongoMethod() { return "$literal"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java index 5a4c8cbee4..4ccc6bf266 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java @@ -60,19 +60,11 @@ public LookupOperation(Field from, Field localField, Field foreignField, Field a 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) { @@ -86,10 +78,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), lookupObject); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$lookup"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java index c3d1f366ec..5f1b6ca4e5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java @@ -67,10 +67,6 @@ public MatchOperation(AggregationExpression expression) { 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) { @@ -78,10 +74,6 @@ public Document toDocument(AggregationOperationContext context) { 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"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java index 8dc1d09f38..341e4da514 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java @@ -92,10 +92,6 @@ public static MergeOperationBuilder builder() { 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) { @@ -125,19 +121,11 @@ public Document toDocument(AggregationOperationContext context) { 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() { @@ -148,10 +136,6 @@ public ExposedFields getFields() { 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; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java index 50afa52909..de271fe45b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java @@ -50,28 +50,16 @@ 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) { @@ -95,19 +83,11 @@ private boolean isInnerVariableReference(Field field) { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String) - */ @Override public FieldReference getReference(String name) { return new ExpressionFieldReference(delegate.getReference(name)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class) - */ @Override public Fields getFields(Class type) { return delegate.getFields(type); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java index d067d6e208..64a62e5474 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java @@ -206,10 +206,6 @@ public MergeObjects mergeWith(Object... values) { return new MergeObjects(append(Arrays.asList(values))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(Object value, AggregationOperationContext context) { return super.toDocument(potentiallyExtractSingleValue(value), context); @@ -228,10 +224,6 @@ private Object potentiallyExtractSingleValue(Object value) { return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod() - */ @Override protected String getMongoMethod() { return "$mergeObjects"; @@ -286,10 +278,6 @@ public static ObjectToArray toArray(Object value) { return new ObjectToArray(value); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod() - */ @Override protected String getMongoMethod() { return "$objectToArray"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java index de424dfebd..ee6118b07d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java @@ -186,10 +186,6 @@ public OutOperation insertDocuments() { return mode(OutMode.INSERT); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -213,10 +209,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), $out); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$out"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java index 8bb45b1c99..bfd1c4793a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java @@ -55,46 +55,26 @@ public PrefixingDelegatingAggregationOperationContext(AggregationOperationContex 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); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java index dc2d70ace3..063fe0508a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java @@ -219,10 +219,6 @@ public ArrayProjectionOperationBuilder andArrayOf(Object... values) { return builder; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { @@ -236,10 +232,6 @@ public ExposedFields getFields() { return fields != null ? fields : ExposedFields.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields() - */ @Override public boolean inheritsFields() { @@ -248,10 +240,6 @@ public boolean inheritsFields() { .anyMatch(FieldProjection::isExcluded); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -264,10 +252,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), fieldObject); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$project"; @@ -298,10 +282,6 @@ public AbstractProjectionOperationBuilder(Object value, ProjectionOperation oper 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); @@ -359,9 +339,6 @@ public ExpressionProjectionOperationBuilder(String expression, ProjectionOperati this.params = parameters.clone(); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder#project(java.lang.String, java.lang.Object[]) - */ @Override public ProjectionOperationBuilder project(String operation, final Object... values) { @@ -382,10 +359,6 @@ protected List getOperationArguments(AggregationOperationContext context return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String) - */ @Override public ProjectionOperation as(String alias) { @@ -424,10 +397,6 @@ public ExpressionProjection(Field field, String expression, Object[] parameters) 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)); @@ -530,10 +499,6 @@ public ProjectionOperation as(String alias) { return this.operation.and(new FieldProjection(Fields.field(alias, getRequiredName()), null)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.ConditionalOperator) - */ @Override public ProjectionOperation applyCondition(Cond cond) { @@ -541,10 +506,6 @@ public ProjectionOperation applyCondition(Cond cond) { 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) { @@ -1314,10 +1275,6 @@ private String getRequiredName() { 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); @@ -1355,10 +1312,6 @@ public PreviousOperationProjection(String name) { this.name = name; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(name, Fields.UNDERSCORE_ID_REF); @@ -1432,10 +1385,6 @@ public boolean isExcluded() { return Boolean.FALSE.equals(value); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(field.getName(), renderFieldValue(context)); @@ -1496,10 +1445,6 @@ static class OperationProjection extends Projection { 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) { @@ -1540,10 +1485,6 @@ protected Field getField() { return field; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#getExposedField() - */ @Override public ExposedField getExposedField() { @@ -1565,10 +1506,6 @@ OperationProjection withAlias(String alias) { final Field aliasedField = Fields.field(alias, this.field.getName()); return new OperationProjection(aliasedField, operation, values.toArray()) { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.OperationProjection#getField() - */ @Override protected Field getField() { return aliasedField; @@ -1598,10 +1535,6 @@ static class NestedFieldProjection extends Projection { this.fields = fields; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -1766,10 +1699,6 @@ public ExpressionProjection(Field field, AggregationExpression expression) { this.expression = expression; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(field.getName(), expression.toDocument(context)); @@ -1793,10 +1722,6 @@ static class TypeProjection extends Projection { this.type = type; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -1895,10 +1820,6 @@ public ArrayProjection(Field targetField, List projections) { this.projections = projections; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java index 9648708872..ea2b1dd4e9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java @@ -67,19 +67,11 @@ public RedactOperation(AggregationExpression condition) { 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"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java index 89cb126973..32a6ba0ad6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java @@ -47,10 +47,6 @@ public RelaxedTypeBasedAggregationOperationContext(Class type, 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) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java index 94f9785595..fc218639d2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java @@ -79,26 +79,16 @@ public static ReplaceRootOperationBuilder builder() { return new ReplaceRootOperationBuilder(); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document("$replaceRoot", new Document("newRoot", getReplacement().toDocumentExpression(context))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$replaceRoot"; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return ExposedFields.from(); @@ -301,9 +291,6 @@ protected AggregationExpressionReplacement(AggregationExpression aggregationExpr this.aggregationExpression = aggregationExpression; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocumentExpression(AggregationOperationContext context) { return aggregationExpression.toDocument(context); @@ -328,9 +315,6 @@ protected FieldReplacement(Field field) { this.field = field; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Object toDocumentExpression(AggregationOperationContext context) { return context.getReference(field).toString(); @@ -398,9 +382,6 @@ public static ReplacementDocument forSingleValue(String field, Object value) { return new ReplacementDocument(new ValueFieldContributor(Fields.field(field), value)); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocumentExpression(AggregationOperationContext context) { @@ -475,9 +456,6 @@ public DocumentContributor(Object value) { this.value = value; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -541,9 +519,6 @@ public ValueFieldContributor(Field field, Object value) { this.value = value; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -577,9 +552,6 @@ public ExpressionFieldContributor(Field field, AggregationExpression aggregation this.aggregationExpression = aggregationExpression; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(getField().getTarget(), aggregationExpression.toDocument(context)); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java index 0d53dbf5cf..91835f4f90 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java @@ -84,10 +84,6 @@ private static Object computeValue(Object value, AggregationOperationContext con return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return context.getMappedObject(new Document("$replaceWith", getReplacement().toDocumentExpression(context))); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java index fbfc680484..1bb0eb7558 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java @@ -42,19 +42,11 @@ public SampleOperation(long sampleSize) { this.sampleSize = sampleSize; } - /* - (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), new Document("size", this.sampleSize)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$sample"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java index d065f81662..4d06d28bb8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java @@ -99,10 +99,6 @@ public FieldAppender and() { return new FieldAppender(getValueMap()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.DocumentEnhancingOperation#mongoOperator() - */ @Override protected String mongoOperator() { return "$set"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java index 4b2bc29efa..257ae6a496 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java @@ -105,10 +105,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), $setWindowFields); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$setWindowFields"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java index b72a024f8d..2cc81deb1c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java @@ -46,19 +46,11 @@ public SkipOperation(long skipCount) { this.skipCount = skipCount; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), skipCount); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$skip"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java index 76b7bc7e76..b0734ef04d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java @@ -66,10 +66,6 @@ public SortByCountOperation(AggregationExpression groupByExpression) { this.groupByField = null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -77,10 +73,6 @@ public Document toDocument(AggregationOperationContext context) { : groupByExpression.toDocument(context)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$sortByCount"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java index f4441b73b1..5af67cdb66 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java @@ -59,10 +59,6 @@ public SortOperation and(Sort sort) { return new SortOperation(this.sort.and(sort)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -78,10 +74,6 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), object); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$sort"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java index f47e062238..bfe4898249 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java @@ -105,10 +105,6 @@ public Object transform(String expression, AggregationOperationContext context, return transform(new AggregationExpressionTransformationContext<>(node, null, null, context)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.spel.ExpressionTransformer#transform(org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport) - */ public Object transform(AggregationExpressionTransformationContext context) { return lookupConversionFor(context.getCurrentNode()).convert(context); } @@ -206,10 +202,6 @@ protected Object transform(ExpressionNode node, @Nullable ExpressionNode parent, context.getAggregationContext())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#transform(org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext) - */ @Override public Object transform(AggregationExpressionTransformationContext context) { return transformer.transform(context); @@ -235,10 +227,6 @@ public OperatorNodeConversion(AggregationExpressionTransformer transformer) { super(transformer); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext) - */ @Override protected Object convert(AggregationExpressionTransformationContext context) { @@ -303,10 +291,6 @@ private Object convertUnaryMinusOp(ExpressionTransformationContextSupport context) { return context.addToPreviousOrReturn(context.getCurrentNode().getValue()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode) - */ @Override protected boolean supports(ExpressionNode node) { return node.isOfType(Indexer.class); @@ -355,10 +331,6 @@ private static class InlineListNodeConversion extends ExpressionNodeConversion context) { @@ -373,10 +345,6 @@ protected Object convert(AggregationExpressionTransformationContext context) { @@ -406,10 +370,6 @@ protected Object convert(AggregationExpressionTransformationContext context) { @@ -453,10 +409,6 @@ protected Object convert(AggregationExpressionTransformationContext return value; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#supports(org.springframework.expression.spel.SpelNode) - */ @Override protected boolean supports(ExpressionNode node) { return node.isLiteral(); @@ -475,10 +427,6 @@ private static class MethodReferenceNodeConversion extends ExpressionNodeConvers super(transformer); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext) - */ @Override protected Object convert(AggregationExpressionTransformationContext context) { @@ -530,10 +478,6 @@ private static class CompoundExpressionNodeConversion extends ExpressionNodeConv super(transformer); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext) - */ @Override protected Object convert(AggregationExpressionTransformationContext context) { @@ -547,10 +491,6 @@ protected Object convert(AggregationExpressionTransformationContext context) { @@ -589,10 +525,6 @@ protected Object convert(AggregationExpressionTransformationContext context) { @@ -625,10 +553,6 @@ protected Object convert(AggregationExpressionTransformationContext type, this.entity = Lazy.of(() -> mappingContext.getPersistentEntity(type)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document) - */ @Override public Document getMappedObject(Document document) { return getMappedObject(document, type); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class) - */ @Override public Document getMappedObject(Document document, @Nullable Class type) { return mapper.getMappedObject(document, type != null ? mappingContext.getPersistentEntity(type) : null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field) - */ @Override public FieldReference getReference(Field field) { return getReferenceFor(field); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String) - */ @Override public FieldReference getReference(String name) { return getReferenceFor(field(name)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class) - */ @Override public Fields getFields(Class type) { @@ -131,10 +111,6 @@ public Fields getFields(Class type) { return Fields.from(fields.toArray(new Field[0])); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#continueOnMissingFieldReference() - */ @Override public AggregationOperationContext continueOnMissingFieldReference() { return continueOnMissingFieldReference(type); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java index d4967cf000..3c86f25b81 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java @@ -74,10 +74,6 @@ public Class getInputType() { return inputType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.Aggregation#withOptions(org.springframework.data.mongodb.core.aggregation.AggregationOptions) - */ public TypedAggregation withOptions(AggregationOptions options) { Assert.notNull(options, "AggregationOptions must not be null."); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java index 679c464acb..71e5f82c3a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java @@ -124,10 +124,6 @@ public UnionWithOperation mapFieldsTo(Class domainType) { return new UnionWithOperation(collection, pipeline, domainType); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -153,10 +149,6 @@ private AggregationOperationContext computeContext(AggregationOperationContext s return source; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$unionWith"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java index 11bf850c9d..c918dad644 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java @@ -87,10 +87,6 @@ public UnsetOperation and(Field... fields) { return new UnsetOperation(target); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return ExposedFields.from(); @@ -109,10 +105,6 @@ Collection removedFieldNames() { return fieldNames; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -124,10 +116,6 @@ public Document toDocument(AggregationOperationContext context) { fields.stream().map(it -> computeFieldName(it, context)).collect(Collectors.toList())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$unset"; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java index 8b8d1695f5..38aca09129 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java @@ -85,10 +85,6 @@ public UnwindOperation(Field field, Field arrayIndex, boolean preserveNullAndEmp this.preserveNullAndEmptyArrays = preserveNullAndEmptyArrays; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(AggregationOperationContext context) { @@ -108,19 +104,11 @@ public Document toDocument(AggregationOperationContext context) { return new Document(getOperator(), unwindArgs); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator() - */ @Override public String getOperator() { return "$unwind"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields() - */ @Override public ExposedFields getFields() { return arrayIndex != null ? ExposedFields.from(arrayIndex) : ExposedFields.from(); @@ -210,10 +198,6 @@ public static PathBuilder newBuilder() { return new UnwindOperationBuilder(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#preserveNullAndEmptyArrays() - */ @Override public UnwindOperation preserveNullAndEmptyArrays() { @@ -224,10 +208,6 @@ public UnwindOperation preserveNullAndEmptyArrays() { return new UnwindOperation(field, true); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#skipNullAndEmptyArrays() - */ @Override public UnwindOperation skipNullAndEmptyArrays() { @@ -238,10 +218,6 @@ public UnwindOperation skipNullAndEmptyArrays() { return new UnwindOperation(field, false); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#arrayIndex(java.lang.String) - */ @Override public EmptyArraysBuilder arrayIndex(String field) { @@ -250,10 +226,6 @@ public EmptyArraysBuilder arrayIndex(String field) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#noArrayIndex() - */ @Override public EmptyArraysBuilder noArrayIndex() { @@ -261,10 +233,6 @@ public EmptyArraysBuilder noArrayIndex() { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.PathBuilder#path(java.lang.String) - */ @Override public UnwindOperationBuilder path(String path) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java index 781a8794f9..202b903fb8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java @@ -163,9 +163,6 @@ public Map andApply(final AggregationExpression expression) { }; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(final AggregationOperationContext context) { return toMap(ExposedFields.synthetic(Fields.fields(itemVariableName)), context); @@ -288,9 +285,6 @@ public interface LetBuilder { Let andApply(AggregationExpression expression); } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext) - */ @Override public Document toDocument(final AggregationOperationContext context) { return toLet(ExposedFields.synthetic(Fields.fields(getVariableNames())), context); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java index 55baacba78..354cf99bb5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java @@ -116,18 +116,11 @@ private void initializeConverters() { conversions.registerConvertersIn(conversionService); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService() - */ @Override public ConversionService getConversionService() { return conversionService; } - /* (non-Javadoc) - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ public void afterPropertiesSet() { initializeConverters(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java index 3540c97439..e396ddd0b5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java @@ -52,10 +52,6 @@ public DefaultDbRefProxyHandler(SpELContext spELContext, this.resolver = resolver; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefProxyHandler#populateId(com.mongodb.DBRef, java.lang.Object) - */ @Override public Object populateId(MongoPersistentProperty property, @Nullable DBRef source, Object proxy) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java index 2096142e03..090e5ab36d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java @@ -70,10 +70,6 @@ public DefaultDbRefResolver(MongoDatabaseFactory mongoDbFactory) { this.mongoDbFactory = mongoDbFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback) - */ @Override public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback, DbRefProxyHandler handler) { @@ -89,20 +85,12 @@ public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbr return callback.resolve(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#fetch(com.mongodb.DBRef) - */ @Override public Document fetch(DBRef dbRef) { return getReferenceLoader().fetchOne(DocumentReferenceQuery.forSingleDocument(Filters.eq("_id", dbRef.getId())), ReferenceCollection.fromDBRef(dbRef)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#bulkFetch(java.util.List) - */ @Override public List bulkFetch(List refs) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java index ad4eb85dfd..a0a6036603 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java @@ -52,10 +52,6 @@ public DefaultDbRefResolverCallback(Bson surroundingObject, ObjectPath path, SpE this.evaluator = evaluator; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolverCallback#resolve(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty) - */ @Override public Object resolve(MongoPersistentProperty property) { return resolver.getValueInternal(property, surroundingObject, evaluator, path); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java index ae090a0ed5..3b8248f6f6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java @@ -124,18 +124,10 @@ private DefaultMongoTypeMapper(@Nullable String typeKey, TypeAliasAccessor this.accessor = accessor; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#isTypeKey(java.lang.String) - */ public boolean isTypeKey(String key) { return typeKey == null ? false : typeKey.equals(key); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#writeTypeRestrictions(java.util.Set) - */ @Override public void writeTypeRestrictions(Document result, @Nullable Set> restrictedTypes) { @@ -157,19 +149,11 @@ public void writeTypeRestrictions(Document result, @Nullable Set> restr accessor.writeTypeTo(result, new Document("$in", restrictedMappedTypes)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#getWriteTargetTypeFor(java.lang.Class) - */ @Override public Class getWriteTargetTypeFor(Class source) { return writeTarget.apply(source); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object) - */ @Override protected TypeInformation getFallbackTypeFor(Bson source) { return source instanceof BasicDBList ? LIST_TYPE_INFO : MAP_TYPE_INFO; @@ -188,10 +172,6 @@ public DocumentTypeAliasAccessor(@Nullable String typeKey) { this.typeKey = typeKey; } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object) - */ public Alias readAliasFrom(Bson source) { if (source instanceof List) { @@ -207,10 +187,6 @@ public Alias readAliasFrom(Bson source) { throw new IllegalArgumentException("Cannot read alias from " + source.getClass()); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.TypeAliasAccessor#writeTypeTo(java.lang.Object, java.lang.Object) - */ public void writeTypeTo(Bson sink, Object alias) { if (typeKey != null) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java index 8ed11e2851..e0ba07d166 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java @@ -34,28 +34,16 @@ class DocumentPropertyAccessor extends MapAccessor { static final MapAccessor INSTANCE = new DocumentPropertyAccessor(); - /* - * (non-Javadoc) - * @see org.springframework.context.expression.MapAccessor#getSpecificTargetClasses() - */ @Override public Class[] getSpecificTargetClasses() { return new Class[] { Document.class }; } - /* - * (non-Javadoc) - * @see org.springframework.context.expression.MapAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) - */ @Override public boolean canRead(EvaluationContext context, @Nullable Object target, String name) { return true; } - /* - * (non-Javadoc) - * @see org.springframework.context.expression.MapAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String) - */ @Override @SuppressWarnings("unchecked") public TypedValue read(EvaluationContext context, @Nullable Object target, String name) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java index 5425051fc6..13f36eff24 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java @@ -131,10 +131,6 @@ enum DocumentToPointConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Point convert(Document source) { @@ -162,10 +158,6 @@ enum PointToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(Point source) { return source == null ? null : new Document("x", source.getX()).append("y", source.getY()); @@ -183,10 +175,6 @@ enum BoxToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(Box source) { @@ -212,10 +200,6 @@ enum DocumentToBoxConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Box convert(Document source) { @@ -240,10 +224,6 @@ enum CircleToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(Circle source) { @@ -270,10 +250,6 @@ static enum DocumentToCircleConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Circle convert(Document source) { @@ -311,10 +287,6 @@ static enum SphereToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(Sphere source) { @@ -341,10 +313,6 @@ enum DocumentToSphereConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Sphere convert(Document source) { @@ -382,10 +350,6 @@ enum PolygonToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(Polygon source) { @@ -417,10 +381,6 @@ enum DocumentToPolygonConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override @SuppressWarnings({ "unchecked" }) public Polygon convert(Document source) { @@ -452,10 +412,6 @@ enum GeoCommandToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override @SuppressWarnings("rawtypes") public Document convert(GeoCommand source) { @@ -512,10 +468,6 @@ enum GeoJsonToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Document convert(GeoJson source) { @@ -575,10 +527,6 @@ enum GeoJsonPointToDocumentConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Nullable @Override public GeoJson convert(Document source) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java index 00b535b55c..ed9e891765 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java @@ -216,10 +216,6 @@ public void setTypeMapper(@Nullable MongoTypeMapper typeMapper) { this.typeMapper = typeMapper; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoConverter#getTypeMapper() - */ @Override public MongoTypeMapper getTypeMapper() { return this.typeMapper == null ? this.defaultTypeMapper : this.typeMapper; @@ -261,18 +257,10 @@ public void setCodecRegistryProvider(@Nullable CodecRegistryProvider codecRegist this.codecRegistryProvider = codecRegistryProvider; } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.EntityConverter#getMappingContext() - */ public MappingContext, MongoPersistentProperty> getMappingContext() { return mappingContext; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; @@ -450,10 +438,6 @@ public Map getBean() { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.core.MongoReader#read(java.lang.Class, com.mongodb.Document) - */ public S read(Class clazz, Bson bson) { return read(ClassTypeInformation.from(clazz), bson); } @@ -752,10 +736,6 @@ private Object readUnwrapped(ConversionContext context, DocumentAccessor documen return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoWriter#toDBRef(java.lang.Object, org.springframework.data.mongodb.core.mapping.MongoPersistentProperty) - */ public DBRef toDBRef(Object object, @Nullable MongoPersistentProperty referringProperty) { org.springframework.data.mongodb.core.mapping.DBRef annotation; @@ -1524,10 +1504,6 @@ protected Map readMap(ConversionContext context, Bson bson, Type return map; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation) - */ @Nullable @SuppressWarnings("unchecked") @Override @@ -1944,10 +1920,6 @@ static class MongoDbPropertyValueProvider implements PropertyValueProvider T getPropertyValue(MongoPersistentProperty property) { @@ -1994,10 +1966,6 @@ class AssociationAwareMongoDbPropertyValueProvider extends MongoDbPropertyValueP super(context, source, evaluator); } - /* - * (non-Javadoc) - * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty) - */ @Nullable @SuppressWarnings("unchecked") public T getPropertyValue(MongoPersistentProperty property) { @@ -2056,10 +2024,6 @@ public ConverterAwareSpELExpressionParameterValueProvider(ConversionContext cont this.context = context; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter) - */ @Override protected T potentiallyConvertSpelValue(Object object, Parameter parameter) { return context.convert(object, parameter.getType()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java index efc1c1a2e4..d46a4190df 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java @@ -336,10 +336,6 @@ enum CurrencyToStringConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public String convert(Currency source) { return source.getCurrencyCode(); @@ -357,10 +353,6 @@ enum StringToCurrencyConverter implements Converter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Currency convert(String source) { return StringUtils.hasText(source) ? Currency.getInstance(source) : null; @@ -380,19 +372,11 @@ enum NumberToNumberConverterFactory implements ConverterFactory, INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConverterFactory#getConverter(java.lang.Class) - */ @Override public Converter getConverter(Class targetType) { return new NumberToNumberConverter(targetType); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { return !sourceType.equals(targetType); @@ -414,10 +398,6 @@ public NumberToNumberConverter(Class targetType) { this.targetType = targetType; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public T convert(Number source) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java index 9f1925f6e3..b2863d451c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java @@ -36,7 +36,6 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.core.convert.converter.GenericConverter; -import org.springframework.data.convert.JodaTimeConverters; import org.springframework.data.convert.WritingConverter; import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes; @@ -65,7 +64,6 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus converters.add(CustomToStringConverter.INSTANCE); converters.addAll(MongoConverters.getConvertersToRegister()); - converters.addAll(JodaTimeConverters.getConvertersToRegister()); converters.addAll(GeoConverters.getConvertersToRegister()); STORE_CONVERTERS = Collections.unmodifiableList(converters); @@ -119,10 +117,6 @@ private enum CustomToStringConverter implements GenericConverter { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes() - */ public Set getConvertibleTypes() { ConvertiblePair localeToString = new ConvertiblePair(Locale.class, String.class); @@ -131,10 +125,6 @@ public Set getConvertibleTypes() { return new HashSet<>(Arrays.asList(localeToString, booleanToString)); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor) - */ public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return source != null ? source.toString() : null; } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java index 34b9479196..501362de1f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java @@ -60,10 +60,6 @@ public MongoJsonSchemaMapper(MongoConverter converter) { this.mappingContext = converter.getMappingContext(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.JsonSchemaMapper#mapSchema(org.springframework.data.mongodb.core.schema.MongoJsonSchema, java.lang.Class) - */ public Document mapSchema(Document jsonSchema, Class type) { Assert.notNull(jsonSchema, "Schema must not be null!"); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java index 587d1a5047..0e324d0a62 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java @@ -36,10 +36,6 @@ public enum NoOpDbRefResolver implements DbRefResolver { INSTANCE; - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback, org.springframework.data.mongodb.core.convert.DbRefProxyHandler) - */ @Override @Nullable public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback, @@ -48,20 +44,12 @@ public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbr return handle(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#fetch(com.mongodb.DBRef) - */ @Override @Nullable public Document fetch(DBRef dbRef) { return handle(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.DbRefResolver#bulkFetch(java.util.List) - */ @Override public List bulkFetch(List dbRefs) { return handle(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java index 3b5bf73efa..c6c8e46a78 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java @@ -180,10 +180,6 @@ private String getCollection() { return collection.get(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java index ac1794b87d..dbedae575e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java @@ -1098,19 +1098,11 @@ public MetadataBackedField(String name, MongoPersistentEntity entity, this.association = findAssociation(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#with(java.lang.String) - */ @Override public MetadataBackedField with(String name) { return new MetadataBackedField(name, entity, mappingContext, property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdField() - */ @Override public boolean isIdField() { @@ -1127,19 +1119,11 @@ public boolean isIdField() { return DEFAULT_ID_NAMES.contains(name); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getProperty() - */ @Override public MongoPersistentProperty getProperty() { return association == null ? property : association.getInverse(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getEntity() - */ @Override public MongoPersistentEntity getPropertyEntity() { MongoPersistentProperty property = getProperty(); @@ -1152,19 +1136,11 @@ public MongoPersistentEntity getEntity() { return entity; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isAssociation() - */ @Override public boolean isAssociation() { return association != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getAssociation() - */ @Override public Association getAssociation() { return association; @@ -1192,10 +1168,6 @@ private Association findAssociation() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey() - */ @Override public String getMappedKey() { return path == null ? name : path.toDotPath(isAssociation() ? getAssociationConverter() : getPropertyConverter()); @@ -1360,20 +1332,12 @@ public PositionParameterRetainingPropertyKeyConverter(String rawKey, this.keyMapper = new KeyMapper(rawKey, ctx); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public String convert(MongoPersistentProperty source) { return keyMapper.mapPropertyName(source); } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTypeHint() - */ @Override public TypeInformation getTypeHint() { @@ -1495,10 +1459,6 @@ public AssociationConverter(String name, Association as this.name = name; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public String convert(MongoPersistentProperty source) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java index 7b1ab60bf1..feb1e0673f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java @@ -58,10 +58,6 @@ public UpdateMapper(MongoConverter converter) { this.converter = converter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObject(Bson, MongoPersistentEntity) - */ @Override public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity entity) { @@ -141,10 +137,6 @@ protected Object delegateConvertToMongoType(Object source, @Nullable MongoPersis entity == null ? ClassTypeInformation.OBJECT : getTypeHintForEntity(source, entity)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObjectForField(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object) - */ @Override protected Entry getMappedObjectForField(Field field, Object rawValue) { @@ -189,10 +181,6 @@ private Entry getMappedUpdateModifier(Field field, Object rawVal return createMapEntry(field, value); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper#isAssociationConversionNecessary(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object) - */ @Override protected boolean isAssociationConversionNecessary(Field documentField, @Nullable Object value) { return super.isAssociationConversionNecessary(documentField, value) || documentField.containsAssociation(); @@ -246,10 +234,6 @@ private TypeInformation getTypeHintForEntity(@Nullable Object source, MongoPe return NESTED_DOCUMENT; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper#createPropertyField(org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.String, org.springframework.data.mapping.context.MappingContext) - */ @Override protected Field createPropertyField(MongoPersistentEntity entity, String key, MappingContext, MongoPersistentProperty> mappingContext) { @@ -299,28 +283,16 @@ public MetadataBackedUpdateField(MongoPersistentEntity entity, String key, this.key = key; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getMappedKey() - */ @Override public String getMappedKey() { return this.getPath() == null ? key : super.getMappedKey(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getPropertyConverter() - */ @Override protected Converter getPropertyConverter() { return new PositionParameterRetainingPropertyKeyConverter(key, getMappingContext()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getAssociationConverter() - */ @Override protected Converter getAssociationConverter() { return new UpdateAssociationConverter(getMappingContext(), getAssociation(), key); @@ -348,10 +320,6 @@ public UpdateAssociationConverter( this.mapper = new KeyMapper(key, mappingContext); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public String convert(MongoPersistentProperty source) { return super.convert(source) == null ? null : mapper.mapPropertyName(source); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java index 2061980734..0e2f85b74a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java @@ -47,37 +47,21 @@ public GeoJsonGeometryCollection(List> geometries) { this.geometries.addAll(geometries); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public Iterable> getCoordinates() { return Collections.unmodifiableList(this.geometries); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.geometries); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java index ed88220fff..e85ef5c0d6 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java @@ -50,10 +50,6 @@ public GeoJsonLineString(Point first, Point second, Point... others) { super(first, second, others); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonMultiPoint#getType() - */ @Override public String getType() { return TYPE; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java index 154250829f..8e22791c24 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java @@ -139,10 +139,6 @@ private static void registerDeserializersIn(SimpleModule module) { */ private static abstract class GeoJsonDeserializer> extends JsonDeserializer { - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext) - */ @Nullable @Override public T deserialize(@Nullable JsonParser jp, @Nullable DeserializationContext ctxt) throws IOException { @@ -240,10 +236,6 @@ protected GeoJsonLineString toLineString(ArrayNode node) { */ private static class GeoJsonPointDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Nullable @Override protected GeoJsonPoint doDeserialize(ArrayNode coordinates) { @@ -270,10 +262,6 @@ protected GeoJsonPoint doDeserialize(ArrayNode coordinates) { */ private static class GeoJsonLineStringDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Override protected GeoJsonLineString doDeserialize(ArrayNode coordinates) { return new GeoJsonLineString(toPoints(coordinates)); @@ -299,10 +287,6 @@ protected GeoJsonLineString doDeserialize(ArrayNode coordinates) { */ private static class GeoJsonMultiPointDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Override protected GeoJsonMultiPoint doDeserialize(ArrayNode coordinates) { return new GeoJsonMultiPoint(toPoints(coordinates)); @@ -329,10 +313,6 @@ protected GeoJsonMultiPoint doDeserialize(ArrayNode coordinates) { */ private static class GeoJsonMultiLineStringDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Override protected GeoJsonMultiLineString doDeserialize(ArrayNode coordinates) { @@ -367,10 +347,6 @@ protected GeoJsonMultiLineString doDeserialize(ArrayNode coordinates) { */ private static class GeoJsonPolygonDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Nullable @Override protected GeoJsonPolygon doDeserialize(ArrayNode coordinates) { @@ -406,10 +382,6 @@ protected GeoJsonPolygon doDeserialize(ArrayNode coordinates) { */ private static class GeoJsonMultiPolygonDeserializer extends GeoJsonDeserializer { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode) - */ @Override protected GeoJsonMultiPolygon doDeserialize(ArrayNode coordinates) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java index ba8cabc8e5..3bdbb07c93 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java @@ -62,37 +62,21 @@ public GeoJsonMultiLineString(List lines) { this.coordinates.addAll(lines); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public Iterable getCoordinates() { return Collections.unmodifiableList(this.coordinates); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.coordinates); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java index 30af9f7293..37028158f4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java @@ -84,37 +84,21 @@ public GeoJsonMultiPoint(Point first, Point second, Point... others) { this.points.addAll(Arrays.asList(others)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public List getCoordinates() { return Collections.unmodifiableList(this.points); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.points); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java index 881025497b..08e7d3b8a3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java @@ -46,37 +46,21 @@ public GeoJsonMultiPolygon(List polygons) { this.coordinates.addAll(polygons); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public List getCoordinates() { return Collections.unmodifiableList(this.coordinates); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(this.coordinates); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java index efcb393d9b..c92a3ec181 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java @@ -52,19 +52,11 @@ public GeoJsonPoint(Point point) { super(point); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public List getCoordinates() { return Arrays.asList(Double.valueOf(getX()), Double.valueOf(getY())); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java index 685284e91d..484d369d55 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java @@ -112,19 +112,11 @@ public GeoJsonPolygon withInnerRing(GeoJsonLineString lineString) { return polygon; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getType() - */ @Override public String getType() { return TYPE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates() - */ @Override public List getCoordinates() { return Collections.unmodifiableList(this.coordinates); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java index bb27768be5..36900164c5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java @@ -57,10 +57,6 @@ static void registerSerializersIn(SimpleModule module) { */ private static abstract class GeoJsonSerializer> extends JsonSerializer { - /* - * (non-Javadoc) - * @see com.fasterxml.jackson.databind.JsonSerializer#serialize(java.lang.Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider) - */ @Override public void serialize(T shape, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java index 309f493f02..2f196f7b6a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java @@ -92,18 +92,11 @@ public Distance getRadius() { return radius; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Sphere [center=%s, radius=%s]", center, radius); } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -120,10 +113,6 @@ public boolean equals(Object obj) { return this.center.equals(that.center) && this.radius.equals(that.radius); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { int result = 17; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java index 50c5b37ed4..2968431d42 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java @@ -39,10 +39,6 @@ public CompoundIndexDefinition(Document keys) { this.keys = keys; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.Index#getIndexKeys() - */ @Override public Document getIndexKeys() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java index 3ca3d2d8ed..b25a91a41b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java @@ -155,10 +155,6 @@ public GeospatialIndex collation(@Nullable Collation collation) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys() - */ @Override public Document getIndexKeys() { @@ -189,10 +185,6 @@ public Document getIndexKeys() { return document; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions() - */ @Override public Document getIndexOptions() { @@ -232,10 +224,6 @@ public Document getIndexOptions() { return document; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Geo index: %s - Options: %s", getIndexKeys(), getIndexOptions()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java index 4d93100fe0..2dc8dce941 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java @@ -46,19 +46,11 @@ public static HashedIndex hashed(String field) { return new HashedIndex(field); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys() - */ @Override public Document getIndexKeys() { return new Document(field, "hashed"); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions() - */ @Override public Document getIndexOptions() { return new Document(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java index 1ca2711665..30eb4ea79c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java @@ -177,10 +177,6 @@ public Index collation(@Nullable Collation collation) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys() - */ public Document getIndexKeys() { Document document = new Document(); @@ -192,10 +188,6 @@ public Document getIndexKeys() { return document; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions() - */ public Document getIndexOptions() { Document document = new Document(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java index 843584b29d..2c0402b768 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java @@ -174,10 +174,6 @@ public boolean isWildcard() { return Type.WILDCARD.equals(type); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -195,10 +191,6 @@ public boolean equals(Object obj) { && this.type == that.type; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -210,10 +202,6 @@ public int hashCode() { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("IndexField [ key: %s, direction: %s, type: %s, weight: %s]", key, direction, type, weight); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java index 80fabb676d..f907190edf 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java @@ -66,10 +66,6 @@ public MongoMappingEventPublisher(MongoPersistentEntityIndexCreator indexCreator this.indexCreator = indexCreator; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent) - */ @SuppressWarnings("unchecked") public void publishEvent(ApplicationEvent event) { if (event instanceof MappingContextEvent) { @@ -77,9 +73,5 @@ public void publishEvent(ApplicationEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationEventPublisher#publishEvent(java.lang.Object) - */ public void publishEvent(Object event) {} } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java index c2005db071..467c178395 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java @@ -97,10 +97,6 @@ public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, } } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ public void onApplicationEvent(MappingContextEvent event) { if (!event.wasEmittedBy(mappingContext)) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java index 9f9354a7eb..b175f18165 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java @@ -96,9 +96,6 @@ public MongoPersistentEntityIndexResolver( this.mappingContext = mappingContext; } - /* (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexResolver#resolveIndexForClass(org.springframework.data.util.TypeInformation) - */ @Override public Iterable resolveIndexFor(TypeInformation typeInformation) { return resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(typeInformation)); @@ -931,10 +928,6 @@ public boolean isCycle() { return cycle; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return this.elements.isEmpty() ? "(empty)" : toPath(this.elements.iterator()); @@ -1033,10 +1026,6 @@ public CyclicPropertyReferenceException(String propertyName, @Nullable Class this.dotPath = dotPath; } - /* - * (non-Javadoc) - * @see java.lang.Throwable#getMessage() - */ @Override public String getMessage() { return String.format("Found cycle for field '%s' in type '%s' for path '%s'", propertyName, @@ -1091,19 +1080,11 @@ public IndexDefinition getIndexDefinition() { return indexDefinition; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys() - */ @Override public org.bson.Document getIndexKeys() { return indexDefinition.getIndexKeys(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions() - */ @Override public org.bson.Document getIndexOptions() { return indexDefinition.getIndexOptions(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java index a0ce869bf9..c1713b2ebf 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java @@ -57,10 +57,6 @@ public static PartialIndexFilter of(CriteriaDefinition where) { return new PartialIndexFilter(where); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexFilter#getFilterObject() - */ public Document getFilterObject() { if (filterExpression instanceof Document) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java index 9386382be1..0d920e785d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java @@ -88,10 +88,6 @@ public boolean hasFieldSpec() { return !fieldSpecs.isEmpty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys() - */ @Override public Document getIndexKeys() { @@ -103,10 +99,6 @@ public Document getIndexKeys() { return keys; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions() - */ @Override public Document getIndexOptions() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java index 6840fce5bf..76326df81e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java @@ -125,10 +125,6 @@ private ShardKey detectShardKey() { return sharded.immutableKey() ? ShardKey.immutable(shardKey) : shardKey; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection() - */ public String getCollection() { return expression == null // @@ -136,38 +132,22 @@ public String getCollection() { : expression.getValue(getEvaluationContext(null), String.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getLanguage() - */ @Override public String getLanguage() { return this.language; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getTextScoreProperty() - */ @Nullable @Override public MongoPersistentProperty getTextScoreProperty() { return getPersistentProperty(TextScore.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasTextScoreProperty() - */ @Override public boolean hasTextScoreProperty() { return getTextScoreProperty() != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollation() - */ @Override public org.springframework.data.mongodb.core.query.Collation getCollation() { @@ -197,10 +177,6 @@ public ShardKey getShardKey() { return shardKey; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify() - */ @Override public void verify() { @@ -210,10 +186,6 @@ public void verify() { verifyFieldTypes(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.BasicPersistentEntity#getEvaluationContext(java.lang.Object) - */ @Override public EvaluationContext getEvaluationContext(Object rootObject) { return super.getEvaluationContext(rootObject); @@ -245,10 +217,6 @@ static enum MongoPersistentPropertyComparator implements Comparator getEncryptionKeyIds() { */ private static class PropertyTypeAssertionHandler implements PropertyHandler { - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.PropertyHandler#doWithPersistentProperty(org.springframework.data.mapping.PersistentProperty) - */ @Override public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java index 80d10c4145..7a26087d16 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java @@ -120,10 +120,6 @@ public boolean isIdProperty() { return SUPPORTED_ID_PROPERTY_NAMES.contains(getName()) && !hasExplicitFieldName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitIdProperty() - */ @Override public boolean isExplicitIdProperty() { return super.isIdProperty(); @@ -161,10 +157,6 @@ public String getFieldName() { return fieldName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldType() - */ @Override public Class getFieldType() { @@ -214,10 +206,6 @@ private String getAnnotatedFieldName() { return annotation != null ? annotation.value() : null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldOrder() - */ public int getFieldOrder() { org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation( @@ -226,10 +214,6 @@ public int getFieldOrder() { return annotation != null ? annotation.order() : Integer.MAX_VALUE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#skipNullValues() - */ @Override public boolean writeNullValues() { @@ -239,73 +223,41 @@ public boolean writeNullValues() { return annotation != null && annotation.write() == Field.Write.ALWAYS; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation() - */ @Override protected Association createAssociation() { return new Association(this, null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isDbReference() - */ public boolean isDbReference() { return isAnnotationPresent(DBRef.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isDocumentReference() - */ @Override public boolean isDocumentReference() { return isAnnotationPresent(DocumentReference.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDBRef() - */ @Nullable public DBRef getDBRef() { return findAnnotation(DBRef.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDocumentReference() - */ @Nullable @Override public DocumentReference getDocumentReference() { return findAnnotation(DocumentReference.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isLanguageProperty() - */ @Override public boolean isLanguageProperty() { return getFieldName().equals(LANGUAGE_FIELD_NAME) || isExplicitLanguageProperty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitLanguageProperty() - */ @Override public boolean isExplicitLanguageProperty() { return isAnnotationPresent(Language.class); }; - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isTextScoreProperty() - */ @Override public boolean isTextScoreProperty() { return isAnnotationPresent(TextScore.class); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java index 53a501e068..81431f7449 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java @@ -51,10 +51,6 @@ public CachingMongoPersistentProperty(Property property, MongoPersistentEntity getFieldType() { @@ -119,10 +99,6 @@ public Class getFieldType() { return this.fieldType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#usePropertyAccess() - */ @Override public boolean usePropertyAccess() { @@ -133,10 +109,6 @@ public boolean usePropertyAccess() { return this.usePropertyAccess; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isTransient() - */ @Override public boolean isTransient() { @@ -147,19 +119,11 @@ public boolean isTransient() { return this.isTransient; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isDbReference() - */ @Override public boolean isDbReference() { return getDBRef() != null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getDBRef() - */ @Override public DBRef getDBRef() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java index 674ea74f3a..c5442f0f99 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java @@ -67,10 +67,6 @@ public void setFieldNamingStrategy(@Nullable FieldNamingStrategy fieldNamingStra this.fieldNamingStrategy = fieldNamingStrategy == null ? DEFAULT_NAMING_STRATEGY : fieldNamingStrategy; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.context.AbstractMappingContext#shouldCreatePersistentEntityFor(org.springframework.data.util.TypeInformation) - */ @Override protected boolean shouldCreatePersistentEntityFor(TypeInformation type) { @@ -81,29 +77,17 @@ protected boolean shouldCreatePersistentEntityFor(TypeInformation type) { return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType()) && !AbstractMap.class.isAssignableFrom(type.getType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.AbstractMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.mapping.MutablePersistentEntity, org.springframework.data.mapping.SimpleTypeHolder) - */ @Override public MongoPersistentProperty createPersistentProperty(Property property, MongoPersistentEntity owner, SimpleTypeHolder simpleTypeHolder) { return new CachingMongoPersistentProperty(property, owner, simpleTypeHolder, fieldNamingStrategy); } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.BasicMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation, org.springframework.data.mapping.model.MappingContext) - */ @Override protected BasicMongoPersistentEntity createPersistentEntity(TypeInformation typeInformation) { return new BasicMongoPersistentEntity<>(typeInformation); } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java index cb31bdb74b..2a02f36d35 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java @@ -185,10 +185,6 @@ enum PropertyToFieldNameConverter implements Converter getTypeInformation() { return delegate.getTypeInformation(); } - @Override - public Iterable> getPersistentEntityTypes() { - return delegate.getPersistentEntityTypes(); - } - @Override public Iterable> getPersistentEntityTypeInformation() { return delegate.getPersistentEntityTypeInformation(); @@ -345,10 +340,6 @@ public PersistentPropertyAccessor getAccessorForOwner(T owner) { return delegate.getAccessorForOwner(owner); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -367,10 +358,6 @@ public boolean equals(Object obj) { return ObjectUtils.nullSafeEquals(context, that.context); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java index b3be465495..ea2a230687 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java @@ -42,10 +42,6 @@ public AbstractMongoEventListener() { this.domainClass = typeArgument == null ? Object.class : typeArgument; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void onApplicationEvent(MongoMappingEvent event) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java index 9e4e473120..2fcbc623e0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java @@ -45,19 +45,11 @@ public AuditingEntityCallback(ObjectFactory auditingH this.auditingHandlerFactory = auditingHandlerFactory; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback#onBeforeConvert(java.lang.Object, java.lang.String) - */ @Override public Object onBeforeConvert(Object entity, String collection) { return auditingHandlerFactory.getObject().markAudited(entity); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return 100; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java index 48f663a747..4bde2b7ba7 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java @@ -47,19 +47,11 @@ public AuditingEventListener(ObjectFactory auditingHa this.auditingHandlerFactory = auditingHandlerFactory; } - /* - * (non-Javadoc) - * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) - */ @Override public void onApplicationEvent(BeforeConvertEvent event) { event.mapSource(it -> auditingHandlerFactory.getObject().markAudited(it)); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return 100; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java index eb6e1751cf..2fd0a5362b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java @@ -34,10 +34,6 @@ public class LoggingEventListener extends AbstractMongoEventListener { private static final Log LOGGER = LogFactory.getLog(LoggingEventListener.class); - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeConvert(org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent) - */ @Override public void onBeforeConvert(BeforeConvertEvent event) { if(LOGGER.isInfoEnabled()) { @@ -45,10 +41,6 @@ public void onBeforeConvert(BeforeConvertEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent) - */ @Override public void onBeforeSave(BeforeSaveEvent event) { if(LOGGER.isInfoEnabled()) { @@ -56,10 +48,6 @@ public void onBeforeSave(BeforeSaveEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterSave(org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent) - */ @Override public void onAfterSave(AfterSaveEvent event) { if(LOGGER.isInfoEnabled()) { @@ -67,10 +55,6 @@ public void onAfterSave(AfterSaveEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterLoad(org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent) - */ @Override public void onAfterLoad(AfterLoadEvent event) { if(LOGGER.isInfoEnabled()) { @@ -78,10 +62,6 @@ public void onAfterLoad(AfterLoadEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterConvert(org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent) - */ @Override public void onAfterConvert(AfterConvertEvent event) { if(LOGGER.isInfoEnabled()) { @@ -89,10 +69,6 @@ public void onAfterConvert(AfterConvertEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterDelete(org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent) - */ @Override public void onAfterDelete(AfterDeleteEvent event) { if(LOGGER.isInfoEnabled()) { @@ -100,10 +76,6 @@ public void onAfterDelete(AfterDeleteEvent event) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeDelete(org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent) - */ @Override public void onBeforeDelete(BeforeDeleteEvent event) { if(LOGGER.isInfoEnabled()) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java index ab2fa3ac85..6846d3e24f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java @@ -65,10 +65,6 @@ public MongoMappingEvent(T source, @Nullable Document document, @Nullable String return collectionName; } - /* - * (non-Javadoc) - * @see java.util.EventObject#getSource() - */ @SuppressWarnings({ "unchecked" }) @Override public T getSource() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java index ed01158604..284a94578b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java @@ -47,19 +47,11 @@ public ReactiveAuditingEntityCallback(ObjectFactory onBeforeConvert(Object entity, String collection) { return auditingHandlerFactory.getObject().markAudited(entity); } - /* - * (non-Javadoc) - * @see org.springframework.core.Ordered#getOrder() - */ @Override public int getOrder() { return 100; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java index 747e2061bf..63c2234660 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java @@ -17,8 +17,8 @@ import java.util.Set; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,10 +50,6 @@ public ValidatingMongoEventListener(Validator validator) { this.validator = validator; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent) - */ @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void onBeforeSave(BeforeSaveEvent event) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java index 92ec228c75..ca28408c58 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java @@ -55,20 +55,12 @@ public long getOutputCount() { return outputCount; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MapReduceCounts [inputCount=" + inputCount + ", emitCount=" + emitCount + ", outputCount=" + outputCount + "]"; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -82,10 +74,6 @@ public int hashCode() { return Long.valueOf(result).intValue(); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (this == obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java index 2936aff725..e1a49f35f4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java @@ -57,10 +57,6 @@ public MapReduceResults(List mappedResults, Document rawResults) { this.outputCollection = parseOutputCollection(rawResults); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ public Iterator iterator() { return mappedResults.iterator(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java index bb99076031..caebef63ab 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java @@ -38,19 +38,11 @@ public long getTotalTime() { return totalTime; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return "MapReduceTiming [mapTime=" + mapTime + ", emitLoopTime=" + emitLoopTime + ", totalTime=" + totalTime + "]"; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -64,11 +56,6 @@ public int hashCode() { return result; } - /* - * - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java index 7632171f86..ed08c4fcfa 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java @@ -117,19 +117,11 @@ public ChangeStreamRequest(MessageListener, ? sup this.messageListener = messageListener; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getMessageListener() - */ @Override public MessageListener, ? super T> getMessageListener() { return messageListener; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getRequestOptions() - */ @Override public ChangeStreamRequestOptions getRequestOptions() { return options; @@ -220,28 +212,16 @@ public ChangeStreamOptions getChangeStreamOptions() { return options; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest.RequestOptions#getCollectionName() - */ @Override public String getCollectionName() { return collectionName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest.RequestOptions#getDatabaseName() - */ @Override public String getDatabaseName() { return databaseName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest.RequestOptions#maxAwaitTime() - */ @Override public Duration maxAwaitTime() { return maxAwaitTime != null ? maxAwaitTime : RequestOptions.super.maxAwaitTime(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java index d609e9b6e6..e7c75c15cf 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java @@ -77,10 +77,6 @@ class ChangeStreamTask extends CursorReadingTask, mongoConverter = template.getConverter(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#initCursor(org.springframework.data.mongodb.core.MongoTemplate, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions, java.lang.Class) - */ @Override protected MongoCursor> initCursor(MongoTemplate template, RequestOptions options, Class targetType) { @@ -187,10 +183,6 @@ List prepareFilter(MongoTemplate template, ChangeStreamOptions options "ChangeStreamRequestOptions.filter mut be either an Aggregation or a plain list of Documents"); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#createMessage(java.lang.Object, java.lang.Class, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions) - */ @Override protected Message, Object> createMessage(ChangeStreamDocument source, Class targetType, RequestOptions options) { @@ -226,30 +218,18 @@ static class ChangeStreamEventMessage implements Message getRaw() { return delegate.getRaw(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getBody() - */ @Nullable @Override public T getBody() { return delegate.getBody(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getProperties() - */ @Override public MessageProperties getProperties() { return this.messageProperties; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java index 22b924ff28..7a5c347899 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java @@ -66,10 +66,6 @@ abstract class CursorReadingTask implements Task { this.errorHandler = errorHandler; } - /* - * (non-Javadoc) - * @see java.lang.Runnable - */ @Override public void run() { @@ -164,10 +160,6 @@ private void start() { protected abstract MongoCursor initCursor(MongoTemplate template, RequestOptions options, Class targetType); - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Cancelable#cancel() - */ @Override public void cancel() throws DataAccessResourceFailureException { @@ -182,19 +174,11 @@ public void cancel() throws DataAccessResourceFailureException { } } - /* - * (non-Javadoc) - * @see org.springframework.scheduling.SchedulingAwareRunnable#isLongLived() - */ @Override public boolean isLongLived() { return true; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Task#getState() - */ @Override public State getState() { @@ -203,10 +187,6 @@ public State getState() { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Task#awaitStart(java.time.Duration) - */ @Override public boolean awaitStart(Duration timeout) throws InterruptedException { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java index dea0320ef9..ef4416a869 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java @@ -94,19 +94,11 @@ public DefaultMessageListenerContainer(MongoTemplate template, Executor taskExec this.errorHandler = Optional.ofNullable(errorHandler); } - /* - * (non-Javadoc) - * @see org.springframework.context.SmartLifecycle#isAutoStartup() - */ @Override public boolean isAutoStartup() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.context.SmartLifecycle#stop(java.lang.Runnable) - */ @Override public void stop(Runnable callback) { @@ -114,10 +106,6 @@ public void stop(Runnable callback) { callback.run(); } - /* - * (non-Javadoc) - * @see org.springframework.context.Lifecycle#start() - */ @Override public void start() { @@ -138,10 +126,6 @@ public void start() { } } - /* - * (non-Javadoc) - * @see org.springframework.context.Lifecycle#stop() - */ @Override public void stop() { @@ -156,10 +140,6 @@ public void stop() { } } - /* - * (non-Javadoc) - * @see org.springframework.context.Lifecycle#isRunning() - */ @Override public boolean isRunning() { @@ -168,19 +148,11 @@ public boolean isRunning() { } } - /* - * (non-Javadoc) - * @see org.springframework.context.Phased#getPhase() - */ @Override public int getPhase() { return Integer.MAX_VALUE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#register(org.springframework.data.mongodb.monitor.SubscriptionRequest, java.lang.Class) - */ @Override public Subscription register(SubscriptionRequest request, Class bodyType) { @@ -189,10 +161,6 @@ public Subscription register(SubscriptionRequest new DecoratingLoggingErrorHandler((exception) -> lookup(request).ifPresent(Subscription::cancel)))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#register(org.springframework.data.mongodb.monitor.SubscriptionRequest, java.lang.Class, org.springframework.util.ErrorHandler) - */ @Override public Subscription register(SubscriptionRequest request, Class bodyType, ErrorHandler errorHandler) { @@ -200,10 +168,6 @@ public Subscription register(SubscriptionRequest lookup(SubscriptionRequest request) { @@ -232,10 +196,6 @@ public Subscription register(SubscriptionRequest request, Task task) { return subscription; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#remove(org.springframework.data.mongodb.monitor.Subscription) - */ @Override public void remove(Subscription subscription) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java index 221f486cd8..c13d7e4538 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java @@ -37,19 +37,11 @@ class LazyMappingDelegatingMessage implements Message { this.converter = converter; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getRaw() - */ @Override public S getRaw() { return delegate.getRaw(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getBody() - */ @Override public T getBody() { @@ -71,10 +63,6 @@ public T getBody() { String.format("No converter found capable of converting %s to %s", messageBody.getClass(), targetType)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getProperties() - */ @Override public MessageProperties getProperties() { return delegate.getProperties(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java index 6d9e1cbdd1..f0da856651 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java @@ -45,28 +45,16 @@ class SimpleMessage implements Message { this.properties = properties; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getRaw() - */ @Override public S getRaw() { return raw; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getBody() - */ @Override public T getBody() { return body; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.Message#getProperties() - */ @Override public MessageProperties getProperties() { return properties; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java index 661176907d..845ea4ada8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java @@ -76,19 +76,11 @@ public TailableCursorRequest(MessageListener messageListene : TailableCursorRequestOptions.of(options); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getMessageListener() - */ @Override public MessageListener getMessageListener() { return messageListener; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getRequestOptions() - */ @Override public TailableCursorRequestOptions getRequestOptions() { return options; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java index 092eebfb7c..ee7b27c79f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java @@ -45,10 +45,6 @@ public TailableCursorTask(MongoTemplate template, TailableCursorRequest reque queryMapper = new QueryMapper(template.getConverter()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#initCursor(org.springframework.data.mongodb.core.MongoTemplate, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions, java.lang.Class) - */ @Override protected MongoCursor initCursor(MongoTemplate template, RequestOptions options, Class targetType) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java index cc2ae28c23..f2be0ffc7b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java @@ -85,10 +85,6 @@ public BasicQuery(Document queryObject, Document fieldsObject) { this.sortObject = new Document(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#addCriteria(org.springframework.data.mongodb.core.query.CriteriaDefinition) - */ @Override public Query addCriteria(CriteriaDefinition criteria) { @@ -97,19 +93,11 @@ public Query addCriteria(CriteriaDefinition criteria) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#getQueryObject() - */ @Override public Document getQueryObject() { return this.queryObject; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#getFieldsObject() - */ @Override public Document getFieldsObject() { @@ -119,10 +107,6 @@ public Document getFieldsObject() { return combinedFieldsObject; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#getSortObject() - */ @Override public Document getSortObject() { @@ -148,10 +132,6 @@ public void setSortObject(Document sortObject) { this.sortObject = sortObject; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#isSorted() - */ @Override public boolean isSorted() { return super.isSorted() || !sortObject.isEmpty(); @@ -171,10 +151,6 @@ public void setFieldsObject(Document fieldsObject) { this.fieldsObject = fieldsObject; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -194,10 +170,6 @@ public boolean equals(Object o) { nullSafeEquals(sortObject, that.sortObject); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java index 04c63a9d17..aeb7edff7b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java @@ -852,10 +852,6 @@ public String getKey() { return this.key; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject() - */ public Document getCriteriaObject() { if (this.criteriaChain.size() == 1) { @@ -967,10 +963,6 @@ private boolean createNearCriteriaForCommand(String command, String operation, d return false; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -1085,10 +1077,6 @@ private boolean isEqual(@Nullable Object left, @Nullable Object right) { return ObjectUtils.nullSafeEquals(left, right); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -1294,109 +1282,61 @@ private static class BitwiseCriteriaOperatorsImpl implements BitwiseCriteriaOper this.target = target; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(int) - */ @Override public Criteria allClear(int numericBitmask) { return numericBitmask("$bitsAllClear", numericBitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(java.lang.String) - */ @Override public Criteria allClear(String bitmask) { return stringBitmask("$bitsAllClear", bitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(java.util.List) - */ @Override public Criteria allClear(List positions) { return positions("$bitsAllClear", positions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(int) - */ @Override public Criteria allSet(int numericBitmask) { return numericBitmask("$bitsAllSet", numericBitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(java.lang.String) - */ @Override public Criteria allSet(String bitmask) { return stringBitmask("$bitsAllSet", bitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(java.util.List) - */ @Override public Criteria allSet(List positions) { return positions("$bitsAllSet", positions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(int) - */ @Override public Criteria anyClear(int numericBitmask) { return numericBitmask("$bitsAnyClear", numericBitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(java.lang.String) - */ @Override public Criteria anyClear(String bitmask) { return stringBitmask("$bitsAnyClear", bitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(java.util.List) - */ @Override public Criteria anyClear(List positions) { return positions("$bitsAnyClear", positions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(int) - */ @Override public Criteria anySet(int numericBitmask) { return numericBitmask("$bitsAnySet", numericBitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(java.lang.String) - */ @Override public Criteria anySet(String bitmask) { return stringBitmask("$bitsAnySet", bitmask); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(java.util.Collection) - */ @Override public Criteria anySet(List positions) { return positions("$bitsAnySet", positions); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java index 57a233eb44..5b9f00ade2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java @@ -87,10 +87,6 @@ private String getCommand(Shape shape) { throw new IllegalArgumentException("Unknown shape: " + shape); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -102,10 +98,6 @@ public int hashCode() { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java index d70a21707f..de0fd584b0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java @@ -248,10 +248,6 @@ private T getValue(String key, T defaultValue) { return value != null ? value : defaultValue; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -260,10 +256,6 @@ public int hashCode() { return hash; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java index ce60798bf5..d4eab616f0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java @@ -585,20 +585,12 @@ public boolean isSorted() { return target; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Query: %s, Fields: %s, Sort: %s", serializeToJsonSafely(getQueryObject()), serializeToJsonSafely(getFieldsObject()), serializeToJsonSafely(getSortObject())); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -634,10 +626,6 @@ protected boolean querySettingsEquals(Query that) { && collationEqual; } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java index 1b478b193c..a842ae36d2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java @@ -93,10 +93,6 @@ public String getFormatted() { return negated ? negateRaw(formatted) : formatted; } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -114,10 +110,6 @@ public boolean equals(Object o) { && ObjectUtils.nullSafeEquals(raw, term.raw); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -130,10 +122,6 @@ public int hashCode() { return result; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return getFormatted(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java index ad66db43b0..2b32a79f88 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java @@ -195,19 +195,11 @@ public TextCriteria diacriticSensitive(boolean diacriticSensitive) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getKey() - */ @Override public String getKey() { return "$text"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject() - */ @Override public Document getCriteriaObject() { @@ -232,10 +224,6 @@ public Document getCriteriaObject() { return new Document("$text", document); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { @@ -253,10 +241,6 @@ public boolean equals(Object o) { && ObjectUtils.nullSafeEquals(diacriticSensitive, that.diacriticSensitive); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java index 8b8a0ab02a..1e21cd56c7 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java @@ -150,10 +150,6 @@ public String getScoreFieldName() { return scoreFieldName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#getFieldsObject() - */ @Override public Document getFieldsObject() { @@ -167,10 +163,6 @@ public Document getFieldsObject() { return fields; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#getSortObject() - */ @Override public Document getSortObject() { @@ -216,10 +208,6 @@ private Document sortByScoreAtPosition(Document source, int sortByScoreIndex) { return target; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Query#isSorted() - */ @Override public boolean isSorted() { return super.isSorted() || sortByScore; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java index cc821fe68f..3c0c1bc6f2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java @@ -37,187 +37,95 @@ private UntypedExampleMatcher(ExampleMatcher delegate) { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#matching() - */ public static UntypedExampleMatcher matching() { return new UntypedExampleMatcher(ExampleMatcher.matching()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#matchingAny() - */ public static UntypedExampleMatcher matchingAny() { return new UntypedExampleMatcher(ExampleMatcher.matchingAny()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#matchingAll() - */ public static UntypedExampleMatcher matchingAll() { return new UntypedExampleMatcher(ExampleMatcher.matchingAll()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnorePaths(java.lang.String...) - */ public UntypedExampleMatcher withIgnorePaths(String... ignoredPaths) { return new UntypedExampleMatcher(delegate.withIgnorePaths(ignoredPaths)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withStringMatcher(java.lang.String) - */ public UntypedExampleMatcher withStringMatcher(StringMatcher defaultStringMatcher) { return new UntypedExampleMatcher(delegate.withStringMatcher(defaultStringMatcher)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase() - */ public UntypedExampleMatcher withIgnoreCase() { return new UntypedExampleMatcher(delegate.withIgnoreCase()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(boolean) - */ public UntypedExampleMatcher withIgnoreCase(boolean defaultIgnoreCase) { return new UntypedExampleMatcher(delegate.withIgnoreCase(defaultIgnoreCase)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withMatcher(java.lang.String, org.springframework.data.domain.ExampleMatcher.MatcherConfigurer) - */ public UntypedExampleMatcher withMatcher(String propertyPath, MatcherConfigurer matcherConfigurer) { return new UntypedExampleMatcher(delegate.withMatcher(propertyPath, matcherConfigurer)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withMatcher(java.lang.String, org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher) - */ public UntypedExampleMatcher withMatcher(String propertyPath, GenericPropertyMatcher genericPropertyMatcher) { return new UntypedExampleMatcher(delegate.withMatcher(propertyPath, genericPropertyMatcher)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withTransformer(java.lang.String, org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer) - */ public UntypedExampleMatcher withTransformer(String propertyPath, PropertyValueTransformer propertyValueTransformer) { return new UntypedExampleMatcher(delegate.withTransformer(propertyPath, propertyValueTransformer)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(java.lang.String...) - */ public UntypedExampleMatcher withIgnoreCase(String... propertyPaths) { return new UntypedExampleMatcher(delegate.withIgnoreCase(propertyPaths)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIncludeNullValues() - */ public UntypedExampleMatcher withIncludeNullValues() { return new UntypedExampleMatcher(delegate.withIncludeNullValues()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withIgnoreNullValues() - */ public UntypedExampleMatcher withIgnoreNullValues() { return new UntypedExampleMatcher(delegate.withIgnoreNullValues()); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#withNullHandler(org.springframework.data.domain.ExampleMatcher.NullHandler) - */ public UntypedExampleMatcher withNullHandler(NullHandler nullHandler) { return new UntypedExampleMatcher(delegate.withNullHandler(nullHandler)); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getNullHandler() - */ public NullHandler getNullHandler() { return delegate.getNullHandler(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getDefaultStringMatcher() - */ public StringMatcher getDefaultStringMatcher() { return delegate.getDefaultStringMatcher(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#isIgnoreCaseEnabled() - */ public boolean isIgnoreCaseEnabled() { return delegate.isIgnoreCaseEnabled(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#isIgnoredPath() - */ public boolean isIgnoredPath(String path) { return delegate.isIgnoredPath(path); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getIgnoredPaths() - */ public Set getIgnoredPaths() { return delegate.getIgnoredPaths(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getPropertySpecifiers() - */ public PropertySpecifiers getPropertySpecifiers() { return delegate.getPropertySpecifiers(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#isAllMatching() - */ public boolean isAllMatching() { return delegate.isAllMatching(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#isAnyMatching() - */ public boolean isAnyMatching() { return delegate.isAnyMatching(); } - /* - * (non-Javadoc) - * @see org.springframework.data.domain.ExampleMatcher#getMatchMode() - */ public MatchMode getMatchMode() { return delegate.getMatchMode(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java index bdea768d31..151c41b1e0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java @@ -158,10 +158,6 @@ public Update inc(String key, Number inc) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc() - */ @Override public void inc(String key) { inc(key, 1L); @@ -444,34 +440,18 @@ public Update filterArray(String identifier, Object expression) { return this; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated() - */ public Boolean isIsolated() { return isolated; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject() - */ public Document getUpdateObject() { return new Document(modifierOps); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters() - */ public List getArrayFilters() { return Collections.unmodifiableList(this.arrayFilters); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#hasArrayFilters() - */ @Override public boolean hasArrayFilters() { return !this.arrayFilters.isEmpty(); @@ -536,19 +516,11 @@ private static boolean isKeyword(String key) { return StringUtils.startsWithIgnoreCase(key, "$"); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(getUpdateObject(), isolated); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -568,10 +540,6 @@ public boolean equals(Object obj) { return Objects.equals(this.getUpdateObject(), that.getUpdateObject()); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -614,19 +582,11 @@ public boolean isEmpty() { return modifiers.isEmpty(); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hashCode(modifiers); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -683,19 +643,11 @@ default String toJsonString() { */ private static abstract class AbstractModifier implements Modifier { - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return ObjectUtils.nullSafeHashCode(getKey()) + ObjectUtils.nullSafeHashCode(getValue()); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object that) { @@ -714,10 +666,6 @@ public boolean equals(Object that) { return Objects.deepEquals(getValue(), ((Modifier) that).getValue()); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return toJsonString(); @@ -751,19 +699,11 @@ private Object[] extractValues(Object[] values) { return Arrays.copyOf(values, values.length); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey() - */ @Override public String getKey() { return "$each"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue() - */ @Override public Object getValue() { return this.values; @@ -809,19 +749,11 @@ private static class Slice extends AbstractModifier { this.count = count; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey() - */ @Override public String getKey() { return "$slice"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue() - */ @Override public Object getValue() { return this.count; @@ -870,19 +802,11 @@ private static class SortModifier extends AbstractModifier { this.sort = sort; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey() - */ @Override public String getKey() { return "$sort"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue() - */ @Override public Object getValue() { return this.sort; @@ -1013,19 +937,11 @@ public Update value(Object value) { return Update.this.push(key, this.modifiers); } - /* - * (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return Objects.hash(getOuterType(), key, modifiers); } - /* - * (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java index f77e4290ec..7146b330ba 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java @@ -53,10 +53,6 @@ class DefaultMongoJsonSchema implements MongoJsonSchema { this.encryptionMetadata = encryptionMetadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.MongoJsonSchema#schema() - */ @Override public Document schemaDocument() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java index 787e94903a..a68d40e51f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java @@ -34,10 +34,6 @@ class DocumentJsonSchema implements MongoJsonSchema { this.document = document; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.MongoJsonSchema#schema() - */ @Override public Document schemaDocument() { return new Document(document); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java index 97b3cc6b46..1c6fb49e35 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java @@ -64,28 +64,16 @@ public class IdentifiableJsonSchemaProperty implemen this.jsonSchemaObjectDelegate = jsonSchemaObject; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier() - */ @Override public String getIdentifier() { return identifier; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { return new Document(identifier, jsonSchemaObjectDelegate.toDocument()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes() - */ @Override public Set getTypes() { return jsonSchemaObjectDelegate.getTypes(); @@ -1016,37 +1004,21 @@ public static class RequiredJsonSchemaProperty implements JsonSchemaProperty { this.required = required; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier() - */ @Override public String getIdentifier() { return delegate.getIdentifier(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes() - */ @Override public Set getTypes() { return delegate.getTypes(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { return delegate.toDocument(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#isRequired() - */ @Override public boolean isRequired() { return required; @@ -1146,10 +1118,6 @@ public EncryptedJsonSchemaProperty keys(Object... keyId) { return new EncryptedJsonSchemaProperty(targetProperty, algorithm, null, Arrays.asList(keyId)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { @@ -1178,19 +1146,11 @@ public Document toDocument() { return doc; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier() - */ @Override public String getIdentifier() { return targetProperty.getIdentifier(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes() - */ @Override public Set getTypes() { return targetProperty.getTypes(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java index 47279f4341..5514b059a1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java @@ -506,19 +506,11 @@ public JsonType(String name) { this.name = name; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#representation() - */ @Override public String representation() { return "type"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#value() - */ @Override public String value() { return name; @@ -554,19 +546,11 @@ class BsonType implements Type { this.name = name; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#representation() - */ @Override public String representation() { return "bsonType"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#value() - */ @Override public String value() { return name; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java index 59a367a9d7..3346ca6a4f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java @@ -89,10 +89,6 @@ public static TypedJsonSchemaObject of(Type... types) { return new TypedJsonSchemaObject(new LinkedHashSet<>(Arrays.asList(types)), null, false, Restrictions.empty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes() - */ @Override public Set getTypes() { return types; @@ -374,64 +370,36 @@ public ObjectJsonSchemaObject property(JsonSchemaProperty property) { return properties(property); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public ObjectJsonSchemaObject possibleValues(Collection possibleValues) { return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public ObjectJsonSchemaObject allOf(Collection allOf) { return newInstance(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public ObjectJsonSchemaObject anyOf(Collection anyOf) { return newInstance(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public ObjectJsonSchemaObject oneOf(Collection oneOf) { return newInstance(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public ObjectJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return newInstance(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#description(java.lang.String) - */ @Override public ObjectJsonSchemaObject description(String description) { return newInstance(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#generatedDescription() - */ @Override public ObjectJsonSchemaObject generatedDescription() { return newInstance(description, true, restrictions); @@ -441,10 +409,6 @@ public List getProperties() { return properties; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { @@ -506,10 +470,6 @@ private Document reduceToDocument(Collection source) { .collect(Document::new, Document::putAll, (target, propertyDocument) -> {}); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { @@ -673,73 +633,41 @@ NumericJsonSchemaObject lte(Number max) { return within(Range.of(lower, createBound(max, true))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public NumericJsonSchemaObject possibleValues(Collection possibleValues) { return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public NumericJsonSchemaObject allOf(Collection allOf) { return newInstance(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public NumericJsonSchemaObject anyOf(Collection anyOf) { return newInstance(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public NumericJsonSchemaObject oneOf(Collection oneOf) { return newInstance(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public NumericJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return newInstance(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public NumericJsonSchemaObject description(String description) { return newInstance(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public NumericJsonSchemaObject generatedDescription() { return newInstance(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { @@ -815,10 +743,6 @@ private static Set validateTypes(Set types) { return types; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { @@ -913,73 +837,41 @@ public StringJsonSchemaObject matching(String pattern) { return newInstance; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public StringJsonSchemaObject possibleValues(Collection possibleValues) { return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public StringJsonSchemaObject allOf(Collection allOf) { return newInstance(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public StringJsonSchemaObject anyOf(Collection anyOf) { return newInstance(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public StringJsonSchemaObject oneOf(Collection oneOf) { return newInstance(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public StringJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return newInstance(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public StringJsonSchemaObject description(String description) { return newInstance(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public StringJsonSchemaObject generatedDescription() { return newInstance(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument() - */ @Override public Document toDocument() { @@ -1009,10 +901,6 @@ private StringJsonSchemaObject newInstance(@Nullable String description, boolean return newInstance; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { @@ -1135,73 +1023,41 @@ public ArrayJsonSchemaObject additionalItems(boolean additionalItemsAllowed) { return newInstance; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public ArrayJsonSchemaObject possibleValues(Collection possibleValues) { return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public ArrayJsonSchemaObject allOf(Collection allOf) { return newInstance(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public ArrayJsonSchemaObject anyOf(Collection anyOf) { return newInstance(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public ArrayJsonSchemaObject oneOf(Collection oneOf) { return newInstance(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public ArrayJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return newInstance(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public ArrayJsonSchemaObject description(String description) { return newInstance(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public ArrayJsonSchemaObject generatedDescription() { return newInstance(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#toDocument() - */ @Override public Document toDocument() { @@ -1242,10 +1098,6 @@ private ArrayJsonSchemaObject newInstance(@Nullable String description, boolean return newInstance; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { @@ -1296,73 +1148,41 @@ private BooleanJsonSchemaObject(@Nullable String description, boolean generateDe super(Type.booleanType(), description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public BooleanJsonSchemaObject possibleValues(Collection possibleValues) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public BooleanJsonSchemaObject allOf(Collection allOf) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public BooleanJsonSchemaObject anyOf(Collection anyOf) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public BooleanJsonSchemaObject oneOf(Collection oneOf) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public BooleanJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public BooleanJsonSchemaObject description(String description) { return new BooleanJsonSchemaObject(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public BooleanJsonSchemaObject generatedDescription() { return new BooleanJsonSchemaObject(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { return "Must be a boolean."; @@ -1389,73 +1209,41 @@ private NullJsonSchemaObject(@Nullable String description, boolean generateDescr super(Type.nullType(), description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public NullJsonSchemaObject possibleValues(Collection possibleValues) { return new NullJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public NullJsonSchemaObject allOf(Collection allOf) { return new NullJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public NullJsonSchemaObject anyOf(Collection anyOf) { return new NullJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public NullJsonSchemaObject oneOf(Collection oneOf) { return new NullJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public NullJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return new NullJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public NullJsonSchemaObject description(String description) { return new NullJsonSchemaObject(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public NullJsonSchemaObject generatedDescription() { return new NullJsonSchemaObject(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { return "Must be null."; @@ -1481,73 +1269,41 @@ private DateJsonSchemaObject(@Nullable String description, boolean generateDescr super(Type.dateType(), description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public DateJsonSchemaObject possibleValues(Collection possibleValues) { return new DateJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public DateJsonSchemaObject allOf(Collection allOf) { return new DateJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public DateJsonSchemaObject anyOf(Collection anyOf) { return new DateJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public DateJsonSchemaObject oneOf(Collection oneOf) { return new DateJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public DateJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return new DateJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public DateJsonSchemaObject description(String description) { return new DateJsonSchemaObject(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public DateJsonSchemaObject generatedDescription() { return new DateJsonSchemaObject(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { return "Must be a date."; @@ -1573,74 +1329,42 @@ private TimestampJsonSchemaObject(@Nullable String description, boolean generate super(Type.timestampType(), description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection) - */ @Override public TimestampJsonSchemaObject possibleValues(Collection possibleValues) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection) - */ @Override public TimestampJsonSchemaObject allOf(Collection allOf) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection) - */ @Override public TimestampJsonSchemaObject anyOf(Collection anyOf) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection) - */ @Override public TimestampJsonSchemaObject oneOf(Collection oneOf) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject) - */ @Override public TimestampJsonSchemaObject notMatch(JsonSchemaObject notMatch) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String) - */ @Override public TimestampJsonSchemaObject description(String description) { return new TimestampJsonSchemaObject(description, generateDescription, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription() - */ @Override public TimestampJsonSchemaObject generatedDescription() { return new TimestampJsonSchemaObject(description, true, restrictions); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription() - */ @Override protected String generateDescription() { return "Must be a timestamp."; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java index 099f4ee6aa..20e605cb51 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java @@ -58,10 +58,6 @@ public static UntypedJsonSchemaObject newInstance() { return new UntypedJsonSchemaObject(null, null, false); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes() - */ @Override public Set getTypes() { return Collections.emptySet(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java index 147281f7fd..2f9febfb1c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java @@ -198,10 +198,6 @@ protected ExpressionNode from(SpelNode node) { return from(node, state); } - /* - * (non-Javadoc) - * @see java.lang.Iterable#iterator() - */ @Override public Iterator iterator() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java index 79b4a31d89..752418fc3d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java @@ -83,10 +83,6 @@ public boolean isUnaryMinus(@Nullable ExpressionNode parent) { return operator.isUnaryMinus(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isLiteral() - */ @Override public boolean isLiteral() { return SUPPORTED_LITERAL_TYPES.contains(literal.getClass()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java index d918aff345..6caf151cbd 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java @@ -89,19 +89,11 @@ public class OperatorNode extends ExpressionNode { this.operator = node; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isMathematicalOperation() - */ @Override public boolean isMathematicalOperation() { return SUPPORTED_MATH_OPERATORS.contains(operator.getClass()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isConjunctionOperator() - */ @Override public boolean isLogicalOperator() { return operator instanceof OpOr || operator instanceof OpAnd; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java index 72d82d7981..14aad12f99 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java @@ -54,19 +54,11 @@ static CriteriaValidator of(CriteriaDefinition criteria) { return new CriteriaValidator(criteria); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.validation.Validator#toDocument() - */ @Override public Document toDocument() { return criteria.getCriteriaObject(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return SerializationUtils.serializeToJsonSafely(toDocument()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java index 8edb4fec59..8a76e2e3d5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java @@ -50,19 +50,11 @@ static DocumentValidator of(Document validatorObject) { return new DocumentValidator(new Document(validatorObject)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.validation.Validator#toDocument() - */ @Override public Document toDocument() { return new Document(validatorObject); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return SerializationUtils.serializeToJsonSafely(validatorObject); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java index a0e152d9fe..85fb342bea 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java @@ -50,19 +50,11 @@ static JsonSchemaValidator of(MongoJsonSchema schema) { return new JsonSchemaValidator(schema); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.validation.Validator#toDocument() - */ @Override public Document toDocument() { return schema.toDocument(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return SerializationUtils.serializeToJsonSafely(toDocument()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java index 6d016fab3f..e8aec2d108 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java @@ -98,10 +98,6 @@ private static String quote(String s, int start, int end) { return Pattern.quote(s.substring(start, end)); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return path; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java index 1e44844a95..c6557bc7a9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java @@ -97,10 +97,6 @@ public static GridFsResource absent(String filename) { return new GridFsResource(filename); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.InputStreamResource#getInputStream() - */ @Override public InputStream getInputStream() throws IOException, IllegalStateException { @@ -108,10 +104,6 @@ public InputStream getInputStream() throws IOException, IllegalStateException { return super.getInputStream(); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.AbstractResource#contentLength() - */ @Override public long contentLength() throws IOException { @@ -119,28 +111,16 @@ public long contentLength() throws IOException { return getGridFSFile().getLength(); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.AbstractResource#getFilename() - */ @Override public String getFilename() throws IllegalStateException { return this.filename; } - /* - * (non-Javadoc) - * @see org.springframework.core.io.AbstractResource#exists() - */ @Override public boolean exists() { return this.file != null; } - /* - * (non-Javadoc) - * @see org.springframework.core.io.AbstractResource#lastModified() - */ @Override public long lastModified() throws IOException { @@ -148,10 +128,6 @@ public long lastModified() throws IOException { return getGridFSFile().getUploadDate().getTime(); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.AbstractResource#getDescription() - */ @Override public String getDescription() { return String.format("GridFs resource [%s]", this.getFilename()); @@ -170,10 +146,6 @@ public Object getId() { return getGridFSFile().getId(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFileId() - */ @Override public Object getFileId() { @@ -207,10 +179,6 @@ public String getContentType() { .orElseThrow(() -> new MongoGridFSException("No contentType data for this GridFS file")); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getContent() - */ @Override public InputStream getContent() { @@ -221,10 +189,6 @@ public InputStream getContent() { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getOptions() - */ @Override public Options getOptions() { return Options.from(getGridFSFile()); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java index c45c9b459a..37fc6e9c58 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java @@ -87,19 +87,11 @@ public GridFsTemplate(MongoDatabaseFactory dbFactory, MongoConverter converter, this.bucket = bucket; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String, java.lang.Object) - */ public ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType, @Nullable Object metadata) { return store(content, filename, contentType, toDocument(metadata)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#save(org.springframework.data.mongodb.gridfs.GridFsObject) - */ public T store(GridFsObject upload) { GridFSUploadOptions uploadOptions = computeUploadOptionsFor(upload.getOptions().getContentType(), @@ -118,10 +110,6 @@ public T store(GridFsObject upload) { return upload.getFileId(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.Document) - */ public GridFSFindIterable find(Query query) { Assert.notNull(query, "Query must not be null!"); @@ -142,18 +130,10 @@ public GridFSFindIterable find(Query query) { return iterable; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#findOne(com.mongodb.Document) - */ public GridFSFile findOne(Query query) { return find(query).first(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#delete(org.springframework.data.mongodb.core.query.Query) - */ public void delete(Query query) { for (GridFSFile gridFSFile : find(query)) { @@ -161,18 +141,10 @@ public void delete(Query query) { } } - /* - * (non-Javadoc) - * @see org.springframework.core.io.ResourceLoader#getClassLoader() - */ public ClassLoader getClassLoader() { return dbFactory.getClass().getClassLoader(); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String) - */ public GridFsResource getResource(String location) { return Optional.ofNullable(findOne(query(whereFilename().is(location)))) // @@ -180,10 +152,6 @@ public GridFsResource getResource(String location) { .orElseGet(() -> GridFsResource.absent(location)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsOperations#getResource(com.mongodb.client.gridfs.model.GridFSFile) - */ public GridFsResource getResource(GridFSFile file) { Assert.notNull(file, "GridFSFile must not be null!"); @@ -191,10 +159,6 @@ public GridFsResource getResource(GridFSFile file) { return new GridFsResource(file, getGridFs().openDownloadStream(file.getId())); } - /* - * (non-Javadoc) - * @see org.springframework.core.io.support.ResourcePatternResolver#getResources(java.lang.String) - */ public GridFsResource[] getResources(String locationPattern) { if (!StringUtils.hasText(locationPattern)) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java index 7216aa5995..d12781c55f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java @@ -67,28 +67,16 @@ public ID getFileId() { return id; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFielname() - */ @Override public String getFilename() { return filename; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getContent() - */ @Override public InputStream getContent() { return dataStream.orElse(StreamUtils.emptyInput()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getOptions() - */ @Override public Options getOptions() { return options; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java index e2481e1649..2fbdf214fa 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java @@ -114,10 +114,6 @@ public static ReactiveGridFsResource absent(String filename) { return new ReactiveGridFsResource(filename, null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFileId() - */ @Override public Object getFileId() { return id instanceof BsonValue ? BsonUtils.toJavaType((BsonValue) id) : id; @@ -175,19 +171,11 @@ public Flux getDownloadStream() { return createDownloadStream(downloadPublisher); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getContent() - */ @Override public Flux getContent() { return getDownloadStream(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getOptions() - */ @Override public Options getOptions() { return options; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java index bf9dc42aac..663bc45d06 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java @@ -111,20 +111,12 @@ public ReactiveGridFsTemplate(DataBufferFactory dataBufferFactory, ReactiveMongo this.bucket = bucket; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#store(org.reactivestreams.Publisher, java.lang.String, java.lang.String, java.lang.Object) - */ @Override public Mono store(Publisher content, @Nullable String filename, @Nullable String contentType, @Nullable Object metadata) { return store(content, filename, contentType, toDocument(metadata)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#save(org.springframework.data.mongodb.gridfs.GridFsObject) - */ public Mono store(GridFsObject> upload) { GridFSUploadOptions uploadOptions = computeUploadOptionsFor(upload.getOptions().getContentType(), @@ -146,10 +138,6 @@ public Mono store(GridFsObject> upload) { return createMono(callback).thenReturn(fileId); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#find(org.springframework.data.mongodb.core.query.Query) - */ @Override public Flux find(Query query) { @@ -159,10 +147,6 @@ public Flux find(Query query) { return createFlux(new FindCallback(query, queryObject, sortObject)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#findOne(org.springframework.data.mongodb.core.query.Query) - */ @Override public Mono findOne(Query query) { @@ -185,10 +169,6 @@ public Mono findOne(Query query) { }); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#findFirst(org.springframework.data.mongodb.core.query.Query) - */ @Override public Mono findFirst(Query query) { @@ -198,19 +178,11 @@ public Mono findFirst(Query query) { return createFlux(new FindLimitCallback(query, queryObject, sortObject, 1)).next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#delete(org.springframework.data.mongodb.core.query.Query) - */ @Override public Mono delete(Query query) { return find(query).flatMap(it -> createMono(new DeleteCallback(it.getId()))).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResource(java.lang.String) - */ @Override public Mono getResource(String location) { @@ -220,10 +192,6 @@ public Mono getResource(String location) { .defaultIfEmpty(ReactiveGridFsResource.absent(location)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResource(com.mongodb.client.gridfs.model.GridFSFile) - */ @Override public Mono getResource(GridFSFile file) { @@ -233,10 +201,6 @@ public Mono getResource(GridFSFile file) { .map(it -> new ReactiveGridFsResource(file, it.downloadToPublisher(file.getId()), dataBufferFactory)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResources(java.lang.String) - */ @Override public Flux getResources(String locationPattern) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java index c752399b9b..361d25d324 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java @@ -63,28 +63,16 @@ public ID getFileId() { return id; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFielname() - */ @Override public String getFilename() { return filename; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getContent() - */ @Override public Publisher getContent() { return dataStream; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.gridfs.GridFsObject#getOptions() - */ @Override public Options getOptions() { return options; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListener.java new file mode 100644 index 0000000000..afc33dacca --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListener.java @@ -0,0 +1,197 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +import com.mongodb.RequestContext; +import com.mongodb.connection.ConnectionDescription; +import com.mongodb.connection.ConnectionId; +import com.mongodb.event.CommandFailedEvent; +import com.mongodb.event.CommandListener; +import com.mongodb.event.CommandStartedEvent; +import com.mongodb.event.CommandSucceededEvent; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.observation.Observation; +import io.micrometer.api.instrument.observation.ObservationRegistry; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.bson.BsonDocument; +import org.bson.BsonValue; + +import org.springframework.lang.Nullable; + +/** + * Altered the Brave MongoDb instrumentation code. The code is available here: + * https://github.com/openzipkin/brave/blob/release-5.13.0/instrumentation/mongodb/src/main/java/brave/mongodb/TraceMongoCommandListener.java + * + * @author OpenZipkin Brave Authors + * @author Marcin Grzejszczak + * @since 4.0.0 + */ +public final class MicrometerMongoCommandListener implements CommandListener { + + // See https://docs.mongodb.com/manual/reference/command for the command reference + static final Set COMMANDS_WITH_COLLECTION_NAME = new LinkedHashSet<>( + Arrays.asList("aggregate", "count", "distinct", "mapReduce", "geoSearch", "delete", "find", "findAndModify", + "insert", "update", "collMod", "compact", "convertToCapped", "create", "createIndexes", "drop", "dropIndexes", + "killCursors", "listIndexes", "reIndex")); + private static final Log log = LogFactory.getLog(MicrometerMongoCommandListener.class); + private final ObservationRegistry registry; + + public MicrometerMongoCommandListener(ObservationRegistry registry) { + this.registry = registry; + } + + private static Observation observationFromContext(RequestContext context) { + Observation observation = context.getOrDefault(Observation.class, null); + if (observation != null) { + if (log.isDebugEnabled()) { + log.debug("Found a observation in mongo context [" + observation + "]"); + } + return observation; + } + if (log.isDebugEnabled()) { + log.debug("No observation was found - will not create any child spans"); + } + return null; + } + + /** + * @return trimmed string from {@code bsonValue} or null if the trimmed string was + * empty or the value wasn't a string + */ + @Nullable static String getNonEmptyBsonString(BsonValue bsonValue) { + if (bsonValue == null || !bsonValue.isString()) { + return null; + } + String stringValue = bsonValue.asString().getValue().trim(); + return stringValue.isEmpty() ? null : stringValue; + } + + static String getMetricName(String commandName, @Nullable String collectionName) { + if (collectionName == null) { + return commandName; + } + return commandName + " " + collectionName; + } + + @Override public void commandStarted(CommandStartedEvent event) { + if (log.isDebugEnabled()) { + log.debug("Instrumenting the command started event"); + } + String databaseName = event.getDatabaseName(); + if ("admin".equals(databaseName)) { + return; // don't instrument commands like "endSessions" + } + RequestContext requestContext = event.getRequestContext(); + if (requestContext == null) { + return; + } + Observation parent = observationFromContext(requestContext); + if (log.isDebugEnabled()) { + log.debug("Found the following observation passed from the mongo context [" + parent + "]"); + } + if (parent == null) { + return; + } + setupObservability(event, requestContext); + } + + private void setupObservability(CommandStartedEvent event, RequestContext requestContext) { + String commandName = event.getCommandName(); + BsonDocument command = event.getCommand(); + String collectionName = getCollectionName(command, commandName); + MongoHandlerContext mongoHandlerContext = new MongoHandlerContext(event, requestContext); + Observation observation = MongoObservation.MONGODB_COMMAND.observation(this.registry, mongoHandlerContext) + .contextualName(getMetricName(commandName, collectionName)); + if (collectionName != null) { + observation.lowCardinalityTag(MongoObservation.LowCardinalityCommandTags.MONGODB_COLLECTION.of(collectionName)); + } + Tag tag = connectionTag(event); + if (tag != null) { + observation.lowCardinalityTag(tag); + } + observation.highCardinalityTag(MongoObservation.HighCardinalityCommandTags.MONGODB_COMMAND.of(commandName)); + requestContext.put(Observation.class, observation.start()); + requestContext.put(MongoHandlerContext.class, mongoHandlerContext); + if (log.isDebugEnabled()) { + log.debug("Created a child observation [" + observation + "] for mongo instrumentation and put it in mongo context"); + } + } + + private Tag connectionTag(CommandStartedEvent event) { + ConnectionDescription connectionDescription = event.getConnectionDescription(); + if (connectionDescription != null) { + ConnectionId connectionId = connectionDescription.getConnectionId(); + if (connectionId != null) { + return MongoObservation.LowCardinalityCommandTags.MONGODB_CLUSTER_ID.of(connectionId.getServerId().getClusterId().getValue()); + } + } + return null; + } + + @Override public void commandSucceeded(CommandSucceededEvent event) { + RequestContext requestContext = event.getRequestContext(); + if (requestContext == null) { + return; + } + Observation observation = requestContext.getOrDefault(Observation.class, null); + if (observation == null) { + return; + } + MongoHandlerContext context = requestContext.get(MongoHandlerContext.class); + context.setCommandSucceededEvent(event); + if (log.isDebugEnabled()) { + log.debug("Command succeeded - will stop observation [" + observation + "]"); + } + observation.stop(); + } + + @Override public void commandFailed(CommandFailedEvent event) { + RequestContext requestContext = event.getRequestContext(); + if (requestContext == null) { + return; + } + Observation observation = requestContext.getOrDefault(Observation.class, null); + if (observation == null) { + return; + } + MongoHandlerContext context = requestContext.get(MongoHandlerContext.class); + context.setCommandFailedEvent(event); + if (log.isDebugEnabled()) { + log.debug("Command failed - will stop observation [" + observation + "]"); + } + observation.error(event.getThrowable()); + observation.stop(); + } + + @Nullable private String getCollectionName(BsonDocument command, String commandName) { + if (COMMANDS_WITH_COLLECTION_NAME.contains(commandName)) { + String collectionName = getNonEmptyBsonString(command.get(commandName)); + if (collectionName != null) { + return collectionName; + } + } + // Some other commands, like getMore, have a field like {"collection": + // collectionName}. + return getNonEmptyBsonString(command.get("collection")); + } + +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java new file mode 100644 index 0000000000..bba2f0e75d --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java @@ -0,0 +1,69 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import com.mongodb.RequestContext; +import com.mongodb.event.CommandFailedEvent; +import com.mongodb.event.CommandStartedEvent; +import com.mongodb.event.CommandSucceededEvent; +import io.micrometer.api.instrument.observation.Observation; + +/** + * A {@link Observation.Context} that contains Mongo events. + * + * @author Marcin Grzejszczak + * @since 4.0.0 + */ +public class MongoHandlerContext extends Observation.Context { + + private final CommandStartedEvent commandStartedEvent; + + private final RequestContext requestContext; + + private CommandSucceededEvent commandSucceededEvent; + + private CommandFailedEvent commandFailedEvent; + + public MongoHandlerContext(CommandStartedEvent commandStartedEvent, RequestContext requestContext) { + this.commandStartedEvent = commandStartedEvent; + this.requestContext = requestContext; + } + + public CommandStartedEvent getCommandStartedEvent() { + return this.commandStartedEvent; + } + + public CommandSucceededEvent getCommandSucceededEvent() { + return this.commandSucceededEvent; + } + + public void setCommandSucceededEvent(CommandSucceededEvent commandSucceededEvent) { + this.commandSucceededEvent = commandSucceededEvent; + } + + public CommandFailedEvent getCommandFailedEvent() { + return this.commandFailedEvent; + } + + public void setCommandFailedEvent(CommandFailedEvent commandFailedEvent) { + this.commandFailedEvent = commandFailedEvent; + } + + public RequestContext getRequestContext() { + return requestContext; + } +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservabilityHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservabilityHandler.java new file mode 100644 index 0000000000..2105d2c4a0 --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservabilityHandler.java @@ -0,0 +1,39 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import io.micrometer.api.instrument.observation.Observation; +import io.micrometer.api.instrument.observation.ObservationHandler; + +/** + * A {@link ObservationHandler} that handles {@link MongoHandlerContext}. + * + * @author Marcin Grzejszczak + * @since 4.0.0 + */ +public class MongoObservabilityHandler implements ObservationHandler { + + @Override public void onStop(MongoHandlerContext context) { + context.getRequestContext().delete(Observation.class); + context.getRequestContext().delete(MongoHandlerContext.class); + } + + @Override public boolean supportsContext(Observation.Context context) { + return context instanceof MongoHandlerContext; + } + +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java new file mode 100644 index 0000000000..eb64252ba0 --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java @@ -0,0 +1,85 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import io.micrometer.api.instrument.docs.DocumentedObservation; +import io.micrometer.api.instrument.docs.TagKey; + +/** + * @author Marcin Grzejszczak + * @since 1.0.0 + */ +enum MongoObservation implements DocumentedObservation { + + /** + * Timer created around a MongoDB command execution. + */ + MONGODB_COMMAND { + @Override public String getName() { + return "mongodb.command"; + } + + @Override public TagKey[] getLowCardinalityTagKeys() { + return LowCardinalityCommandTags.values(); + } + + @Override public TagKey[] getHighCardinalityTagKeys() { + return HighCardinalityCommandTags.values(); + } + + @Override public String getPrefix() { + return "mongodb"; + } + }; + + /** + * Enums related to low cardinality tags for MongoDB commands. + */ + enum LowCardinalityCommandTags implements TagKey { + /** + * MongoDB collection name. + */ + MONGODB_COLLECTION { + @Override public String getKey() { + return "mongodb.collection"; + } + }, + + /** + * MongoDB cluster identifier. + */ + MONGODB_CLUSTER_ID { + @Override public String getKey() { + return "mongodb.cluster_id"; + } + } + } + + /** + * Enums related to high cardinality tags for MongoDB commands. + */ + enum HighCardinalityCommandTags implements TagKey { + /** + * MongoDB command value. + */ + MONGODB_COMMAND { + @Override public String getKey() { + return "mongodb.command"; + } + } + } +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoSpan.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoSpan.java new file mode 100644 index 0000000000..4a0b7f82aa --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoSpan.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import io.micrometer.api.instrument.docs.DocumentedObservation; +import io.micrometer.tracing.docs.DocumentedSpan; + +/** + * Represents all spans created for MongoDB instrumentation. + * + * @author Marcin Grzejszczak + * @since 4.0.0 + */ +enum MongoSpan implements DocumentedSpan { + /** + * Span wrapping a MongoDB command. + */ + MONGODB_COMMAND_SPAN { + @Override public String getName() { + return "%s"; + } + + @Override public DocumentedObservation overridesDefaultSpanFrom() { + return MongoObservation.MONGODB_COMMAND; + } + } +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoTracingRecordingHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoTracingRecordingHandler.java new file mode 100644 index 0000000000..275833c092 --- /dev/null +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoTracingRecordingHandler.java @@ -0,0 +1,107 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import java.net.InetSocketAddress; + +import com.mongodb.MongoSocketException; +import com.mongodb.connection.ConnectionDescription; +import com.mongodb.event.CommandStartedEvent; +import io.micrometer.api.instrument.observation.Observation; +import io.micrometer.tracing.Span; +import io.micrometer.tracing.Tracer; +import io.micrometer.tracing.handler.TracingRecordingHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A {@link TracingRecordingHandler} that handles {@link MongoHandlerContext}. + * It configures a span specific for Mongo communication. + * + * @author Marcin Grzejszczak + * @since 4.0.0 + */ +public class MongoTracingRecordingHandler implements TracingRecordingHandler { + + private static final Log LOGGER = LogFactory.getLog(MongoTracingRecordingHandler.class); + + private final Tracer tracer; + + private boolean setRemoteIpAndPortEnabled; + + public MongoTracingRecordingHandler(Tracer tracer) { + this.tracer = tracer; + } + + @Override public Tracer getTracer() { + return this.tracer; + } + + @Override public void onStart(MongoHandlerContext context) { + CommandStartedEvent event = context.getCommandStartedEvent(); + String databaseName = event.getDatabaseName(); + Span.Builder builder = this.tracer.spanBuilder().kind(Span.Kind.CLIENT) + .remoteServiceName("mongodb-" + databaseName); + if (isSetRemoteIpAndPortEnabled()) { + setRemoteIpAndPort(event, builder); + } + getTracingContext(context).setSpan(builder.start()); + } + + private void setRemoteIpAndPort(CommandStartedEvent event, Span.Builder spanBuilder) { + ConnectionDescription connectionDescription = event.getConnectionDescription(); + if (connectionDescription != null) { + try { + InetSocketAddress socketAddress = connectionDescription.getServerAddress().getSocketAddress(); + spanBuilder.remoteIpAndPort(socketAddress.getAddress().getHostAddress(), socketAddress.getPort()); + } catch (MongoSocketException ignored) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Ignored exception when setting remote ip and port", ignored); + } + } + } + } + + @Override public void onError(MongoHandlerContext context) { + context.getError().ifPresent(throwable -> getTracingContext(context).getSpan().error(throwable)); + } + + @Override public void onStop(MongoHandlerContext context) { + TracingContext tracingContext = getTracingContext(context); + Span span = tracingContext.getSpan(); + span.name(MongoSpan.MONGODB_COMMAND_SPAN.getName(context.getContextualName())); + tagSpan(context, span); + span.end(); + } + + @Override public boolean supportsContext(Observation.Context context) { + return context instanceof MongoHandlerContext; + } + + /** + * Should remote ip and port be set on the span. + * + * @return {@code true} when the remote ip and port should be set + */ + public boolean isSetRemoteIpAndPortEnabled() { + return this.setRemoteIpAndPortEnabled; + } + + public void setSetRemoteIpAndPortEnabled(boolean setRemoteIpAndPortEnabled) { + this.setRemoteIpAndPortEnabled = setRemoteIpAndPortEnabled; + } +} diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java index 24e87121ee..808020bed8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java @@ -35,24 +35,12 @@ @NoRepositoryBean public interface MongoRepository extends PagingAndSortingRepository, QueryByExampleExecutor { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable) - */ @Override List saveAll(Iterable entities); - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll() - */ @Override List findAll(); - /* - * (non-Javadoc) - * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort) - */ @Override List findAll(Sort sort); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java index d4639d9c8b..37f75e0a0e 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java @@ -19,9 +19,9 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory; @@ -58,10 +58,6 @@ public MongoRepositoryBean(Bean operations, Set qua this.operations = operations; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class) - */ @Override protected T create(CreationalContext creationalContext, Class repositoryType) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java index 591a0893a3..e9f277ae50 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java @@ -24,12 +24,12 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.ProcessBean; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.ProcessBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java index 4b44e42306..1c27fc5027 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java @@ -28,19 +28,11 @@ */ class MongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableMongoRepositories.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension() - */ @Override protected RepositoryConfigurationExtension getExtension() { return new MongoRepositoryConfigurationExtension(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java index 6996d49e66..a749dc7288 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java @@ -27,10 +27,6 @@ */ public class MongoRepositoryConfigNamespaceHandler extends MongoNamespaceHandler { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.MongoNamespaceHandler#init() - */ @Override public void init() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java index 02a00a52cd..77fda68ec0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java @@ -42,54 +42,30 @@ public class MongoRepositoryConfigurationExtension extends RepositoryConfigurati private static final String MONGO_TEMPLATE_REF = "mongo-template-ref"; private static final String CREATE_QUERY_INDEXES = "create-query-indexes"; - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName() - */ @Override public String getModuleName() { return "MongoDB"; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix() - */ @Override protected String getModulePrefix() { return "mongo"; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName() - */ public String getRepositoryFactoryBeanClassName() { return MongoRepositoryFactoryBean.class.getName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations() - */ @Override protected Collection> getIdentifyingAnnotations() { return Collections.singleton(Document.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes() - */ @Override protected Collection> getIdentifyingTypes() { return Collections.singleton(MongoRepository.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) { @@ -99,10 +75,6 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods"); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) { @@ -112,10 +84,6 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods")); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) { return !metadata.isReactiveRepository(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java index 063e7c9e1a..7f286aad70 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java @@ -30,19 +30,11 @@ */ class ReactiveMongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport { - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation() - */ @Override protected Class getAnnotation() { return EnableReactiveMongoRepositories.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension() - */ @Override protected RepositoryConfigurationExtension getExtension() { return new ReactiveMongoRepositoryConfigurationExtension(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java index f6de4a02b4..126a85f4ed 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java @@ -42,36 +42,20 @@ public class ReactiveMongoRepositoryConfigurationExtension extends MongoReposito private static final String MONGO_TEMPLATE_REF = "reactive-mongo-template-ref"; private static final String CREATE_QUERY_INDEXES = "create-query-indexes"; - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName() - */ @Override public String getModuleName() { return "Reactive MongoDB"; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName() - */ public String getRepositoryFactoryClassName() { return ReactiveMongoRepositoryFactoryBean.class.getName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes() - */ @Override protected Collection> getIdentifyingTypes() { return Collections.singleton(ReactiveMongoRepository.class); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) { @@ -81,10 +65,6 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods"); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource) - */ @Override public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) { @@ -94,10 +74,6 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods")); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) { return metadata.isReactiveRepository(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java index f768cf5457..9b2d7d0688 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java @@ -83,18 +83,10 @@ public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations, E this.evaluationContextProvider = evaluationContextProvider; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod() - */ public MongoQueryMethod getQueryMethod() { return method; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[]) - */ @Override public Object execute(Object[] parameters) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java index a96dbed67f..75419b3418 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java @@ -91,18 +91,10 @@ public AbstractReactiveMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongo this.findOperationWithProjection = operations.query(type); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod() - */ public MongoQueryMethod getQueryMethod() { return method; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[]) - */ public Publisher execute(Object[] parameters) { return method.hasReactiveWrapperParameter() ? executeDeferred(parameters) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java index a880a1c05e..2b02a92cf9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java @@ -67,88 +67,40 @@ public ConvertingParameterAccessor(MongoWriter writer, MongoParameterAccessor this.delegate = delegate; } - /* - * (non-Javadoc) - * - * @see java.lang.Iterable#iterator() - */ public PotentiallyConvertingIterator iterator() { return new ConvertingIterator(delegate.iterator()); } - /* - * (non-Javadoc) - * - * @see org.springframework.data.repository.query.ParameterAccessor#getPageable() - */ public Pageable getPageable() { return delegate.getPageable(); } - /* - * (non-Javadoc) - * - * @see org.springframework.data.repository.query.ParameterAccessor#getSort() - */ public Sort getSort() { return delegate.getSort(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getDynamicProjection() - */ - @Override - public Optional> getDynamicProjection() { - return delegate.getDynamicProjection(); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection() - */ @Override public Class findDynamicProjection() { return delegate.findDynamicProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int) - */ public Object getBindableValue(int index) { return getConvertedValue(delegate.getBindableValue(index), null); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getDistanceRange() - */ @Override public Range getDistanceRange() { return delegate.getDistanceRange(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation() - */ public Point getGeoNearLocation() { return delegate.getGeoNearLocation(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText() - */ public TextCriteria getFullText() { return delegate.getFullText(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation() - */ @Override public Collation getCollation() { return delegate.getCollation(); @@ -166,10 +118,6 @@ private Object getConvertedValue(Object value, @Nullable TypeInformation type return writer.convertToMongoType(value, typeInformation == null ? null : typeInformation.getActualType()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue() - */ public boolean hasBindableNullValue() { return delegate.hasBindableNullValue(); } @@ -192,26 +140,14 @@ public ConvertingIterator(Iterator delegate) { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see java.util.Iterator#hasNext() - */ public boolean hasNext() { return delegate.hasNext(); } - /* - * (non-Javadoc) - * @see java.util.Iterator#next() - */ public Object next() { return delegate.next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ConvertingParameterAccessor.PotentiallConvertingIterator#nextConverted() - */ public Object nextConverted(MongoPersistentProperty property) { Object next = next(); @@ -237,10 +173,6 @@ public Object nextConverted(MongoPersistentProperty property) { return getConvertedValue(next, property.getTypeInformation()); } - /* - * (non-Javadoc) - * @see java.util.Iterator#remove() - */ public void remove() { delegate.remove(); } @@ -273,10 +205,6 @@ private static Collection asCollection(@Nullable Object source) { return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getValues() - */ @Override public Object[] getValues() { return delegate.getValues(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DefaultSpELExpressionEvaluator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DefaultSpELExpressionEvaluator.java index ff3ab1e72d..c6ac808169 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DefaultSpELExpressionEvaluator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DefaultSpELExpressionEvaluator.java @@ -45,10 +45,6 @@ public static SpELExpressionEvaluator unsupported() { return NoOpExpressionEvaluator.INSTANCE; } - /* - * (non-Javadoc) - * @see org.springframework.data.mapping.model.SpELExpressionEvaluator#evaluate(java.lang.String) - */ @Override @SuppressWarnings("unchecked") public T evaluate(String expression) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java index de64dc721a..f0a1dbaf15 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java @@ -62,10 +62,6 @@ public DtoInstantiatingConverter(Class dtoType, this.instantiator = entityInstantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType)); } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(Object source) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java index 1e2ac33f1b..7421dbbddf 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java @@ -127,10 +127,6 @@ private int findNearIndexInParameters(Method method) { return index; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.Parameters#createParameter(org.springframework.core.MethodParameter) - */ @Override protected MongoParameter createParameter(MethodParameter parameter) { return new MongoParameter(parameter); @@ -195,10 +191,6 @@ public int getCollationParameterIndex() { return collationIndex != null ? collationIndex.intValue() : -1; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.Parameters#createFrom(java.util.List) - */ @Override protected MongoParameters createFrom(List parameters) { return new MongoParameters(parameters, this.maxDistanceIndex, this.nearIndex, this.fullTextIndex, this.rangeIndex, @@ -247,10 +239,6 @@ class MongoParameter extends Parameter { } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.Parameter#isSpecialParameter() - */ @Override public boolean isSpecialParameter() { return super.isSpecialParameter() || Distance.class.isAssignableFrom(getType()) || isNearParameter() diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java index a1b6a8f2e4..e4ce73f7ff 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java @@ -69,10 +69,6 @@ public Range getDistanceRange() { return Range.of(Bound.unbounded(), maxDistance); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation() - */ public Point getGeoNearLocation() { int nearIndex = method.getParameters().getNearIndex(); @@ -99,10 +95,6 @@ public Point getGeoNearLocation() { return (Point) value; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText() - */ @Nullable @Override public TextCriteria getFullText() { @@ -131,10 +123,6 @@ protected TextCriteria potentiallyConvertFullText(Object fullText) { ClassUtils.getShortName(fullText.getClass()))); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation() - */ @Override public Collation getCollation() { @@ -145,10 +133,6 @@ public Collation getCollation() { return getValue(method.getParameters().getCollationParameterIndex()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getValues() - */ @Override public Object[] getValues() { return super.getValues(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java index dfaa7fde6d..6dee33fe77 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java @@ -106,10 +106,6 @@ public MongoQueryCreator(PartTree tree, ConvertingParameterAccessor accessor, this.context = context; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator) - */ @Override protected Criteria create(Part part, Iterator iterator) { @@ -123,10 +119,6 @@ protected Criteria create(Part part, Iterator iterator) { return from(part, property, where(path.toDotPath()), iterator); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator) - */ @Override protected Criteria and(Part part, Criteria base, Iterator iterator) { @@ -140,10 +132,6 @@ protected Criteria and(Part part, Criteria base, Iterator iterator) { return from(part, property, base.and(path.toDotPath()), iterator); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object) - */ @Override protected Criteria or(Criteria base, Criteria criteria) { @@ -151,10 +139,6 @@ protected Criteria or(Criteria base, Criteria criteria) { return result.orOperator(base, criteria); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort) - */ @Override protected Query complete(Criteria criteria, Sort sort) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java index 237b878975..cd19e65624 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java @@ -33,7 +33,7 @@ import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.NearQuery; import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.repository.support.PageableExecutionUtils; +import org.springframework.data.support.PageableExecutionUtils; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -75,10 +75,6 @@ public SlicedExecution(ExecutableFindOperation.FindWithQuery find, Pageable p this.pageable = pageable; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query) - */ @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object execute(Query query) { @@ -116,10 +112,6 @@ public PagedExecution(ExecutableFindOperation.FindWithQuery operation, Pageab this.pageable = pageable; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query) - */ @Override public Object execute(Query query) { @@ -166,10 +158,6 @@ public GeoNearExecution(ExecutableFindOperation.FindWithQuery operation, Mong this.accessor = accessor; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query) - */ @Override public Object execute(Query query) { @@ -230,10 +218,6 @@ final class PagingGeoNearExecution extends GeoNearExecution { this.mongoQuery = query; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution.GeoNearExecution#execute(org.springframework.data.mongodb.core.query.Query) - */ @Override public Object execute(Query query) { @@ -276,10 +260,6 @@ public DeleteExecution(MongoOperations operations, MongoQueryMethod method) { this.method = method; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query) - */ @Override public Object execute(Query query) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java index e97dae204c..e364b2c167 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java @@ -84,10 +84,6 @@ public MongoQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFa this.annotationCache = new ConcurrentReferenceHashMap<>(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getParameters(java.lang.reflect.Method) - */ @Override protected MongoParameters createParameters(Method method) { return new MongoParameters(method, isGeoNearQuery(method)); @@ -134,10 +130,6 @@ String getFieldSpecification() { .orElse(null); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getEntityInformation() - */ @Override @SuppressWarnings("unchecked") public MongoEntityMetadata getEntityInformation() { @@ -168,18 +160,10 @@ public MongoEntityMetadata getEntityInformation() { return this.metadata; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getDomainClass() - */ protected Class getDomainClass() { return super.getDomainClass(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#getParameters() - */ @Override public MongoParameters getParameters() { return (MongoParameters) super.getParameters(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java index 479be5e8f2..35074f5206 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java @@ -78,10 +78,6 @@ public PartTree getTree() { return tree; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, boolean) - */ @Override protected Query createQuery(ConvertingParameterAccessor accessor) { @@ -128,46 +124,26 @@ protected Query createQuery(ConvertingParameterAccessor accessor) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createCountQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor) - */ @Override protected Query createCountQuery(ConvertingParameterAccessor accessor) { return new MongoQueryCreator(tree, accessor, context, false).createQuery(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return tree.isCountProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return tree.isExistsProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery() - */ @Override protected boolean isDeleteQuery() { return tree.isDelete(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting() - */ @Override protected boolean isLimiting() { return tree.isLimiting(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java index 7753daf3eb..6e84192916 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java @@ -70,10 +70,6 @@ public GeoNearExecution(ReactiveMongoOperations operations, MongoParameterAccess this.returnType = returnType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String) - */ @Override public Publisher execute(Query query, Class type, String collection) { @@ -128,10 +124,6 @@ public DeleteExecution(ReactiveMongoOperations operations, MongoQueryMethod meth this.method = method; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String) - */ @Override public Publisher execute(Query query, Class type, String collection) { @@ -195,10 +187,6 @@ public ResultProcessingConverter(ResultProcessor processor, ReactiveMongoOperati this.instantiators = instantiators; } - /* - * (non-Javadoc) - * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object) - */ @Override public Object convert(Object source) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java index 08c563ae2c..81b7bdc31d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java @@ -98,28 +98,16 @@ public ReactiveMongoQueryMethod(Method method, RepositoryMetadata metadata, Proj && ReactiveWrappers.isMultiValueType(metadata.getReturnType(method).getType()) || super.isCollectionQuery())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryMethod#createParameters(java.lang.reflect.Method) - */ @Override protected MongoParameters createParameters(Method method) { return new MongoParameters(method, isGeoNearQuery(method)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isCollectionQuery() - */ @Override public boolean isCollectionQuery() { return isCollectionQuery.get(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoQueryMethod#isGeoNearQuery() - */ @Override public boolean isGeoNearQuery() { return isGeoNearQuery(method); @@ -135,29 +123,16 @@ private boolean isGeoNearQuery(Method method) { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isModifyingQuery() - */ @Override public boolean isModifyingQuery() { return super.isModifyingQuery(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isQueryForEntity() - */ @Override public boolean isQueryForEntity() { return super.isQueryForEntity(); } - /* - * All reactive query methods are streaming queries. - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryMethod#isStreamQuery() - */ @Override public boolean isStreamQuery() { return true; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java index aa1b34dea1..852fd3f95a 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java @@ -77,19 +77,11 @@ public PartTree getTree() { return tree; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, boolean) - */ @Override protected Mono createQuery(ConvertingParameterAccessor accessor) { return Mono.fromSupplier(() -> createQueryInternal(accessor, false)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createCountQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor) - */ @Override protected Mono createCountQuery(ConvertingParameterAccessor accessor) { return Mono.fromSupplier(() -> createQueryInternal(accessor, true)); @@ -138,37 +130,21 @@ private Query createQueryInternal(ConvertingParameterAccessor accessor, boolean } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return tree.isCountProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return tree.isExistsProjection(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery() - */ @Override protected boolean isDeleteQuery() { return tree.isDelete(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting() - */ @Override protected boolean isLimiting() { return tree.isLimiting(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java index 97c2f551ed..f2122261b4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java @@ -112,10 +112,6 @@ public ReactiveStringBasedMongoQuery(String query, ReactiveMongoQueryMethod meth } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor) - */ @Override protected Mono createQuery(ConvertingParameterAccessor accessor) { @@ -149,37 +145,21 @@ private Mono getBindingContext(String json, ConvertingP .map(it -> new ParameterBindingContext(accessor::getBindableValue, it)); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return isCountQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return isExistsQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery() - */ @Override protected boolean isDeleteQuery() { return this.isDeleteQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting() - */ @Override protected boolean isLimiting() { return false; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java index 37ba539923..20c6aec4d1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java @@ -44,18 +44,10 @@ public SimpleMongoEntityMetadata(Class type, MongoPersistentEntity collect this.collectionEntity = collectionEntity; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.EntityMetadata#getJavaType() - */ public Class getJavaType() { return type; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoEntityMetadata#getCollectionName() - */ public String getCollectionName() { return collectionEntity.getCollection(); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java index abeef15ecd..d0385639ea 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java @@ -108,10 +108,6 @@ public StringBasedMongoQuery(String query, MongoQueryMethod method, MongoOperati } } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor) - */ @Override protected Query createQuery(ConvertingParameterAccessor accessor) { @@ -139,37 +135,21 @@ private ParameterBindingContext getBindingContext(String json, ConvertingParamet return new ParameterBindingContext(accessor::getBindableValue, evaluator); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery() - */ @Override protected boolean isCountQuery() { return isCountQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery() - */ @Override protected boolean isExistsQuery() { return isExistsQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery() - */ @Override protected boolean isDeleteQuery() { return this.isDeleteQuery; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting() - */ @Override protected boolean isLimiting() { return false; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CachingExpressionParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CachingExpressionParser.java index a3ae4a6b88..1a8c86cf1f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CachingExpressionParser.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CachingExpressionParser.java @@ -39,19 +39,11 @@ class CachingExpressionParser implements ExpressionParser { this.delegate = delegate; } - /* - * (non-Javadoc) - * @see org.springframework.expression.ExpressionParser#parseExpression(java.lang.String) - */ @Override public Expression parseExpression(String expressionString) throws ParseException { return cache.computeIfAbsent(expressionString, delegate::parseExpression); } - /* - * (non-Javadoc) - * @see org.springframework.expression.ExpressionParser#parseExpression(java.lang.String, org.springframework.expression.ParserContext) - */ @Override public Expression parseExpression(String expressionString, ParserContext context) throws ParseException { throw new UnsupportedOperationException("Parsing using ParserContext is not supported"); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java index 05ef1686be..9b22a9a870 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java @@ -70,10 +70,6 @@ public IndexEnsuringQueryCreationListener(IndexOperationsProvider indexOperation this.indexOperationsProvider = indexOperationsProvider; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.QueryCreationListener#onCreation(org.springframework.data.repository.query.RepositoryQuery) - */ public void onCreation(PartTreeMongoQuery query) { PartTree tree = query.getTree(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java index 04cb3d890a..3cc2c2be90 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java @@ -89,26 +89,14 @@ private MappingMongoEntityInformation(MongoPersistentEntity entity, @Nullable this.fallbackIdType = idType != null ? idType : (Class) ObjectId.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getCollectionName() - */ public String getCollectionName() { return customCollectionName == null ? entityMetadata.getCollection() : customCollectionName; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getIdAttribute() - */ public String getIdAttribute() { return entityMetadata.getRequiredIdProperty().getName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.PersistentEntityInformation#getIdType() - */ @Override public Class getIdType() { @@ -119,19 +107,11 @@ public Class getIdType() { return fallbackIdType; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoEntityInformation#isVersioned() - */ @Override public boolean isVersioned() { return this.entityMetadata.hasVersionProperty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getVersion(Object) - */ @Override public Object getVersion(T entity) { @@ -144,10 +124,6 @@ public Object getVersion(T entity) { return accessor.getProperty(this.entityMetadata.getRequiredVersionProperty()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getCollation() - */ @Nullable public Collation getCollation() { return this.entityMetadata.getCollation(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java index b9ac39efad..1cc276c0e1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java @@ -45,10 +45,6 @@ @SupportedSourceVersion(SourceVersion.RELEASE_6) public class MongoAnnotationProcessor extends AbstractQuerydslProcessor { - /* - * (non-Javadoc) - * @see com.querydsl.apt.AbstractQuerydslProcessor#createConfiguration(javax.annotation.processing.RoundEnvironment) - */ @Override protected Configuration createConfiguration(@Nullable RoundEnvironment roundEnv) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java index 836f04b6ea..aad60d28d5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java @@ -82,19 +82,11 @@ protected ProjectionFactory getProjectionFactory(ClassLoader classLoader, BeanFa return this.operations.getConverter().getProjectionFactory(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return SimpleMongoRepository.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) { return getRepositoryFragments(metadata, operations); @@ -130,10 +122,6 @@ protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata return RepositoryFragments.empty(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { @@ -142,20 +130,12 @@ protected Object getTargetRepository(RepositoryInformation information) { return getTargetRepositoryViaReflection(information, entityInformation, operations); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(@Nullable Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { return Optional.of(new MongoQueryLookupStrategy(operations, evaluationContextProvider, mappingContext)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ public MongoEntityInformation getEntityInformation(Class domainClass) { return getEntityInformation(domainClass, null); } @@ -190,10 +170,6 @@ public MongoQueryLookupStrategy(MongoOperations operations, this.mappingContext = mappingContext; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries) - */ @Override public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java index 8f156bdeea..119b45ee5b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java @@ -65,10 +65,6 @@ public void setCreateIndexesForQueryMethods(boolean createIndexesForQueryMethods this.createIndexesForQueryMethods = createIndexesForQueryMethods; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext) - */ @Override public void setMappingContext(MappingContext mappingContext) { @@ -76,13 +72,6 @@ public void setMappingContext(MappingContext mappingContext) { this.mappingContextConfigured = true; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.data.repository.support.RepositoryFactoryBeanSupport - * #createRepositoryFactory() - */ @Override protected RepositoryFactorySupport createRepositoryFactory() { @@ -106,13 +95,6 @@ protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations return new MongoRepositoryFactory(operations); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.data.repository.support.RepositoryFactoryBeanSupport - * #afterPropertiesSet() - */ @Override public void afterPropertiesSet() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java index 80c485ea3f..689bcdfcff 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java @@ -79,64 +79,36 @@ public abstract class QuerydslAbstractMongodbQuery... o) { return queryMixin.orderBy(o); } - /* - * (non-Javadoc) - * @see com.querydsl.core.SimpleQuery#set(com.querydsl.core.types.ParamExpression, Object) - */ @Override public Q set(ParamExpression param, T value) { return queryMixin.set(param, value); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java index 5255dedaa4..096cd125d8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java @@ -85,10 +85,6 @@ public QuerydslMongoPredicateExecutor(MongoEntityInformation entityInforma this.mongoOperations = mongoOperations; } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findById(com.querydsl.core.types.Predicate) - */ @Override public Optional findOne(Predicate predicate) { @@ -101,10 +97,6 @@ public Optional findOne(Predicate predicate) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate) - */ @Override public List findAll(Predicate predicate) { @@ -113,10 +105,6 @@ public List findAll(Predicate predicate) { return createQueryFor(predicate).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier[]) - */ @Override public List findAll(Predicate predicate, OrderSpecifier... orders) { @@ -126,10 +114,6 @@ public List findAll(Predicate predicate, OrderSpecifier... orders) { return createQueryFor(predicate).orderBy(orders).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort) - */ @Override public List findAll(Predicate predicate, Sort sort) { @@ -139,10 +123,6 @@ public List findAll(Predicate predicate, Sort sort) { return applySorting(createQueryFor(predicate), sort).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[]) - */ @Override public Iterable findAll(OrderSpecifier... orders) { @@ -151,10 +131,6 @@ public Iterable findAll(OrderSpecifier... orders) { return createQuery().orderBy(orders).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Pageable) - */ @Override public Page findAll(Predicate predicate, Pageable pageable) { @@ -166,10 +142,6 @@ public Page findAll(Predicate predicate, Pageable pageable) { return PageableExecutionUtils.getPage(applyPagination(query, pageable).fetch(), pageable, query::fetchCount); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#count(com.querydsl.core.types.Predicate) - */ @Override public long count(Predicate predicate) { @@ -178,10 +150,6 @@ public long count(Predicate predicate) { return createQueryFor(predicate).fetchCount(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#exists(com.querydsl.core.types.Predicate) - */ @Override public boolean exists(Predicate predicate) { @@ -190,10 +158,6 @@ public boolean exists(Predicate predicate) { return createQueryFor(predicate).fetchCount() > 0; } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findBy(com.querydsl.core.types.Predicate, java.util.function.Function) - */ @Override @SuppressWarnings("unchecked") public R findBy(Predicate predicate, @@ -277,37 +241,21 @@ protected FluentQuerydsl create(Predicate predicate, Sort sort, Class return new FluentQuerydsl<>(predicate, sort, resultType, fieldsToInclude); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue() - */ @Override public T oneValue() { return createQuery().fetchOne(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue() - */ @Override public T firstValue() { return createQuery().fetchFirst(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all() - */ @Override public List all() { return createQuery().fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable) - */ @Override public Page page(Pageable pageable) { @@ -316,28 +264,16 @@ public Page page(Pageable pageable) { return createQuery().fetchPage(pageable); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream() - */ @Override public Stream stream() { return createQuery().stream(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count() - */ @Override public long count() { return createQuery().fetchCount(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists() - */ @Override public boolean exists() { return count() > 0; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java index 6476550be7..296e986333 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java @@ -84,19 +84,11 @@ protected ProjectionFactory getProjectionFactory(ClassLoader classLoader, BeanFa return this.operations.getConverter().getProjectionFactory(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { return SimpleReactiveMongoRepository.class; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata) - */ @Override protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) { @@ -117,10 +109,6 @@ protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata return fragments; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation) - */ @Override protected Object getTargetRepository(RepositoryInformation information) { @@ -129,10 +117,6 @@ protected Object getTargetRepository(RepositoryInformation information) { return getTargetRepositoryViaReflection(information, entityInformation, operations); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider) - */ @Override protected Optional getQueryLookupStrategy(@Nullable Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) { @@ -140,10 +124,6 @@ protected Optional getQueryLookupStrategy(@Nullable Key key (ReactiveQueryMethodEvaluationContextProvider) evaluationContextProvider, mappingContext)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) - */ public MongoEntityInformation getEntityInformation(Class domainClass) { return getEntityInformation(domainClass, null); } @@ -180,10 +160,6 @@ private static class MongoQueryLookupStrategy implements QueryLookupStrategy { this.mappingContext = mappingContext; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries) - */ @Override public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java index 6536983a70..8fde2af134 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java @@ -38,7 +38,6 @@ * @author Christoph Strobl * @since 2.0 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository - * @see org.springframework.data.repository.reactive.RxJava2SortingRepository * @see org.springframework.data.repository.reactive.RxJava3SortingRepository */ public class ReactiveMongoRepositoryFactoryBean, S, ID extends Serializable> @@ -75,10 +74,6 @@ public void setCreateIndexesForQueryMethods(boolean createIndexesForQueryMethods this.createIndexesForQueryMethods = createIndexesForQueryMethods; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext) - */ @Override public void setMappingContext(MappingContext mappingContext) { @@ -86,10 +81,6 @@ public void setMappingContext(MappingContext mappingContext) { this.mappingContextConfigured = true; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory() - */ @Override protected RepositoryFactorySupport createRepositoryFactory() { @@ -103,10 +94,6 @@ protected RepositoryFactorySupport createRepositoryFactory() { return factory; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createDefaultQueryMethodEvaluationContextProvider(ListableBeanFactory) - */ @Override protected Optional createDefaultQueryMethodEvaluationContextProvider( ListableBeanFactory beanFactory) { @@ -123,10 +110,6 @@ protected RepositoryFactorySupport getFactoryInstance(ReactiveMongoOperations op return new ReactiveMongoRepositoryFactory(operations); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet() - */ @Override public void afterPropertiesSet() { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java index 1abf4c75d5..63640165a2 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java @@ -83,10 +83,6 @@ public ReactiveQuerydslMongoPredicateExecutor(MongoEntityInformation entit this.mongoOperations = mongoOperations; } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findOne(com.querydsl.core.types.Predicate) - */ @Override public Mono findOne(Predicate predicate) { @@ -95,10 +91,6 @@ public Mono findOne(Predicate predicate) { return createQueryFor(predicate).fetchOne(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate) - */ @Override public Flux findAll(Predicate predicate) { @@ -107,10 +99,6 @@ public Flux findAll(Predicate predicate) { return createQueryFor(predicate).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier[]) - */ @Override public Flux findAll(Predicate predicate, OrderSpecifier... orders) { @@ -120,10 +108,6 @@ public Flux findAll(Predicate predicate, OrderSpecifier... orders) { return createQueryFor(predicate).orderBy(orders).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort) - */ @Override public Flux findAll(Predicate predicate, Sort sort) { @@ -133,10 +117,6 @@ public Flux findAll(Predicate predicate, Sort sort) { return applySorting(createQueryFor(predicate), sort).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[]) - */ @Override public Flux findAll(OrderSpecifier... orders) { @@ -145,10 +125,6 @@ public Flux findAll(OrderSpecifier... orders) { return createQuery().orderBy(orders).fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#count(com.querydsl.core.types.Predicate) - */ @Override public Mono count(Predicate predicate) { @@ -157,10 +133,6 @@ public Mono count(Predicate predicate) { return createQueryFor(predicate).fetchCount(); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#exists(com.querydsl.core.types.Predicate) - */ @Override public Mono exists(Predicate predicate) { @@ -169,10 +141,6 @@ public Mono exists(Predicate predicate) { return createQueryFor(predicate).fetchCount().map(it -> it != 0); } - /* - * (non-Javadoc) - * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findBy(com.querydsl.core.types.Predicate, java.util.function.Function) - */ @Override public > P findBy(Predicate predicate, Function, P> queryFunction) { @@ -240,37 +208,21 @@ protected ReactiveFluentQuerydsl create(Predicate predicate, Sort sort, C return new ReactiveFluentQuerydsl<>(predicate, sort, resultType, fieldsToInclude); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#one() - */ @Override public Mono one() { return createQuery().fetchOne(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#first() - */ @Override public Mono first() { return createQuery().fetchFirst(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#all() - */ @Override public Flux all() { return createQuery().fetch(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#page(org.springframework.data.domain.Pageable) - */ @Override public Mono> page(Pageable pageable) { @@ -279,19 +231,11 @@ public Mono> page(Pageable pageable) { return createQuery().fetchPage(pageable); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#count() - */ @Override public Mono count() { return createQuery().fetchCount(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#exists() - */ @Override public Mono exists() { return count().map(it -> it > 0).defaultIfEmpty(false); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java index 6b8b2fac9a..5f4488dbc5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java @@ -82,10 +82,6 @@ public SimpleMongoRepository(MongoEntityInformation metadata, MongoOperat // Methods from CrudRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object) - */ @Override public S save(S entity) { @@ -98,10 +94,6 @@ public S save(S entity) { return mongoOperations.save(entity, entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#saveAll(java.lang.Iterable) - */ @Override public List saveAll(Iterable entities) { @@ -119,10 +111,6 @@ public List saveAll(Iterable entities) { return source.stream().map(this::save).collect(Collectors.toList()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable) - */ @Override public Optional findById(ID id) { @@ -132,10 +120,6 @@ public Optional findById(ID id) { mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#existsById(java.lang.Object) - */ @Override public boolean existsById(ID id) { @@ -145,19 +129,11 @@ public boolean existsById(ID id) { entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll() - */ @Override public List findAll() { return findAll(new Query()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable) - */ @Override public Iterable findAllById(Iterable ids) { @@ -166,19 +142,11 @@ public Iterable findAllById(Iterable ids) { return findAll(getIdQuery(ids)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#count() - */ @Override public long count() { return mongoOperations.count(new Query(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object) - */ @Override public void deleteById(ID id) { @@ -187,10 +155,6 @@ public void deleteById(ID id) { mongoOperations.remove(getIdQuery(id), entityInformation.getJavaType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object) - */ @Override public void delete(T entity) { @@ -206,10 +170,6 @@ public void delete(T entity) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#deleteAllById(java.lang.Iterable) - */ @Override public void deleteAllById(Iterable ids) { @@ -218,10 +178,6 @@ public void deleteAllById(Iterable ids) { mongoOperations.remove(getIdQuery(ids), entityInformation.getJavaType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable) - */ @Override public void deleteAll(Iterable entities) { @@ -230,10 +186,6 @@ public void deleteAll(Iterable entities) { entities.forEach(this::delete); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#deleteAll() - */ @Override public void deleteAll() { mongoOperations.remove(new Query(), entityInformation.getCollectionName()); @@ -243,10 +195,6 @@ public void deleteAll() { // Methods from PagingAndSortingRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable) - */ @Override public Page findAll(Pageable pageable) { @@ -258,10 +206,6 @@ public Page findAll(Pageable pageable) { return new PageImpl<>(list, pageable, count); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort) - */ @Override public List findAll(Sort sort) { @@ -274,10 +218,6 @@ public List findAll(Sort sort) { // Methods from MongoRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#insert(java.lang.Object) - */ @Override public S insert(S entity) { @@ -286,10 +226,6 @@ public S insert(S entity) { return mongoOperations.insert(entity, entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#insert(java.lang.Iterable) - */ @Override public List insert(Iterable entities) { @@ -308,10 +244,6 @@ public List insert(Iterable entities) { // Methods from QueryByExampleExecutor // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryByExampleExecutor#findOne(org.springframework.data.domain.Example) - */ @Override public Optional findOne(Example example) { @@ -324,19 +256,11 @@ public Optional findOne(Example example) { .ofNullable(mongoOperations.findOne(query, example.getProbeType(), entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example) - */ @Override public List findAll(Example example) { return findAll(example, Sort.unsorted()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Sort) - */ @Override public List findAll(Example example, Sort sort) { @@ -350,10 +274,6 @@ public List findAll(Example example, Sort sort) { return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Pageable) - */ @Override public Page findAll(Example example, Pageable pageable) { @@ -369,10 +289,6 @@ public Page findAll(Example example, Pageable pageable) { .count(Query.of(query).limit(-1).skip(-1), example.getProbeType(), entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryByExampleExecutor#count(org.springframework.data.domain.Example) - */ @Override public long count(Example example) { @@ -384,10 +300,6 @@ public long count(Example example) { return mongoOperations.count(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryByExampleExecutor#exists(org.springframework.data.domain.Example) - */ @Override public boolean exists(Example example) { @@ -399,10 +311,6 @@ public boolean exists(Example example) { return mongoOperations.exists(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.QueryByExampleExecutor#findBy(org.springframework.data.domain.Example, java.util.function.Function) - */ @Override public R findBy(Example example, Function, R> queryFunction) { @@ -466,37 +374,21 @@ protected FluentQueryByExample create(Example predicate, Sort sort, return new FluentQueryByExample<>(predicate, sort, resultType, fieldsToInclude); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue() - */ @Override public T oneValue() { return createQuery().oneValue(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#first() - */ @Override public T firstValue() { return createQuery().firstValue(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all() - */ @Override public List all() { return createQuery().all(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable) - */ @Override public Page page(Pageable pageable) { @@ -507,28 +399,16 @@ public Page page(Pageable pageable) { return PageableExecutionUtils.getPage(list, pageable, this::count); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream() - */ @Override public Stream stream() { return createQuery().stream(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count() - */ @Override public long count() { return createQuery().count(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists() - */ @Override public boolean exists() { return createQuery().exists(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java index f238f87774..a773f5f70c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java @@ -78,10 +78,6 @@ public SimpleReactiveMongoRepository(MongoEntityInformation entityInforma // Methods from ReactiveCrudRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Object) - */ @Override public Mono save(S entity) { @@ -94,10 +90,6 @@ public Mono save(S entity) { return mongoOperations.save(entity, entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(java.lang.Iterable) - */ @Override public Flux saveAll(Iterable entities) { @@ -110,10 +102,6 @@ public Flux saveAll(Iterable entities) { Flux.fromIterable(entities).flatMap(this::save); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(org.reactivestreams.Publisher) - */ @Override public Flux saveAll(Publisher entityStream) { @@ -124,10 +112,6 @@ public Flux saveAll(Publisher entityStream) { mongoOperations.save(entity, entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object) - */ @Override public Mono findById(ID id) { @@ -136,10 +120,6 @@ public Mono findById(ID id) { return mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(org.reactivestreams.Publisher) - */ @Override public Mono findById(Publisher publisher) { @@ -149,10 +129,6 @@ public Mono findById(Publisher publisher) { id -> mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object) - */ @Override public Mono existsById(ID id) { @@ -162,10 +138,6 @@ public Mono existsById(ID id) { entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(org.reactivestreams.Publisher) - */ @Override public Mono existsById(Publisher publisher) { @@ -175,19 +147,11 @@ public Mono existsById(Publisher publisher) { entityInformation.getCollectionName())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll() - */ @Override public Flux findAll() { return findAll(new Query()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable) - */ @Override public Flux findAllById(Iterable ids) { @@ -196,10 +160,6 @@ public Flux findAllById(Iterable ids) { return findAll(getIdQuery(ids)); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher) - */ @Override public Flux findAllById(Publisher ids) { @@ -208,19 +168,11 @@ public Flux findAllById(Publisher ids) { return Flux.from(ids).buffer().flatMap(this::findAllById); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count() - */ @Override public Mono count() { return mongoOperations.count(new Query(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object) - */ @Override public Mono deleteById(ID id) { @@ -230,10 +182,6 @@ public Mono deleteById(ID id) { .remove(getIdQuery(id), entityInformation.getJavaType(), entityInformation.getCollectionName()).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(org.reactivestreams.Publisher) - */ @Override public Mono deleteById(Publisher publisher) { @@ -243,10 +191,6 @@ public Mono deleteById(Publisher publisher) { entityInformation.getCollectionName())).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object) - */ @Override public Mono delete(T entity) { @@ -272,10 +216,6 @@ public Mono delete(T entity) { return remove.then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAllById(java.lang.Iterable) - */ @Override public Mono deleteAllById(Iterable ids) { @@ -285,10 +225,6 @@ public Mono deleteAllById(Iterable ids) { .remove(getIdQuery(ids), entityInformation.getJavaType(), entityInformation.getCollectionName()).then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable) - */ @Override public Mono deleteAll(Iterable entities) { @@ -304,10 +240,6 @@ public Mono deleteAll(Iterable entities) { .then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher) - */ @Override public Mono deleteAll(Publisher entityStream) { @@ -319,10 +251,6 @@ public Mono deleteAll(Publisher entityStream) { .then(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll() - */ @Override public Mono deleteAll() { return mongoOperations.remove(new Query(), entityInformation.getCollectionName()).then(Mono.empty()); @@ -332,10 +260,6 @@ public Mono deleteAll() { // Methods from ReactiveSortingRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll(org.springframework.data.domain.Sort) - */ @Override public Flux findAll(Sort sort) { @@ -348,10 +272,6 @@ public Flux findAll(Sort sort) { // Methods from ReactiveMongoRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(java.lang.Object) - */ @Override public Mono insert(S entity) { @@ -360,10 +280,6 @@ public Mono insert(S entity) { return mongoOperations.insert(entity, entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(java.lang.Iterable) - */ @Override public Flux insert(Iterable entities) { @@ -374,10 +290,6 @@ public Flux insert(Iterable entities) { return source.isEmpty() ? Flux.empty() : mongoOperations.insertAll(source); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(org.reactivestreams.Publisher) - */ @Override public Flux insert(Publisher entities) { @@ -390,10 +302,6 @@ public Flux insert(Publisher entities) { // Methods from ReactiveMongoRepository // ------------------------------------------------------------------------- - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#findOne(org.springframework.data.domain.Example) - */ @Override public Mono findOne(Example example) { @@ -413,10 +321,6 @@ public Mono findOne(Example example) { }).next(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#findAll(org.springframework.data.domain.Example) - */ @Override public Flux findAll(Example example) { @@ -425,10 +329,6 @@ public Flux findAll(Example example) { return findAll(example, Sort.unsorted()); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort) - */ @Override public Flux findAll(Example example, Sort sort) { @@ -442,10 +342,6 @@ public Flux findAll(Example example, Sort sort) { return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#count(org.springframework.data.domain.Example) - */ @Override public Mono count(Example example) { @@ -457,10 +353,6 @@ public Mono count(Example example) { return mongoOperations.count(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#exists(org.springframework.data.domain.Example) - */ @Override public Mono exists(Example example) { @@ -472,10 +364,6 @@ public Mono exists(Example example) { return mongoOperations.exists(query, example.getProbeType(), entityInformation.getCollectionName()); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#findBy(org.springframework.data.domain.Example, java.util.function.Function) - */ @Override public > P findBy(Example example, Function, P> queryFunction) { @@ -529,37 +417,21 @@ protected ReactiveFluentQueryByExample create(Example predicate, So return new ReactiveFluentQueryByExample<>(predicate, sort, resultType, fieldsToInclude); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#one() - */ @Override public Mono one() { return createQuery().one(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#first() - */ @Override public Mono first() { return createQuery().first(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#all() - */ @Override public Flux all() { return createQuery().all(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#page(org.springframework.data.domain.Pageable) - */ @Override public Mono> page(Pageable pageable) { @@ -570,19 +442,11 @@ public Mono> page(Pageable pageable) { return items.flatMap(content -> ReactivePageableExecutionUtils.getPage(content, pageable, this.count())); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#count() - */ @Override public Mono count() { return createQuery().count(); } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#exists() - */ @Override public Mono exists() { return createQuery().exists(); diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java index 5a914afec1..97b78713c8 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java @@ -99,10 +99,6 @@ public SpringDataMongodbQuery(MongoOperations operations, Class typ this.find = mongoOperations.query(domainType).inCollection(collectionName).as(resultType1); } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#iterable() - */ @Override public CloseableIterator iterate() { @@ -137,10 +133,6 @@ public void close() { } } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#iterable() - */ @Override public Stream stream() { @@ -151,10 +143,6 @@ public Stream stream() { } } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#fetch() - */ @Override public List fetch() { try { @@ -182,10 +170,6 @@ public Page fetchPage(Pageable pageable) { } } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#fetchFirst() - */ @Override public T fetchFirst() { try { @@ -195,10 +179,6 @@ public T fetchFirst() { } } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#fetchOne() - */ @Override public T fetchOne() { try { @@ -208,10 +188,6 @@ public T fetchOne() { } } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#fetchResults() - */ @Override public QueryResults fetchResults() { @@ -220,10 +196,6 @@ public QueryResults fetchResults() { : QueryResults.emptyResults(); } - /* - * (non-Javadoc) - * @see com.querydsl.core.Fetchable#fetchCount() - */ @Override public long fetchCount() { try { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java index 2453e1a46c..ed8d13490f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java @@ -81,10 +81,6 @@ public SpringDataMongodbSerializer(MongoConverter converter) { this.mapper = new QueryMapper(converter); } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#visit(com.querydsl.core.types.Constant, java.lang.Void) - */ @Override public Object visit(Constant expr, Void context) { @@ -95,10 +91,6 @@ public Object visit(Constant expr, Void context) { return converter.convertToMongoType(expr.getConstant()); } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#getKeyForPath(com.querydsl.core.types.Path, com.querydsl.core.types.PathMetadata) - */ @Override protected String getKeyForPath(Path expr, PathMetadata metadata) { @@ -113,10 +105,6 @@ protected String getKeyForPath(Path expr, PathMetadata metadata) { return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.support.MongodbSerializer#asDocument(java.lang.String, java.lang.Object) - */ @Override protected Document asDocument(@Nullable String key, @Nullable Object value) { @@ -125,10 +113,6 @@ protected Document asDocument(@Nullable String key, @Nullable Object value) { return super.asDocument(key, value instanceof Pattern ? value : converter.convertToMongoType(value)); } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#isReference(com.querydsl.core.types.Path) - */ @Override protected boolean isReference(@Nullable Path path) { @@ -136,10 +120,6 @@ protected boolean isReference(@Nullable Path path) { return property == null ? false : property.isAssociation(); } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#asReference(java.lang.Object) - */ @Override protected DBRef asReference(@Nullable Object constant) { return asReference(constant, null); @@ -149,10 +129,6 @@ protected DBRef asReference(Object constant, Path path) { return converter.toDBRef(constant, getPropertyForPotentialDbRef(path)); } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#asDBKey(com.querydsl.core.types.Operation, int) - */ @Override protected String asDBKey(@Nullable Operation expr, int index) { @@ -174,10 +150,6 @@ protected String asDBKey(@Nullable Operation expr, int index) { return property.isIdProperty() ? key.replaceAll("." + ID_KEY + "$", "") : key; } - /* - * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#convert(com.querydsl.core.types.Path, com.querydsl.core.types.Constant) - */ protected Object convert(@Nullable Path path, @Nullable Constant constant) { if (!isReference(path)) { diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java index 48e2d9fdaf..ee8aa869a1 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java @@ -98,9 +98,9 @@ static class JaxbDateTimeFormatter implements FormatterImpl { static { try { - DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter") + DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("jakarta.xml.bind.DatatypeConverter") .getDeclaredMethod("parseDateTime", String.class); - DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter") + DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("jakarta.xml.bind.DatatypeConverter") .getDeclaredMethod("printDateTime", Calendar.class); } catch (NoSuchMethodException e) { throw new ExceptionInInitializerError(e); diff --git a/spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/spring-data-mongodb/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to spring-data-mongodb/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas index c7f3f0ab7b..57920f7449 100644 --- a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas +++ b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas @@ -12,7 +12,8 @@ http\://www.springframework.org/schema/data/mongo/spring-mongo-2.0.xsd=org/sprin http\://www.springframework.org/schema/data/mongo/spring-mongo-2.2.xsd=org/springframework/data/mongodb/config/spring-mongo-2.0.xsd http\://www.springframework.org/schema/data/mongo/spring-mongo-3.0.xsd=org/springframework/data/mongodb/config/spring-mongo-3.0.xsd http\://www.springframework.org/schema/data/mongo/spring-mongo-3.3.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd -http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd +http\://www.springframework.org/schema/data/mongo/spring-mongo-4.0.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd +http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd https\://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd=org/springframework/data/mongodb/config/spring-mongo-1.0.xsd https\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd https\://www.springframework.org/schema/data/mongo/spring-mongo-1.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.2.xsd @@ -27,4 +28,5 @@ https\://www.springframework.org/schema/data/mongo/spring-mongo-2.0.xsd=org/spri https\://www.springframework.org/schema/data/mongo/spring-mongo-2.2.xsd=org/springframework/data/mongodb/config/spring-mongo-2.2.xsd https\://www.springframework.org/schema/data/mongo/spring-mongo-3.0.xsd=org/springframework/data/mongodb/config/spring-mongo-3.0.xsd https\://www.springframework.org/schema/data/mongo/spring-mongo-3.3.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd -https\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd +https\://www.springframework.org/schema/data/mongo/spring-mongo-4.0.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd +https\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd new file mode 100644 index 0000000000..db6b6b946b --- /dev/null +++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd @@ -0,0 +1,907 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object + + + + + + + + + + + + + + The reference to a MongoTemplate. Will default to 'mongoTemplate'. + + + + + + + Enables creation of indexes for queries that get derived from the method name + and thus reference domain class properties. Defaults to false. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The reference to a MongoDatabaseFactory. + + + + + + + + + + + + The reference to a MongoTypeMapper to be used by this MappingMongoConverter. + + + + + + + The reference to a MappingContext. Will default to 'mappingContext'. + + + + + + + Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false. + + + + + + + + + + Enables abbreviating the field names for domain class properties to the + first character of their camel case names, e.g. fooBar -> fb. Defaults to false. + + + + + + + + + + The reference to a FieldNamingStrategy. + + + + + + + Enable/Disable index creation for annotated properties/entities. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A reference to a custom converter. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The reference to a MongoDatabaseFactory. + + + + + + + + + + + + The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The reference to a MongoDatabaseFactory. + + + + + + + + + + + + + + + + diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java index 01816ff4f9..f47476fa90 100644 --- a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java +++ b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java @@ -32,19 +32,11 @@ @Configuration public class ConfigClassInDefaultPackage extends AbstractMongoClientConfiguration { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.AbstractMongoClientConfiguration#getDatabaseName() - */ @Override protected String getDatabaseName() { return "default"; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.config.AbstractMongoClientConfiguration#mongoClient() - */ @Override public MongoClient mongoClient() { return MongoClients.create(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java index 9294c83555..f58df47d3c 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java @@ -20,6 +20,7 @@ import de.schauderhaft.degraph.configuration.NamedPattern; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** @@ -28,6 +29,7 @@ * @author Jens Schauder * @author Oliver Gierke */ +@Disabled("Needs to be tansitioned to ArchUnit") class DependencyTests { @Test diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java index 5b0cd81cc2..a1c2854994 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java @@ -19,8 +19,8 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java index 92b295a707..3cba744212 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java @@ -17,7 +17,8 @@ import static org.assertj.core.api.Assertions.*; -import org.joda.time.DateTime; +import java.util.Date; + import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; @@ -66,11 +67,11 @@ public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception { class Entity { @Id Long id; - @CreatedDate DateTime created; - DateTime modified; + @CreatedDate Date created; + Date modified; @LastModifiedDate - public DateTime getModified() { + public Date getModified() { return modified; } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java index 30ff5b6ff0..f6e66dca47 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java @@ -480,19 +480,11 @@ static class EncryptionMetadataFromMethod { public static class EncryptionExtension implements EvaluationContextExtension { - /* - * (non-Javadoc) - * @see org.springframework.data.spel.spi.EvaluationContextExtension#getExtensionId() - */ @Override public String getExtensionId() { return "mongocrypt"; } - /* - * (non-Javadoc) - * @see org.springframework.data.spel.spi.EvaluationContextExtension#getProperties() - */ @Override public Map getProperties() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java index 33ae0ef994..a50c6e6258 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java @@ -33,6 +33,8 @@ import java.math.BigInteger; import java.time.Duration; import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -40,7 +42,6 @@ import java.util.stream.IntStream; import org.bson.types.ObjectId; -import org.joda.time.DateTime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -62,6 +63,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; import org.springframework.data.mapping.MappingException; +import org.springframework.data.mapping.context.PersistentEntities; import org.springframework.data.mongodb.InvalidMongoDbApiUsageException; import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.convert.LazyLoadingProxy; @@ -148,7 +150,9 @@ public class MongoTemplateTests { }); cfg.configureAuditing(it -> { - it.auditingHandler(IsNewAwareAuditingHandler::new); + it.auditingHandler(ctx -> { + return new IsNewAwareAuditingHandler(PersistentEntities.of(ctx)); + }); }); }); @@ -1341,11 +1345,11 @@ public void countRejectsNullCollectionName() { @Test public void returnsEntityWhenQueryingForDateTime() { - DateTime dateTime = new DateTime(2011, 3, 3, 12, 0, 0, 0); + LocalDateTime dateTime = LocalDateTime.of(2011, 3, 3, 12, 0, 0, 0); TestClass testClass = new TestClass(dateTime); mappingTemplate.save(testClass); - List testClassList = mappingTemplate.find(new Query(Criteria.where("myDate").is(dateTime.toDate())), + List testClassList = mappingTemplate.find(new Query(Criteria.where("myDate").is(dateTime)), TestClass.class); assertThat(testClassList.size()).isEqualTo(1); assertThat(testClassList.get(0).myDate).isEqualTo(testClass.myDate); @@ -4007,10 +4011,10 @@ public Sample(String id, String field) { static class TestClass { - DateTime myDate; + LocalDateTime myDate; @PersistenceConstructor - TestClass(DateTime myDate) { + TestClass(LocalDateTime myDate) { this.myDate = myDate; } } @@ -4021,21 +4025,24 @@ static class PersonWithConvertedId { String name; } - static enum DateTimeToDateConverter implements Converter { + static enum DateTimeToDateConverter implements Converter { INSTANCE; - public Date convert(DateTime source) { - return source == null ? null : source.toDate(); + public Date convert(LocalDateTime source) { + return source == null ? null : java.util.Date + .from(source.atZone(ZoneId.systemDefault()) + .toInstant()); } } - static enum DateToDateTimeConverter implements Converter { + static enum DateToDateTimeConverter implements Converter { INSTANCE; - public DateTime convert(Date source) { - return source == null ? null : new DateTime(source.getTime()); + public LocalDateTime convert(Date source) { + return source == null ? null : LocalDateTime.ofInstant( + source.toInstant(), ZoneId.systemDefault()); } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java index 34a43c9103..6c65f4eef7 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java @@ -2433,10 +2433,6 @@ private MongoTemplate mockOutGetDb() { return template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations() - */ @Override protected MongoOperations getOperationsForExceptionHandling() { MongoTemplate template = spy(this.template); @@ -2444,10 +2440,6 @@ protected MongoOperations getOperationsForExceptionHandling() { return template; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations() - */ @Override protected MongoOperations getOperations() { return this.template; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java index 24e85887d1..62e0890cf3 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java @@ -89,11 +89,6 @@ public boolean isActive() { return active; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { if (obj == this) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java index 0ab13b3939..8afe835e1b 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java @@ -16,8 +16,8 @@ package org.springframework.data.mongodb.core; import java.util.Arrays; +import java.util.Date; -import org.joda.time.LocalDate; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.mongodb.core.mapping.Document; @@ -28,7 +28,7 @@ public class Venue { @Id private String id; private String name; private double[] location; - private LocalDate openingDate; + private Date openingDate; @PersistenceConstructor Venue(String name, double[] location) { @@ -51,11 +51,11 @@ public double[] getLocation() { return location; } - public LocalDate getOpeningDate() { + public Date getOpeningDate() { return openingDate; } - public void setOpeningDate(LocalDate openingDate) { + public void setOpeningDate(Date openingDate) { this.openingDate = openingDate; } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java index 991523108a..d65cdf63f1 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java @@ -26,6 +26,14 @@ import java.io.BufferedInputStream; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.temporal.ChronoField; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,9 +45,6 @@ import org.apache.commons.logging.LogFactory; import org.assertj.core.data.Offset; import org.bson.Document; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDateTime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -58,6 +63,7 @@ import org.springframework.data.mongodb.core.Venue; import org.springframework.data.mongodb.core.aggregation.AggregationTests.CarDescriptor.Entry; import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.Granularities; +import org.springframework.data.mongodb.core.aggregation.DateOperators.TemporalUnits; import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable; import org.springframework.data.mongodb.core.geo.GeoJsonPoint; import org.springframework.data.mongodb.core.index.GeoSpatialIndexType; @@ -1146,11 +1152,11 @@ void shouldAllowGroupByIdFields() { mongoTemplate.dropCollection(User.class); - LocalDateTime now = new LocalDateTime(); + Instant now = Instant.now(); - User user1 = new User("u1", new PushMessage("1", "aaa", now.toDate())); - User user2 = new User("u2", new PushMessage("2", "bbb", now.minusDays(2).toDate())); - User user3 = new User("u3", new PushMessage("3", "ccc", now.minusDays(1).toDate())); + User user1 = new User("u1", new PushMessage("1", "aaa", now)); + User user2 = new User("u2", new PushMessage("2", "bbb", now.minus(2, ChronoUnit.DAYS))); + User user3 = new User("u3", new PushMessage("3", "ccc", now.minus(1, ChronoUnit.DAYS))); mongoTemplate.save(user1); mongoTemplate.save(user2); @@ -1159,7 +1165,7 @@ void shouldAllowGroupByIdFields() { Aggregation agg = newAggregation( // project("id", "msgs"), // unwind("msgs"), // - match(where("msgs.createDate").gt(now.minusDays(1).toDate())), // + match(where("msgs.createDate").gt(Date.from(now.minus(1, ChronoUnit.DAYS)))), // group("id").push("msgs").as("msgs") // ); @@ -1375,14 +1381,9 @@ void shouldRetrieveDateTimeFragementsCorrectly() throws Exception { mongoTemplate.dropCollection(ObjectWithDate.class); - DateTime dateTime = new DateTime() // - .withZone(DateTimeZone.UTC) // - .withYear(2014) // - .withMonthOfYear(2) // - .withDayOfMonth(7) // - .withTime(3, 4, 5, 6).toDateTimeISO(); + ZonedDateTime dateTime = ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2014, 2, 7), LocalTime.of(3, 4, 5, 6)), ZoneId.of("UTC")); - ObjectWithDate owd = new ObjectWithDate(dateTime.toDate()); + ObjectWithDate owd = new ObjectWithDate(Date.from(dateTime.toInstant())); mongoTemplate.insert(owd); ProjectionOperation dateProjection = Aggregation.project() // @@ -1406,12 +1407,12 @@ void shouldRetrieveDateTimeFragementsCorrectly() throws Exception { assertThat(result.getMappedResults()).hasSize(1); Document document = result.getMappedResults().get(0); - assertThat(document.get("hour")).isEqualTo((Object) dateTime.getHourOfDay()); - assertThat(document.get("min")).isEqualTo((Object) dateTime.getMinuteOfHour()); - assertThat(document.get("second")).isEqualTo((Object) dateTime.getSecondOfMinute()); - assertThat(document.get("millis")).isEqualTo((Object) dateTime.getMillisOfSecond()); + assertThat(document.get("hour")).isEqualTo((Object) dateTime.getHour()); + assertThat(document.get("min")).isEqualTo((Object) dateTime.getMinute()); + assertThat(document.get("second")).isEqualTo((Object) dateTime.getSecond()); + assertThat(document.get("millis")).isEqualTo((Object) dateTime.get(ChronoField.MILLI_OF_SECOND)); assertThat(document.get("year")).isEqualTo((Object) dateTime.getYear()); - assertThat(document.get("month")).isEqualTo((Object) dateTime.getMonthOfYear()); + assertThat(document.get("month")).isEqualTo((Object) dateTime.getMonthValue()); // dateTime.getWeekOfWeekyear()) returns 6 since for MongoDB the week starts on sunday and not on monday. assertThat(document.get("week")).isEqualTo((Object) 5); assertThat(document.get("dayOfYear")).isEqualTo((Object) dateTime.getDayOfYear()); @@ -2083,6 +2084,10 @@ static class PushMessage { public PushMessage() {} + PushMessage(String id, String content, Instant createDate) { + this(id, content, Date.from(createDate)); + } + PushMessage(String id, String content, Date createDate) { this.id = id; this.content = content; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java index 56ab37a0f6..dd139d56dd 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java @@ -821,10 +821,6 @@ public ToStringObjectMethodOverrideLazyDbRefTarget() {} super(id, value); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return this.id + ":" + this.value; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java index 4cc02aad30..cb57eb7ef8 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java @@ -27,7 +27,9 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.net.URL; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.util.*; @@ -35,7 +37,6 @@ import org.bson.types.Code; import org.bson.types.Decimal128; import org.bson.types.ObjectId; -import org.joda.time.LocalDate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -144,34 +145,6 @@ void convertsAddressCorrectly() { assertThat(document.get("s").toString()).isEqualTo("Broadway"); } - @Test - void convertsJodaTimeTypesCorrectly() { - - converter = new MappingMongoConverter(resolver, mappingContext); - converter.afterPropertiesSet(); - - Person person = new Person(); - person.birthDate = new LocalDate(); - - org.bson.Document document = new org.bson.Document(); - converter.write(person, document); - - assertThat(document.get("birthDate")).isInstanceOf(Date.class); - - Person result = converter.read(Person.class, document); - assertThat(result.birthDate).isNotNull(); - } - - @Test - void convertsCustomTypeOnConvertToMongoType() { - - converter = new MappingMongoConverter(resolver, mappingContext); - converter.afterPropertiesSet(); - - LocalDate date = new LocalDate(); - converter.convertToMongoType(date); - } - @Test // DATAMONGO-130 void writesMapTypeCorrectly() { @@ -197,7 +170,7 @@ void readsMapWithCustomKeyTypeCorrectly() { void usesDocumentsStoredTypeIfSubtypeOfRequest() { org.bson.Document document = new org.bson.Document(); - document.put("birthDate", new LocalDate()); + document.put("birthDate", new Date()); document.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName()); assertThat(converter.read(Contact.class, document)).isInstanceOf(Person.class); @@ -207,7 +180,7 @@ void usesDocumentsStoredTypeIfSubtypeOfRequest() { void ignoresDocumentsStoredTypeIfCompletelyDifferentTypeRequested() { org.bson.Document document = new org.bson.Document(); - document.put("birthDate", new LocalDate()); + document.put("birthDate", new Date()); document.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName()); assertThat(converter.read(BirthDateContainer.class, document)).isInstanceOf(BirthDateContainer.class); @@ -2643,7 +2616,8 @@ void readsMapThatDoesNotComeAsDocument() { @Test // GH-2860 void projectShouldReadSimpleInterfaceProjection() { - org.bson.Document source = new org.bson.Document("birthDate", new LocalDate(1999, 12, 1).toDate()).append("foo", + org.bson.Document source = new org.bson.Document("birthDate", + Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter"); EntityProjectionIntrospector discoverer = EntityProjectionIntrospector.create(converter.getProjectionFactory(), @@ -2655,14 +2629,15 @@ void projectShouldReadSimpleInterfaceProjection() { .introspect(PersonProjection.class, Person.class); PersonProjection person = converter.project(projection, source); - assertThat(person.getBirthDate()).isEqualTo(new LocalDate(1999, 12, 1)); + assertThat(person.getBirthDate()).isEqualTo(LocalDate.of(1999, 12, 1)); assertThat(person.getFirstname()).isEqualTo("Walter"); } @Test // GH-2860 void projectShouldReadSimpleDtoProjection() { - org.bson.Document source = new org.bson.Document("birthDate", new LocalDate(1999, 12, 1).toDate()).append("foo", + org.bson.Document source = new org.bson.Document("birthDate", + Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter"); EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(), @@ -2674,7 +2649,7 @@ void projectShouldReadSimpleDtoProjection() { .introspect(PersonDto.class, Person.class); PersonDto person = converter.project(projection, source); - assertThat(person.getBirthDate()).isEqualTo(new LocalDate(1999, 12, 1)); + assertThat(person.getBirthDate()).isEqualTo(LocalDate.of(1999, 12, 1)); assertThat(person.getFirstname()).isEqualTo("Walter"); } @@ -2759,7 +2734,7 @@ static class Person implements Contact { @Id String id; - LocalDate birthDate; + Date birthDate; @Field("foo") String firstname; String lastname; @@ -2842,7 +2817,7 @@ static class ClassWithNestedMaps { } static class BirthDateContainer { - LocalDate birthDate; + Date birthDate; } static class BigDecimalContainer { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java index aa674804fe..a5582e3306 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java @@ -20,10 +20,10 @@ import static org.springframework.data.mongodb.core.query.Query.*; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Set; -import org.joda.time.LocalDate; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -191,7 +191,7 @@ public void nearSphere() { @Test // DATAMONGO-1360 public void mapsQueryContainedInNearQuery() { - Query query = query(where("openingDate").lt(LocalDate.now())); + Query query = query(where("openingDate").lt(new Date())); template.geoNear(NearQuery.near(1.5, 1.7).spherical(true).query(query), Venue.class); } } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java index 9c898d28ce..614b6f3e38 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java @@ -376,19 +376,11 @@ private class WithMultiShardKey {} static class SampleExtension implements EvaluationContextExtension { - /* - * (non-Javadoc) - * @see org.springframework.data.spel.spi.EvaluationContextExtension#getExtensionId() - */ @Override public String getExtensionId() { return "sampleExtension"; } - /* - * (non-Javadoc) - * @see org.springframework.data.spel.spi.EvaluationContextExtension#getProperties() - */ @Override public Map getProperties() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java index 9b7d6fef91..a86b2b8942 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java @@ -25,10 +25,6 @@ public class PersonBeforeSaveListener extends AbstractMongoEventListener seenEvents = new ArrayList(); - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.Document) - */ @Override public void onBeforeSave(BeforeSaveEvent event) { seenEvents.add(event); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java index 1477a7e8cc..aedf511ee8 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java @@ -15,8 +15,8 @@ */ package org.springframework.data.mongodb.core.mapping.event; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; /** * Class used to test JSR-303 validation diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java index 3e84ffbd23..16970e82fb 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.*; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java index fb35a05204..f54b0c57e1 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java @@ -80,10 +80,6 @@ void check() { .isEqualTo(expectedResult); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return String.format("Mode: %s, %s", mode, comment); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java index 927aa28327..4902c5c23b 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java @@ -22,7 +22,6 @@ import java.util.Map; import org.bson.Document; -import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.springframework.data.mongodb.core.DocumentTestUtils; import org.springframework.data.mongodb.core.query.Update.Position; @@ -348,7 +347,7 @@ public void getUpdateObjectShouldReturnCurrentDateCorrectlyWhenUsingMixedDateAnd @Test // DATAMONGO-1002 public void toStringWorksForUpdateWithComplexObject() { - Update update = new Update().addToSet("key", new DateTime()); + Update update = new Update().addToSet("key", new Date()); assertThat(update.toString()).isNotNull(); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerForTracingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerForTracingTests.java new file mode 100644 index 0000000000..302bbda942 --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerForTracingTests.java @@ -0,0 +1,98 @@ +/* + * Copyright 2002-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.mongodb.observability; + +import com.mongodb.ServerAddress; +import com.mongodb.connection.ClusterId; +import com.mongodb.connection.ConnectionDescription; +import com.mongodb.connection.ServerId; +import com.mongodb.event.CommandFailedEvent; +import com.mongodb.event.CommandStartedEvent; +import com.mongodb.event.CommandSucceededEvent; +import io.micrometer.api.instrument.observation.Observation; +import io.micrometer.api.instrument.observation.ObservationRegistry; +import io.micrometer.api.instrument.simple.SimpleMeterRegistry; +import io.micrometer.tracing.Span; +import io.micrometer.tracing.test.simple.SimpleTracer; +import io.micrometer.tracing.test.simple.SpanAssert; +import io.micrometer.tracing.test.simple.TracerAssert; +import org.bson.BsonDocument; +import org.bson.BsonString; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class MicrometerMongoCommandListenerForTracingTests { + + ObservationRegistry registry = new SimpleMeterRegistry(); + + MicrometerMongoCommandListener listener = new MicrometerMongoCommandListener(registry); + + SimpleTracer simpleTracer = new SimpleTracer(); + + MongoTracingRecordingHandler handler = new MongoTracingRecordingHandler(simpleTracer); + + @BeforeEach void setup() { + registry.observationConfig().observationHandler(handler); + } + + @Test void successfullyCompletedCommandShouldCreateSpanWhenParentSampleInRequestContext() { + TestRequestContext testRequestContext = testRequestContextWithParentObservation(); + + commandStartedAndSucceeded(testRequestContext); + + assertThatMongoSpanIsClientWithTags().hasIpThatIsBlank().hasPortThatIsNotSet(); + } + + @Test + void successfullyCompletedCommandShouldCreateSpanWithAddressInfoWhenParentSampleInRequestContextAndHandlerAddressInfoEnabled() { + handler.setSetRemoteIpAndPortEnabled(true); + TestRequestContext testRequestContext = testRequestContextWithParentObservation(); + + commandStartedAndSucceeded(testRequestContext); + + assertThatMongoSpanIsClientWithTags().hasIpThatIsNotBlank().hasPortThatIsSet(); + } + + @Test void commandWithErrorShouldCreateTimerWhenParentSampleInRequestContext() { + TestRequestContext testRequestContext = testRequestContextWithParentObservation(); + + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, + new ConnectionDescription(new ServerId(new ClusterId("description"), new ServerAddress("localhost", 1234))), + "database", "insert", new BsonDocument("collection", new BsonString("user")))); listener.commandFailed( + new CommandFailedEvent(testRequestContext, 0, null, "insert", 0, new IllegalAccessException())); + + assertThatMongoSpanIsClientWithTags().assertThatThrowable().isInstanceOf(IllegalAccessException.class); + } + + @NotNull private TestRequestContext testRequestContextWithParentObservation() { + Observation parent = Observation.start("name", registry); return TestRequestContext.withObservation(parent); + } + + private void commandStartedAndSucceeded(TestRequestContext testRequestContext) { + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, + new ConnectionDescription(new ServerId(new ClusterId("description"), new ServerAddress("localhost", 1234))), + "database", "insert", new BsonDocument("collection", new BsonString("user")))); + listener.commandSucceeded(new CommandSucceededEvent(testRequestContext, 0, null, "insert", null, 0)); + } + + private SpanAssert assertThatMongoSpanIsClientWithTags() { + return TracerAssert.assertThat(simpleTracer).onlySpan().hasNameEqualTo("insert user") + .hasSpanWithKindEqualTo(Span.Kind.CLIENT).hasRemoteServiceNameEqualTo("mongodb-database") + .hasTag("mongodb.command", "insert").hasTag("mongodb.collection", "user").hasTagWithKey("mongodb.cluster_id"); + } + +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerTests.java new file mode 100644 index 0000000000..fcfd81335d --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MicrometerMongoCommandListenerTests.java @@ -0,0 +1,119 @@ +/* + * Copyright 2002-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.mongodb.observability; + +import com.mongodb.ServerAddress; +import com.mongodb.connection.ClusterId; +import com.mongodb.connection.ConnectionDescription; +import com.mongodb.connection.ServerId; +import com.mongodb.event.CommandFailedEvent; +import com.mongodb.event.CommandStartedEvent; +import com.mongodb.event.CommandSucceededEvent; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Tags; +import io.micrometer.api.instrument.observation.Observation; +import io.micrometer.api.instrument.observation.TimerObservationHandler; +import io.micrometer.api.instrument.simple.SimpleMeterRegistry; +import org.bson.BsonDocument; +import org.bson.BsonString; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static io.micrometer.core.tck.MeterRegistryAssert.assertThat; + +class MicrometerMongoCommandListenerTests { + + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + + MicrometerMongoCommandListener listener = new MicrometerMongoCommandListener(registry); + + @BeforeEach + void setup() { + registry.observationConfig().observationHandler(new TimerObservationHandler(this.registry)); + } + + @Test void commandStartedShouldNotInstrumentWhenAdminDatabase() { + listener.commandStarted(new CommandStartedEvent(null, 0, null, "admin", "", null)); + + assertThat(registry).hasNoMetrics(); + } + + @Test void commandStartedShouldNotInstrumentWhenNoRequestContext() { + listener.commandStarted(new CommandStartedEvent(null, 0, null, "some name", "", null)); + + assertThat(registry).hasNoMetrics(); + } + + @Test void commandStartedShouldNotInstrumentWhenNoParentSampleInRequestContext() { + listener.commandStarted(new CommandStartedEvent(new TestRequestContext(), 0, null, "some name", "", null)); + + assertThat(registry).hasNoMetrics(); + } + + @Test void successfullyCompletedCommandShouldCreateTimerWhenParentSampleInRequestContext() { + Observation parent = Observation.start("name", registry); + TestRequestContext testRequestContext = TestRequestContext.withObservation(parent); + + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, + new ConnectionDescription(new ServerId(new ClusterId("description"), new ServerAddress("localhost", 1234))), + "database", "insert", new BsonDocument("collection", new BsonString("user")))); + listener.commandSucceeded(new CommandSucceededEvent(testRequestContext, 0, null, "insert", null, 0)); + + assertThatTimerRegisteredWithTags(); + } + + @Test + void successfullyCompletedCommandWithCollectionHavingCommandNameShouldCreateTimerWhenParentSampleInRequestContext() { + Observation parent = Observation.start("name", registry); + TestRequestContext testRequestContext = TestRequestContext.withObservation(parent); + + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, + new ConnectionDescription(new ServerId(new ClusterId("description"), new ServerAddress("localhost", 1234))), + "database", "aggregate", new BsonDocument("aggregate", new BsonString("user")))); + listener.commandSucceeded(new CommandSucceededEvent(testRequestContext, 0, null, "aggregate", null, 0)); + + assertThatTimerRegisteredWithTags(); + } + + @Test void successfullyCompletedCommandWithoutClusterInformationShouldCreateTimerWhenParentSampleInRequestContext() { + Observation parent = Observation.start("name", registry); + TestRequestContext testRequestContext = TestRequestContext.withObservation(parent); + + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, null, "database", "insert", + new BsonDocument("collection", new BsonString("user")))); + listener.commandSucceeded(new CommandSucceededEvent(testRequestContext, 0, null, "insert", null, 0)); + + assertThat(registry).hasTimerWithNameAndTags("mongodb.command", Tags.of(Tag.of("mongodb.collection", "user"))); + } + + @Test void commandWithErrorShouldCreateTimerWhenParentSampleInRequestContext() { + Observation parent = Observation.start("name", registry); + TestRequestContext testRequestContext = TestRequestContext.withObservation(parent); + + listener.commandStarted(new CommandStartedEvent(testRequestContext, 0, + new ConnectionDescription(new ServerId(new ClusterId("description"), new ServerAddress("localhost", 1234))), + "database", "insert", new BsonDocument("collection", new BsonString("user")))); listener.commandFailed( + new CommandFailedEvent(testRequestContext, 0, null, "insert", 0, new IllegalAccessException())); + + assertThatTimerRegisteredWithTags(); + } + + private void assertThatTimerRegisteredWithTags() { + assertThat(registry).hasTimerWithNameAndTags("mongodb.command", Tags.of(Tag.of("mongodb.collection", "user"))) + .hasTimerWithNameAndTagKeys("mongodb.command", "mongodb.cluster_id"); + } + +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestRequestContext.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestRequestContext.java new file mode 100644 index 0000000000..cbd6f68472 --- /dev/null +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestRequestContext.java @@ -0,0 +1,62 @@ +/* + * Copyright 2013-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.mongodb.observability; + +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Stream; + +import com.mongodb.RequestContext; +import io.micrometer.api.instrument.observation.Observation; + +class TestRequestContext implements RequestContext { + + private final Map map = new HashMap<>(); + + @Override public T get(Object key) { + return (T) map.get(key); + } + + @Override public boolean hasKey(Object key) { + return map.containsKey(key); + } + + @Override public boolean isEmpty() { + return map.isEmpty(); + } + + @Override public void put(Object key, Object value) { + map.put(key, value); + } + + @Override public void delete(Object key) { + map.remove(key); + } + + @Override public int size() { + return map.size(); + } + + @Override public Stream> stream() { + return map.entrySet().stream(); + } + + static TestRequestContext withObservation(Observation value) { + TestRequestContext testRequestContext = new TestRequestContext(); testRequestContext.put(Observation.class, value); + return testRequestContext; + } +} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java index 37a2667287..17da744c38 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java @@ -798,10 +798,6 @@ public String print(double referenceAverage, double referenceMedian) { String.format(" %s%%", DEVIATION_FORMAT.format(getMediaDeviationFrom(referenceMedian)))) + '\n'; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return times.isEmpty() ? "" @@ -857,10 +853,6 @@ public String print() { return builder.toString(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java index be9335f2eb..756ca299ca 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java @@ -856,10 +856,6 @@ public String print(double referenceAverage, double referenceMedian) { String.format(" %s%%", DEVIATION_FORMAT.format(getMediaDeviationFrom(referenceMedian)))) + '\n'; } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { return times.isEmpty() ? "" @@ -915,10 +911,6 @@ public String print() { return builder.toString(); } - /* - * (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java index cf2dc6a8dc..f18bcbbabf 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java @@ -17,17 +17,16 @@ import static org.assertj.core.api.Assertions.*; -import io.reactivex.Flowable; -import io.reactivex.Maybe; -import io.reactivex.observers.TestObserver; +import io.reactivex.rxjava3.observers.TestObserver; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.subscribers.TestSubscriber; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.data.repository.reactive.RxJava3SortingRepository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -import rx.Observable; -import rx.Single; import java.util.Arrays; import java.util.List; @@ -46,7 +45,6 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; import org.springframework.data.repository.reactive.ReactiveSortingRepository; -import org.springframework.data.repository.reactive.RxJava2SortingRepository; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; @@ -61,8 +59,6 @@ public class ConvertingReactiveMongoRepositoryTests { @EnableReactiveMongoRepositories( includeFilters = { @Filter(value = ReactivePersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE), - @Filter(value = RxJava1PersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE), - @Filter(value = RxJava2PersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE), @Filter(value = RxJava3PersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE), @Filter(value = MixedReactivePersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE) }, considerNestedRepositories = true) @@ -71,8 +67,6 @@ static class Config {} @Autowired MixedReactivePersonRepostitory reactiveRepository; @Autowired ReactivePersonRepostitory reactivePersonRepostitory; - @Autowired RxJava1PersonRepostitory rxJava1PersonRepostitory; - @Autowired RxJava2PersonRepostitory rxJava2PersonRepostitory; @Autowired RxJava3PersonRepostitory rxJava3PersonRepostitory; ReactivePerson dave, oliver, carter, boyd, stefan, leroi, alicia; @@ -106,162 +100,24 @@ public void reactiveStreamsQueryMethodsShouldWork() { StepVerifier.create(reactivePersonRepostitory.findByLastname(boyd.getLastname())).expectNext(boyd).verifyComplete(); } - @Test // DATAMONGO-1444 - public void simpleRxJava1MethodsShouldWork() { - - rxJava1PersonRepostitory.existsById(dave.getId()) // - .test() // - .awaitTerminalEvent() // - .assertValue(true) // - .assertNoErrors() // - .assertCompleted(); - } - - @Test // DATAMONGO-1444 - public void existsWithSingleRxJava1IdMethodsShouldWork() { - - rxJava1PersonRepostitory.existsById(Single.just(dave.getId())) // - .test() // - .awaitTerminalEvent() // - .assertValue(true) // - .assertNoErrors() // - .assertCompleted(); - } - - @Test // DATAMONGO-1444 - public void singleRxJava1QueryMethodShouldWork() { - - rxJava1PersonRepostitory.findByFirstnameAndLastname(dave.getFirstname(), dave.getLastname()) // - .test() // - .awaitTerminalEvent() // - .assertValue(dave) // - .assertNoErrors() // - .assertCompleted(); - } - - @Test // DATAMONGO-1444 - public void singleProjectedRxJava1QueryMethodShouldWork() { - - List people = rxJava1PersonRepostitory.findProjectedByLastname(carter.getLastname()) // - .test() // - .awaitTerminalEvent() // - .assertValueCount(1) // - .assertNoErrors() // - .assertCompleted() // - .getOnNextEvents(); - - ProjectedPerson projectedPerson = people.get(0); - assertThat(projectedPerson.getFirstname()).isEqualTo(carter.getFirstname()); - } - - @Test // DATAMONGO-1444 - public void observableRxJava1QueryMethodShouldWork() { - - rxJava1PersonRepostitory.findByLastname(boyd.getLastname()) // - .test() // - .awaitTerminalEvent() // - .assertValue(boyd) // - .assertNoErrors() // - .assertCompleted() // - .getOnNextEvents(); - } - - @Test // DATAMONGO-1610 - public void simpleRxJava2MethodsShouldWork() { - - TestObserver testObserver = rxJava2PersonRepostitory.existsById(dave.getId()).test(); - - testObserver.awaitTerminalEvent(); - testObserver.assertComplete(); - testObserver.assertNoErrors(); - testObserver.assertValue(true); - } - - @Test // DATAMONGO-1610 - public void existsWithSingleRxJava2IdMethodsShouldWork() { - - TestObserver testObserver = rxJava2PersonRepostitory.existsById(io.reactivex.Single.just(dave.getId())) - .test(); - - testObserver.awaitTerminalEvent(); - testObserver.assertComplete(); - testObserver.assertNoErrors(); - testObserver.assertValue(true); - } - - @Test // DATAMONGO-1610 - public void flowableRxJava2QueryMethodShouldWork() { - - io.reactivex.subscribers.TestSubscriber testSubscriber = rxJava2PersonRepostitory - .findByFirstnameAndLastname(dave.getFirstname(), dave.getLastname()).test(); - - testSubscriber.awaitTerminalEvent(); - testSubscriber.assertComplete(); - testSubscriber.assertNoErrors(); - testSubscriber.assertValue(dave); - } - - @Test // DATAMONGO-1610 - public void singleProjectedRxJava2QueryMethodShouldWork() { - - TestObserver testObserver = rxJava2PersonRepostitory - .findProjectedByLastname(Maybe.just(carter.getLastname())).test(); - - testObserver.awaitTerminalEvent(); - testObserver.assertComplete(); - testObserver.assertNoErrors(); - - testObserver.assertValue(actual -> { - assertThat(actual.getFirstname()).isEqualTo(carter.getFirstname()); - return true; - }); - } - - @Test // DATAMONGO-1610 - public void observableProjectedRxJava2QueryMethodShouldWork() { - - TestObserver testObserver = rxJava2PersonRepostitory - .findProjectedByLastname(Single.just(carter.getLastname())).test(); - - testObserver.awaitTerminalEvent(); - testObserver.assertComplete(); - testObserver.assertNoErrors(); - - testObserver.assertValue(actual -> { - assertThat(actual.getFirstname()).isEqualTo(carter.getFirstname()); - return true; - }); - } - - @Test // DATAMONGO-1610 - public void maybeRxJava2QueryMethodShouldWork() { - - TestObserver testObserver = rxJava2PersonRepostitory.findByLastname(boyd.getLastname()).test(); - - testObserver.awaitTerminalEvent(); - testObserver.assertComplete(); - testObserver.assertNoErrors(); - testObserver.assertValue(boyd); - } - @Test // DATAMONGO-2558 - public void simpleRxJava3MethodsShouldWork() { + public void simpleRxJava3MethodsShouldWork() throws InterruptedException { TestObserver testObserver = rxJava3PersonRepostitory.existsById(dave.getId()).test(); - testObserver.awaitTerminalEvent(); + testObserver.await(); testObserver.assertComplete(); testObserver.assertNoErrors(); testObserver.assertValue(true); } @Test // DATAMONGO-2558 - public void existsWithSingleRxJava3IdMethodsShouldWork() { + public void existsWithSingleRxJava3IdMethodsShouldWork() throws InterruptedException { - TestObserver testObserver = rxJava3PersonRepostitory.existsById(io.reactivex.Single.just(dave.getId())) + TestObserver testObserver = rxJava3PersonRepostitory.existsById(Single.just(dave.getId())) .test(); - testObserver.awaitTerminalEvent(); + testObserver.await(); testObserver.assertComplete(); testObserver.assertNoErrors(); testObserver.assertValue(true); @@ -323,17 +179,17 @@ public void maybeRxJava3QueryMethodShouldWork() throws InterruptedException { testObserver.assertValue(boyd); } - @Test // DATAMONGO-1444 - public void mixedRepositoryShouldWork() { - - reactiveRepository.findByLastname(boyd.getLastname()) // - .test() // - .awaitTerminalEvent() // - .assertValue(boyd) // - .assertNoErrors() // - .assertCompleted() // - .getOnNextEvents(); - } +// @Test // DATAMONGO-1444 +// public void mixedRepositoryShouldWork() { +// +// reactiveRepository.findByLastname(boyd.getLastname()) // +// .test() // +// .awaitTerminalEvent() // +// .assertValue(boyd) // +// .assertNoErrors() // +// .assertCompleted() // +// .getOnNextEvents(); +// } @Test // DATAMONGO-1444 public void shouldFindOneBySingleOfLastName() { @@ -352,50 +208,26 @@ public void shouldFindByObservableOfLastNameIn() { .verifyComplete(); } - @Test // DATAMONGO-1444 - public void shouldFindByPublisherOfLastNameInAndAgeGreater() { - - List people = reactiveRepository - .findByLastnameInAndAgeGreaterThan(Flux.just(carter.getLastname(), dave.getLastname()), 41).test() // - .awaitTerminalEvent() // - .assertValueCount(2) // - .assertNoErrors() // - .assertCompleted() // - .getOnNextEvents(); - - assertThat(people).contains(carter, dave); - } +// @Test // DATAMONGO-1444 +// public void shouldFindByPublisherOfLastNameInAndAgeGreater() { +// +// List people = reactiveRepository +// .findByLastnameInAndAgeGreaterThan(Flux.just(carter.getLastname(), dave.getLastname()), 41).test() // +// .awaitTerminalEvent() // +// .assertValueCount(2) // +// .assertNoErrors() // +// .assertCompleted() // +// .getOnNextEvents(); +// +// assertThat(people).contains(carter, dave); +// } interface ReactivePersonRepostitory extends ReactiveSortingRepository { Publisher findByLastname(String lastname); } - interface RxJava1PersonRepostitory extends org.springframework.data.repository.Repository { - - Observable findByFirstnameAndLastname(String firstname, String lastname); - - Single findByLastname(String lastname); - - Single findProjectedByLastname(String lastname); - - Single existsById(String id); - - Single existsById(Single id); - } - - interface RxJava2PersonRepostitory extends RxJava2SortingRepository { - - Flowable findByFirstnameAndLastname(String firstname, String lastname); - - Maybe findByLastname(String lastname); - - io.reactivex.Single findProjectedByLastname(Maybe lastname); - - io.reactivex.Observable findProjectedByLastname(Single lastname); - } - - interface RxJava3PersonRepostitory extends RxJava2SortingRepository { + interface RxJava3PersonRepostitory extends RxJava3SortingRepository { io.reactivex.rxjava3.core.Flowable findByFirstnameAndLastname(String firstname, String lastname); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java index 62c5b18be5..a74ecc0e48 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java @@ -265,11 +265,6 @@ public void setCoworker(User coworker) { this.coworker = coworker; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { @@ -320,11 +315,6 @@ public void setSpiritAnimal(User spiritAnimal) { this.spiritAnimal = spiritAnimal; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java index 73ff1c22e0..478a6f2767 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.*; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java index 22de5a6205..d95600e6de 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java @@ -15,8 +15,8 @@ */ package org.springframework.data.mongodb.repository.cdi; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java index de5e760f7b..6e25eccd98 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java @@ -15,7 +15,7 @@ */ package org.springframework.data.mongodb.repository.cdi; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * @author Oliver Gierke diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java index 0897369c90..7f771bf1bf 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java @@ -34,7 +34,7 @@ import org.springframework.data.repository.config.RepositoryConfiguration; import org.springframework.data.repository.config.RepositoryConfigurationSource; import org.springframework.data.repository.reactive.ReactiveCrudRepository; -import org.springframework.data.repository.reactive.RxJava2CrudRepository; +import org.springframework.data.repository.reactive.RxJava3CrudRepository; /** * Unit tests for {@link ReactiveMongoRepositoryConfigurationExtension}. @@ -108,7 +108,7 @@ static class Store {} interface SampleRepository extends ReactiveCrudRepository {} - interface UnannotatedRepository extends RxJava2CrudRepository {} + interface UnannotatedRepository extends RxJava3CrudRepository {} interface StoreRepository extends ReactiveMongoRepository {} } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java index 0db511de16..eb07817768 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java @@ -25,10 +25,6 @@ */ public class CustomMongoRepositoryImpl implements CustomMongoRepository { - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.custom.CustomMongoRepository#findByFullName() - */ @Override public List findByUsernameCustom(String username) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java index 003a1589b3..b1f16fd0fe 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java @@ -16,12 +16,12 @@ package org.springframework.data.mongodb.repository.custom; import org.springframework.data.mongodb.repository.User; -import org.springframework.data.repository.reactive.RxJava2CrudRepository; +import org.springframework.data.repository.reactive.RxJava3CrudRepository; /** * @author Mark Paluch */ public interface CustomReactiveMongoRepository - extends RxJava2CrudRepository, CustomReactiveMongoRepositoryCustom { + extends RxJava3CrudRepository, CustomReactiveMongoRepositoryCustom { } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java index f43e3a1074..79a49f2ac6 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java @@ -72,76 +72,40 @@ public StubParameterAccessor(Object... values) { } } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getPageable() - */ public Pageable getPageable() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int) - */ public Object getBindableValue(int index) { return values[index]; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue() - */ public boolean hasBindableNullValue() { return false; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getSort() - */ public Sort getSort() { return Sort.unsorted(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getDistanceRange() - */ @Override public Range getDistanceRange() { return range; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#iterator() - */ public Iterator iterator() { return Arrays.asList(values).iterator(); } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation() - */ public Point getGeoNearLocation() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText() - */ @Override public TextCriteria getFullText() { return null; } - /* - * (non-Javadoc) - * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation() - */ @Override public Collation getCollation() { return this.colllation; @@ -155,19 +119,6 @@ public Object[] getValues() { return this.values; } - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getDynamicProjection() - */ - @Override - public Optional> getDynamicProjection() { - return Optional.empty(); - } - - /* - * (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection() - */ @Override public Class findDynamicProjection() { return null; diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java index 25b8e72324..48db309220 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java @@ -259,10 +259,6 @@ Statement apply() { return apply(null, null); } - /* - * (non-Javadoc) - * @see org.junit.rules.TestRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description) - */ public Statement apply(Statement base, Description description) { return new MongoCleanStatement(base); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java index 6f519c71e2..3052066615 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java @@ -67,10 +67,6 @@ public class DocumentAssert extends AbstractMapAssert valueCondition) { @@ -341,10 +313,6 @@ public DocumentAssert hasEntrySatisfying(String key, Condition v return myself; } - /* - * (non-Javadoc) - * @see org.assertj.core.api.AbstractMapAssert#hasEntrySatisfying(java.lang.Object, java.util.function.Consumer) - */ @Override public DocumentAssert hasEntrySatisfying(String key, Consumer valueRequirements) { diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index ee7831d43f..216868626b 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -42,3 +42,4 @@ include::{spring-data-commons-docs}/repository-namespace-reference.adoc[leveloff include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[leveloffset=+1] include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[leveloffset=+1] include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[leveloffset=+1] +include::reference/observability.adoc[leveloffset=+1] diff --git a/src/main/asciidoc/reference/observability.adoc b/src/main/asciidoc/reference/observability.adoc new file mode 100644 index 0000000000..f31372d350 --- /dev/null +++ b/src/main/asciidoc/reference/observability.adoc @@ -0,0 +1,8 @@ +:root-target: ../../../../target/ + +[[observability]] +== Observability metadata + +include::{root-target}_metrics.adoc[] + +include::{root-target}_spans.adoc[] diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 3bb2c195df..69557acb8c 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -1,4 +1,4 @@ -Spring Data MongoDB 3.3 GA (2021.1.0) +Spring Data MongoDB 4.0 M1 (2022.0.0) Copyright (c) [2010-2019] Pivotal Software, Inc. This product is licensed to you under the Apache License, Version 2.0 (the "License"). @@ -30,5 +30,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file. +