Polishing.

Deprecations, missing Override annotations, test fix.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java

@@ -107,6 +107,7 @@ public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations,
 		this.evaluationContextProvider = expressionSupportHolder.createValueContextProvider(method.getParameters());
 	}
 
+	@Override
 	public MongoQueryMethod getQueryMethod() {
 		return method;
 	}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java

@@ -111,10 +111,12 @@ public AbstractReactiveMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongo
 		this.updateOps = operations.update(type);
 	}
 
+	@Override
 	public MongoQueryMethod getQueryMethod() {
 		return method;
 	}
 
+	@Override
 	public Publisher<Object> execute(Object[] parameters) {
 
 		return method.hasReactiveWrapperParameter() ? executeDeferred(parameters)
@@ -417,7 +419,10 @@ protected Mono<ParameterBindingDocumentCodec> getParameterBindingCodec() {
 	 * @param accessor must not be {@literal null}.
 	 * @return a {@link Mono} emitting the {@link SpELExpressionEvaluator} when ready.
 	 * @since 3.4
+	 * @deprecated since 4.3, use
+	 *             {@link #getValueExpressionEvaluatorLater(ExpressionDependencies, MongoParameterAccessor)} instead
 	 */
+	@Deprecated(since = "4.3")
 	protected Mono<SpELExpressionEvaluator> getSpelEvaluatorFor(ExpressionDependencies dependencies,
 			MongoParameterAccessor accessor) {
 
@@ -471,7 +476,6 @@ public <T> T evaluate(String expressionString) {
 							return (T) expression.evaluate(evaluationContext);
 						}
 					};
-
 				});
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java

@@ -61,7 +61,9 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public PartTreeMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations, ExpressionParser expressionParser,
 			QueryMethodEvaluationContextProvider evaluationContextProvider) {
 		this(method, mongoOperations,
@@ -76,6 +78,7 @@ public PartTreeMongoQuery(MongoQueryMethod method, MongoOperations mongoOperatio
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionSupportHolder must not be {@literal null}.
+	 * @since 4.3
 	 */
 	public PartTreeMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations,
 			ValueExpressionSupportHolder expressionSupportHolder) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java

@@ -61,7 +61,9 @@ public class ReactivePartTreeMongoQuery extends AbstractReactiveMongoQuery {
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public ReactivePartTreeMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongoOperations mongoOperations,
 			ExpressionParser expressionParser, ReactiveQueryMethodEvaluationContextProvider evaluationContextProvider) {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java

@@ -61,7 +61,9 @@ public class ReactiveStringBasedAggregation extends AbstractReactiveMongoQuery {
 	 * @param reactiveMongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public ReactiveStringBasedAggregation(ReactiveMongoQueryMethod method,
 			ReactiveMongoOperations reactiveMongoOperations, ExpressionParser expressionParser,
 			ReactiveQueryMethodEvaluationContextProvider evaluationContextProvider) {
@@ -76,6 +78,7 @@ public ReactiveStringBasedAggregation(ReactiveMongoQueryMethod method,
 	 * @param method must not be {@literal null}.
 	 * @param reactiveMongoOperations must not be {@literal null}.
 	 * @param expressionSupportHolder must not be {@literal null}.
+	 * @since 4.3
 	 */
 	public ReactiveStringBasedAggregation(ReactiveMongoQueryMethod method,
 			ReactiveMongoOperations reactiveMongoOperations, ValueExpressionSupportHolder expressionSupportHolder) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java

@@ -67,7 +67,9 @@ public class ReactiveStringBasedMongoQuery extends AbstractReactiveMongoQuery {
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public ReactiveStringBasedMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongoOperations mongoOperations,
 			ExpressionParser expressionParser, ReactiveQueryMethodEvaluationContextProvider evaluationContextProvider) {
 		this(method.getAnnotatedQuery(), method, mongoOperations, expressionParser, evaluationContextProvider);
@@ -82,7 +84,9 @@ public ReactiveStringBasedMongoQuery(ReactiveMongoQueryMethod method, ReactiveMo
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public ReactiveStringBasedMongoQuery(String query, ReactiveMongoQueryMethod method,
 			ReactiveMongoOperations mongoOperations, ExpressionParser expressionParser,
 			ReactiveQueryMethodEvaluationContextProvider evaluationContextProvider) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java

@@ -66,7 +66,9 @@ public class StringBasedAggregation extends AbstractMongoQuery {
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public StringBasedAggregation(MongoQueryMethod method, MongoOperations mongoOperations,
 			ExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
 		this(method, mongoOperations,

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java

@@ -59,7 +59,9 @@ public class StringBasedMongoQuery extends AbstractMongoQuery {
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionParser must not be {@literal null}.
 	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @deprecated since 4.3, use the constructors accepting {@link ValueExpressionSupportHolder} instead.
 	 */
+	@Deprecated(since = "4.3")
 	public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations,
 			ExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
 		this(method.getAnnotatedQuery(), method, mongoOperations,
@@ -75,6 +77,7 @@ public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOpera
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionSupport must not be {@literal null}.
+	 * @since 4.3
 	 */
 	public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations,
 			ValueExpressionSupportHolder expressionSupport) {
@@ -89,6 +92,7 @@ public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOpera
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
 	 * @param expressionSupport must not be {@literal null}.
+	 * @since 4.3
 	 */
 	public StringBasedMongoQuery(String query, MongoQueryMethod method, MongoOperations mongoOperations,
 			ValueExpressionSupportHolder expressionSupport) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java

@@ -170,13 +170,11 @@ private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> doma
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	private static class MongoQueryLookupStrategy implements QueryLookupStrategy {
+	private record MongoQueryLookupStrategy(MongoOperations operations,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			ValueExpressionSupportHolder expressionSupport) implements QueryLookupStrategy {
 
-		private final MongoOperations operations;
-		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-		private final ValueExpressionSupportHolder expressionSupport;
-
-		public MongoQueryLookupStrategy(MongoOperations operations,
+		private MongoQueryLookupStrategy(MongoOperations operations,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
 				ValueExpressionSupportHolder expressionSupport) {
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java

@@ -136,9 +136,10 @@ protected Object getTargetRepository(RepositoryInformation information) {
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
 			ValueExpressionSupportHolder valueExpressionSupportHolder) {
-		return Optional.of(new MongoQueryLookupStrategy(operations, valueExpressionSupportHolder, mappingContext));
+		return Optional.of(new MongoQueryLookupStrategy(operations, mappingContext, valueExpressionSupportHolder));
 	}
 
+	@Override
 	public <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 		return getEntityInformation(domainClass, null);
 	}
@@ -159,18 +160,17 @@ private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> doma
 	 * @author Mark Paluch
 	 * @author Christoph Strobl
 	 */
-	private static class MongoQueryLookupStrategy implements QueryLookupStrategy {
-
-		private final ReactiveMongoOperations operations;
-		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-		private final ValueExpressionSupportHolder expressionSupportHolder;
+	private record MongoQueryLookupStrategy(ReactiveMongoOperations operations,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			ValueExpressionSupportHolder expressionSupportHolder) implements QueryLookupStrategy {
 
-		MongoQueryLookupStrategy(ReactiveMongoOperations operations, ValueExpressionSupportHolder expressionSupportHolder,
-				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		private MongoQueryLookupStrategy(ReactiveMongoOperations operations,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+				ValueExpressionSupportHolder expressionSupportHolder) {
 
 			this.operations = operations;
-			this.expressionSupportHolder = new CachingValueExpressionSupportHolder(expressionSupportHolder);
 			this.mappingContext = mappingContext;
+			this.expressionSupportHolder = new CachingValueExpressionSupportHolder(expressionSupportHolder);
 		}
 
 		@Override