Polishing.

Fix generics. Update since tags. Add GH ticket references.
Use literal null instead of code null in javadoc.

Original Pull Request: #4949

Author: mp911de

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

@@ -89,7 +89,7 @@ interface TerminatingAggregation<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingAggregation}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingAggregation<R> map(QueryResultConverter<? super T, ? extends R> converter);

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

@@ -84,7 +84,7 @@ interface TerminatingFind<T> extends TerminatingResults<T>, TerminatingProjectio
 	 *
 	 * @author Christoph Strobl
 	 * @author Mark Paluch
-	 * @since x.y
+	 * @since 5.0
 	 */
 	interface TerminatingResults<T> {
 
@@ -95,7 +95,7 @@ interface TerminatingResults<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingResults}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
@@ -157,7 +157,7 @@ default Optional<T> first() {
 		 * <p>
 		 * When using {@link KeysetScrollPosition}, make sure to use non-nullable
 		 * {@link org.springframework.data.domain.Sort sort properties} as MongoDB does not support criteria to reconstruct
-		 * a query result from absent document fields or {@code null} values through {@code $gt/$lt} operators.
+		 * a query result from absent document fields or {@literal null} values through {@code $gt/$lt} operators.
 		 *
 		 * @param scrollPosition the scroll position.
 		 * @return a window of the resulting elements.
@@ -173,7 +173,7 @@ default Optional<T> first() {
 	 * Trigger find execution by calling one of the terminating methods.
 	 *
 	 * @author Christoph Strobl
-	 * @since x.y
+	 * @since 5.0
 	 */
 	interface TerminatingProjection {
 
@@ -214,7 +214,7 @@ interface TerminatingFindNear<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingFindNear}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingFindNear<R> map(QueryResultConverter<? super T, ? extends R> converter);

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

@@ -64,7 +64,7 @@ interface TerminatingResults<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link ExecutableFindOperation.TerminatingResults}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);

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

@@ -18,15 +18,15 @@
 import java.util.Optional;
 
 import org.jspecify.annotations.Nullable;
-import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingResults;
+
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.lang.Contract;
 
 import com.mongodb.client.result.UpdateResult;
-import org.springframework.lang.Contract;
 
 /**
  * {@link ExecutableUpdateOperation} allows creation and execution of MongoDB update / findAndModify / findAndReplace
@@ -71,15 +71,14 @@ public interface ExecutableUpdateOperation {
 	 */
 	interface TerminatingFindAndModify<T> {
 
-
 		/**
 		 * Map the query result to a different type using {@link QueryResultConverter}.
 		 *
 		 * @param <R> {@link Class type} of the result.
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingFindAndModify}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingFindAndModify<R> map(QueryResultConverter<? super T, ? extends R> converter);
@@ -153,10 +152,11 @@ default Optional<T> findAndReplace() {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingFindAndModify}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
-		<R> TerminatingFindAndReplace<R> mapResult(QueryResultConverter<? super T, ? extends R> converter);
+		<R> TerminatingFindAndReplace<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 	}
 
 	/**

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

@@ -185,16 +185,9 @@ public UpdateResult upsert() {
 		}
 
 		@Override
-		public <R> TerminatingFindAndModify<R> map(QueryResultConverter<? super T, ? extends R> converter) {
-
-			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-				findAndReplaceOptions, replacement, targetType, this.resultConverter.andThen(converter));
-		}
-
-		@Override
-		public <R> TerminatingFindAndReplace<R> mapResult(QueryResultConverter<? super T, ? extends R> converter) {
+		public <R> ExecutableUpdateSupport<S, R> map(QueryResultConverter<? super T, ? extends R> converter) {
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-				findAndReplaceOptions, replacement, targetType, this.resultConverter.andThen(converter));
+					findAndReplaceOptions, replacement, targetType, this.resultConverter.andThen(converter));
 		}
 
 		@Override

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

@@ -822,7 +822,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 * <p>
 	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
 	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
-	 * {@code null} values through {@code $gt/$lt} operators.
+	 * {@literal null} values through {@code $gt/$lt} operators.
 	 *
 	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
@@ -847,7 +847,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 * <p>
 	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
 	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
-	 * {@code null} values through {@code $gt/$lt} operators.
+	 * {@literal null} values through {@code $gt/$lt} operators.
 	 *
 	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.

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

@@ -15,22 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.core.query.SerializationUtils.serializeToJsonSafely;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Scanner;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
@@ -40,8 +30,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -106,18 +96,7 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
+import org.springframework.data.mongodb.core.mapping.event.*;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
 import org.springframework.data.mongodb.core.query.BasicQuery;
@@ -157,21 +136,7 @@
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.MongoIterable;
-import com.mongodb.client.model.CountOptions;
-import com.mongodb.client.model.CreateCollectionOptions;
-import com.mongodb.client.model.CreateViewOptions;
-import com.mongodb.client.model.DeleteOptions;
-import com.mongodb.client.model.EstimatedDocumentCountOptions;
-import com.mongodb.client.model.FindOneAndDeleteOptions;
-import com.mongodb.client.model.FindOneAndReplaceOptions;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.model.TimeSeriesGranularity;
-import com.mongodb.client.model.TimeSeriesOptions;
-import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.ValidationAction;
-import com.mongodb.client.model.ValidationLevel;
-import com.mongodb.client.model.ValidationOptions;
+import com.mongodb.client.model.*;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 
@@ -1148,7 +1113,6 @@ public <T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOp
 		return findAndModify(query, update, options, entityClass, collectionName, QueryResultConverter.entity());
 	}
 
-
 	<S, T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
 			Class<S> entityClass, String collectionName, QueryResultConverter<? super S, ? extends T> resultConverter) {
 
@@ -1179,7 +1143,7 @@ <S, T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOption
 		return findAndReplace(query, replacement, options, entityType, collectionName, resultType, QueryResultConverter.entity());
 	}
 
-	public <S, T, R> @Nullable R findAndReplace(Query query, S replacement, FindAndReplaceOptions options,
+	<S, T, R> @Nullable R findAndReplace(Query query, S replacement, FindAndReplaceOptions options,
 			Class<S> entityType, String collectionName, Class<T> resultType, QueryResultConverter<? super T, ? extends R> resultConverter) {
 
 		Assert.notNull(query, "Query must not be null");
@@ -1207,7 +1171,6 @@ <S, T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOption
 		maybeEmitEvent(new BeforeSaveEvent<>(replacement, mappedReplacement, collectionName));
 		maybeCallBeforeSave(replacement, mappedReplacement, collectionName);
 
-
 		R saved = doFindAndReplace(collectionPreparer, collectionName, mappedQuery, mappedFields, mappedSort,
 				queryContext.getCollation(entityType).orElse(null), entityType, mappedReplacement, options, projection, resultConverter);
 
@@ -2203,25 +2166,15 @@ protected <T> List<T> doFindAndDelete(String collectionName, Query query, Class<
 		return doFindAndDelete(collectionName, query, entityClass, QueryResultConverter.entity());
 	}
 
-	protected <S,T> List<T> doFindAndDelete(String collectionName, Query query, Class<S> entityClass, QueryResultConverter<? super S, ? extends T> resultConverter) {
+	<S, T> List<T> doFindAndDelete(String collectionName, Query query, Class<S> entityClass,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
 
 		List<Object> ids = new ArrayList<>();
 
-
-
-//		QueryResultConverter<S,T> tmpConverter = new QueryResultConverter<S, S>() {
-//			@Override
-//			public S mapDocument(Document document, ConversionResultSupplier<S> reader) {
-//				ids.add(document.get("_id"));
-//				return reader.get();
-//			}
-//		}.andThen(resultConverter);
-
-//		DocumentCallback<T> callback = getResultReader(EntityProjection.nonProjecting(entityClass), collectionName, tmpConverter);
-
-		QueryResultConverterCallback callback = new QueryResultConverterCallback(resultConverter, new ProjectingReadCallback<S,S>(getConverter(), EntityProjection.nonProjecting(entityClass), collectionName)) {
+		QueryResultConverterCallback<S, T> callback = new QueryResultConverterCallback<>(resultConverter,
+				new ProjectingReadCallback<>(getConverter(), EntityProjection.nonProjecting(entityClass), collectionName)) {
 			@Override
-			public Object doWith(Document object) {
+			public T doWith(Document object) {
 				ids.add(object.get("_id"));
 				return super.doWith(object);
 			}
@@ -2366,7 +2319,7 @@ protected <O> Stream<O> aggregateStream(Aggregation aggregation, String collecti
 	}
 
 	@SuppressWarnings({ "ConstantConditions", "NullAway" })
-	protected <T, O> Stream<O> doAggregateStream(Aggregation aggregation, String collectionName, Class<T> outputType,
+	<T, O> Stream<O> doAggregateStream(Aggregation aggregation, String collectionName, Class<T> outputType,
 			QueryResultConverter<? super T, ? extends O> resultConverter,
 			@Nullable AggregationOperationContext context) {
 
@@ -2412,7 +2365,8 @@ protected <T, O> Stream<O> doAggregateStream(Aggregation aggregation, String col
 				cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
 			}
 
-			Class<?> domainType = aggregation instanceof TypedAggregation typedAggregation ? typedAggregation.getInputType()
+			Class<?> domainType = aggregation instanceof TypedAggregation<?> typedAggregation
+					? typedAggregation.getInputType()
 					: null;
 
 			Optionals.firstNonEmpty(options::getCollation, //
@@ -2863,7 +2817,8 @@ Document getMappedValidator(Validator validator, Class<?> domainType) {
 	}
 
 	@SuppressWarnings("ConstantConditions")
-	protected <S, T> @Nullable T doFindAndModify(CollectionPreparer collectionPreparer, String collectionName,
+	<S, T> @Nullable T doFindAndModify(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
 			Document query, @Nullable Document fields, @Nullable Document sort, Class<S> entityClass, UpdateDefinition update,
 			@Nullable FindAndModifyOptions options, QueryResultConverter<? super S, ? extends T> resultConverter) {
 
@@ -2911,7 +2866,8 @@ Document getMappedValidator(Validator validator, Class<?> domainType) {
 	 *         {@literal false} and {@link FindAndReplaceOptions#isUpsert() upsert} is {@literal false}.
 	 */
 	@Nullable
-	protected <S, T>  T doFindAndReplace(CollectionPreparer collectionPreparer, String collectionName,
+	protected <S, T> T doFindAndReplace(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
 			Document mappedQuery, Document mappedFields, Document mappedSort,
 			com.mongodb.client.model.@Nullable Collation collation, Class<S> entityType, Document replacement,
 			FindAndReplaceOptions options, Class<T> resultType) {
@@ -2954,7 +2910,8 @@ CollectionPreparer<MongoCollection<Document>> createCollectionPreparer(Query que
 	 * @since 3.4
 	 */
 	@Nullable
-	private <S, T, R> R doFindAndReplace(CollectionPreparer collectionPreparer, String collectionName,
+	private <S, T, R> R doFindAndReplace(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
 			Document mappedQuery, Document mappedFields, Document mappedSort,
 			com.mongodb.client.model.@Nullable Collation collation, Class<T> entityType, Document replacement,
 			FindAndReplaceOptions options, EntityProjection<S, T> projection, QueryResultConverter<? super S, ? extends R> resultConverter) {

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

@@ -28,7 +28,7 @@
  * @param <T> object type accepted by this converter.
  * @param <R> the returned result type.
  * @author Mark Paluch
- * @since x.x
+ * @since 5.0
  */
 @FunctionalInterface
 public interface QueryResultConverter<T, R> {

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

@@ -81,7 +81,7 @@ interface TerminatingAggregationOperation<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link ExecutableFindOperation.TerminatingFindNear}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingAggregationOperation<R> map(QueryResultConverter<? super T, ? extends R> converter);

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

@@ -74,7 +74,7 @@ interface TerminatingFind<T> extends TerminatingResults<T>, TerminatingProjectio
 	/**
 	 * Compose find execution by calling one of the terminating methods.
 	 *
-	 * @since x.y
+	 * @since 5.0
 	 */
 	interface TerminatingResults<T> {
 
@@ -85,7 +85,7 @@ interface TerminatingResults<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link TerminatingResults}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
@@ -117,7 +117,7 @@ interface TerminatingResults<T> {
 		 * <p>
 		 * When using {@link KeysetScrollPosition}, make sure to use non-nullable
 		 * {@link org.springframework.data.domain.Sort sort properties} as MongoDB does not support criteria to reconstruct
-		 * a query result from absent document fields or {@code null} values through {@code $gt/$lt} operators.
+		 * a query result from absent document fields or {@literal null} values through {@code $gt/$lt} operators.
 		 *
 		 * @param scrollPosition the scroll position.
 		 * @return a scroll of the resulting elements.
@@ -147,7 +147,7 @@ interface TerminatingResults<T> {
 	/**
 	 * Compose find execution by calling one of the terminating methods.
 	 *
-	 * @since x.y
+	 * @since 5.0
 	 */
 	interface TerminatingProjection {
 
@@ -183,7 +183,7 @@ interface TerminatingFindNear<T> {
 		 * @param converter the converter, must not be {@literal null}.
 		 * @return new instance of {@link ExecutableFindOperation.TerminatingFindNear}.
 		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
-		 * @since x.y
+		 * @since 5.0
 		 */
 		@Contract("_ -> new")
 		<R> TerminatingFindNear<R> map(QueryResultConverter<? super T, ? extends R> converter);