Query method parameters annotated with @Param are not considered projection parameters.

This is a 2.7.x adapted fix for #1452 (the actual fix for 3.x contained in #2770). We temporarily support the use of @param on Class parameters to allow them to be be used as actual query parameters.

On 3.0.x the general parameter handling gets smarter so that this mitigation can be phased out pretty quickly, but this here seems to be a simple enough fix for those who cannot upgrade to 3.0 any time soon.

Closes #2770.
See #1452.
Original pull request: #2772

Author: odrotbohm

src/main/java/org/springframework/data/repository/query/Parameter.java

@@ -215,6 +215,10 @@ boolean isSort() {
 	 */
 	private static boolean isDynamicProjectionParameter(MethodParameter parameter) {
 
+		if (parameter.hasParameterAnnotation(Param.class)) {
+			return false;
+		}
+
 		Method method = parameter.getMethod();
 
 		if (method == null) {
@@ -232,7 +236,8 @@ private static boolean isDynamicProjectionParameter(MethodParameter parameter) {
 		TypeInformation<Object> returnType = ClassTypeInformation.fromReturnTypeOf(method);
 
 		return bound
-				.equals(QueryExecutionConverters.unwrapWrapperTypes(ReactiveWrapperConverters.unwrapWrapperTypes(returnType)));
+				.equals(QueryExecutionConverters
+						.unwrapWrapperTypes(ReactiveWrapperConverters.unwrapWrapperTypes(returnType)));
 	}
 
 	/**

src/test/java/org/springframework/data/repository/query/ParameterUnitTests.java

@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
@@ -48,14 +49,20 @@ void classParameterWithSameTypeParameterAsReturnedStreamIsDynamicProjectionParam
 		assertThat(parameter.isDynamicProjectionParameter()).isTrue();
 	}
 
+	@Test // #1452
+	void doesNotConsiderAtParamAnnotatedClassParameterDynamicProjectionOne() throws Exception {
+
+		Parameter parameter = new Parameter(getMethodParameter("atParamOnClass"));
+
+		assertThat(parameter.isDynamicProjectionParameter()).isFalse();
+	}
+
 	@NotNull
 	private MethodParameter getMethodParameter(String methodName) throws NoSuchMethodException {
-		return new MethodParameter( //
-				this.getClass().getDeclaredMethod( //
-						methodName, //
-						Class.class //
-				), //
-				0);
+
+		Method method = getClass().getDeclaredMethod(methodName, Class.class);
+
+		return new MethodParameter(method, 0);
 	}
 
 	<T> List<T> dynamicProjectionWithList(Class<T> type) {
@@ -65,4 +72,8 @@ <T> List<T> dynamicProjectionWithList(Class<T> type) {
 	<T> Stream<T> dynamicProjectionWithStream(Class<T> type) {
 		return Stream.empty();
 	}
+
+	<T> T atParamOnClass(@Param("type") Class<T> type) {
+		return null;
+	}
 }