Consistent lookup of parameter-level JsonView annotation

Issue: SPR-13265

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java

@@ -262,28 +262,26 @@ protected Object convertToInternal(Object payload, MessageHeaders headers, Objec
 	 * @param conversionHint the conversion hint Object as passed into the
 	 * converter for the current conversion attempt
 	 * @return the serialization view class, or {@code null} if none
+	 * @since 4.2
 	 */
 	protected Class<?> getSerializationView(Object conversionHint) {
 		if (conversionHint instanceof MethodParameter) {
-			MethodParameter methodParam = (MethodParameter) conversionHint;
-			JsonView annotation = methodParam.getParameterAnnotation(JsonView.class);
-			if (annotation == null) {
-				annotation = methodParam.getMethodAnnotation(JsonView.class);
-				if (annotation == null) {
-					return null;
-				}
+			MethodParameter param = (MethodParameter) conversionHint;
+			JsonView annotation = (param.getParameterIndex() >= 0 ?
+					param.getParameterAnnotation(JsonView.class) : param.getMethodAnnotation(JsonView.class));
+			if (annotation != null) {
+				return extractViewClass(annotation, conversionHint);
 			}
-			return extractViewClass(annotation, conversionHint);
 		}
 		else if (conversionHint instanceof JsonView) {
 			return extractViewClass((JsonView) conversionHint, conversionHint);
 		}
 		else if (conversionHint instanceof Class) {
 			return (Class) conversionHint;
 		}
-		else {
-			return null;
-		}
+
+		// No JSON view specified...
+		return null;
 	}
 
 	private Class<?> extractViewClass(JsonView annotation, Object conversionHint) {