DATAMONGO-2448 - Bump version to 3.0 SNAPSHOT.

In preparation for the upcoming breaking changes when switching to the MongoDB Java Driver 4.0 and the breaking changes required for that update (expected for Milestone 2), we eagerly bump the version number to 3.0. Original pull request: #819.
spring-projects · Jan 13, 2020 · 7b1a96f · 7b1a96f
1 parent 4f75fec
commit 7b1a96f
Show file tree

Hide file tree

Showing 24 changed files with 765 additions and 56 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>

diff --git a/spring-data-mongodb-benchmarks/pom.xml b/spring-data-mongodb-benchmarks/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0.BUILD-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java
@@ -34,7 +34,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @since 2.3
+ * @since 3.0
  */
 class CountQuery {
 

diff --git a/...ongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperation.java b/...ongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperation.java
@@ -158,7 +158,7 @@ interface UpdateWithUpdate<T> {
 		 * @param update must not be {@literal null}.
 		 * @return new instance of {@link TerminatingUpdate}.
 		 * @throws IllegalArgumentException if update is {@literal null}.
-		 * @since 2.3
+		 * @since 3.0
 		 * @see Update
 		 * @see AggregationUpdate
 		 */

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
@@ -888,7 +888,7 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated or {@literal null}, if not found.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -905,7 +905,7 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated or {@literal null}, if not found.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -925,7 +925,7 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndModifyOptions#isReturnNew()} this will either be the object as it was before the update or as
 	 *         it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -946,7 +946,7 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndModifyOptions#isReturnNew()} this will either be the object as it was before the update or as
 	 *         it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1308,7 +1308,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1329,7 +1329,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing object. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1346,7 +1346,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1362,7 +1362,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1384,7 +1384,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1401,7 +1401,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1417,7 +1417,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1436,7 +1436,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1453,7 +1453,7 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */

diff --git a/...-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java b/...-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java
@@ -683,7 +683,7 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -699,7 +699,7 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -717,7 +717,7 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	 * @param entityClass the parametrized type.
 	 * @return the converted object that was updated. Depending on the value of {@link FindAndModifyOptions#isReturnNew()}
 	 *         this will either be the object as it was before the update or as it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -736,7 +736,7 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated. Depending on the value of {@link FindAndModifyOptions#isReturnNew()}
 	 *         this will either be the object as it was before the update or as it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1171,7 +1171,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1190,7 +1190,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing object. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1207,7 +1207,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1225,7 +1225,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1246,7 +1246,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1263,7 +1263,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1279,7 +1279,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1298,7 +1298,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1315,7 +1315,7 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */

diff --git a/...-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java b/...-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java
@@ -125,7 +125,7 @@ interface UpdateWithUpdate<T> {
 		 * @param update must not be {@literal null}.
 		 * @return new instance of {@link TerminatingUpdate}. Never {@literal null}.
 		 * @throws IllegalArgumentException if update is {@literal null}.
-		 * @since 2.3
+		 * @since 3.0
 		 * @see Update
 		 * @see AggregationUpdate
 		 */

diff --git a/...-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java b/...-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java
@@ -120,7 +120,7 @@ public static Aggregation newAggregation(AggregationOperation... operations) {
 	 * 
 	 * @param operations can be {@literal empty} but must not be {@literal null}.
 	 * @return new instance of {@link AggregationUpdate}.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public static AggregationUpdate newUpdate(AggregationOperation... operations) {
 		return AggregationUpdate.from(Arrays.asList(operations));

diff --git a/...b/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java b/...b/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java
@@ -215,7 +215,7 @@ public Optional<String> getComment() {
 
 	/**
 	 * @return the time limit for processing. {@link Duration#ZERO} is used for the default unbounded behavior.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public Duration getMaxTime() {
 		return maxTime;
@@ -279,7 +279,7 @@ public Document toDocument() {
 
 	/**
 	 * @return
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public boolean hasExecutionTimeLimit() {
 		return !maxTime.isZero() && !maxTime.isNegative();
@@ -393,7 +393,7 @@ public Builder comment(@Nullable String comment) {
 		 * @param maxTime {@link Duration#ZERO} is used for the default unbounded behavior. {@link Duration#isNegative()
 		 *          Negative} values will be ignored.
 		 * @return this.
-		 * @sinve 2.3
+		 * @since 3.0
 		 */
 		public Builder maxTime(@Nullable Duration maxTime) {
 

diff --git a/...db/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java b/...db/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java
@@ -74,7 +74,7 @@
  * @see <a href=
  *      "https://docs.mongodb.com/manual/reference/method/db.collection.update/#update-with-aggregation-pipeline">MongoDB
  *      Reference Documentation</a>
- * @since 2.3
+ * @since 3.0
  */
 public class AggregationUpdate extends Aggregation implements UpdateDefinition {
 

diff --git a/.../src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java b/.../src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java
@@ -516,7 +516,7 @@ public StdDevSamp stdDevSamp() {
 		 * place.
 		 *
 		 * @return new instance of {@link Round}.
-		 * @since 2.3
+		 * @since 3.0
 		 */
 		public Round round() {
 			return usesFieldRef() ? Round.roundValueOf(fieldReference) : Round.roundValueOf(expression);
@@ -526,7 +526,7 @@ public Round round() {
 		 * Creates new {@link AggregationExpression} that rounds a number to a specified decimal place.
 		 *
 		 * @return new instance of {@link Round}.
-		 * @since 2.3
+		 * @since 3.0
 		 */
 		public Round roundToPlace(int place) {
 			return round().place(place);
@@ -1455,7 +1455,7 @@ public static Trunc truncValueOf(Number value) {
 	 * decimal.</li>
 	 * </ul>
 	 *
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public static class Round extends AbstractAggregationExpression {
 

diff --git a/...gframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java b/...gframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java
@@ -29,7 +29,7 @@
  * {@link InvalidPersistentPropertyPath} exceptions when resolving mapped field names.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  */
 public class RelaxedTypeBasedAggregationOperationContext extends TypeBasedAggregationOperationContext {
 

diff --git a/...src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java b/...src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java
@@ -98,7 +98,7 @@ public ExposedFields getFields() {
 	 * Obtain the {@link Replacement}.
 	 *
 	 * @return never {@literal null}.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	protected Replacement getReplacement() {
 		return replacement;

diff --git a/...src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java b/...src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java
@@ -27,7 +27,7 @@
  * possible to promote an embedded document to the top-level or specify a new document.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/replaceWith/">MongoDB Aggregation
  *      Framework: $replaceWith</a>
  */