Add meta-annotations support for @RequestHeader in spring-web (Servlets)

Signed-off-by: zakaria-shahen <zakaria-shahen@users.noreply.github.com>

Author: zakaria-shahen

spring-core/src/main/java/org/springframework/core/MethodParameter.java

@@ -40,6 +40,8 @@
 import kotlin.reflect.jvm.ReflectJvmMapping;
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -650,6 +652,27 @@ public boolean hasParameterAnnotations() {
 		return null;
 	}
 
+	/**
+	 * Return the parameter annotation of the given type, if available,
+	 * either directly declared or as a meta-annotation.
+	 * @param annotationType the annotation type to look for
+	 * @return the annotation object, or {@code null} if not found
+	 */
+	public <A extends Annotation> @Nullable A getParameterNestedAnnotation(Class<A> annotationType) {
+		A annotation = getParameterAnnotation(annotationType);
+		if (annotation != null) {
+			return annotation;
+		}
+		Annotation[] annotationsToSearch = getParameterAnnotations();
+		for (Annotation toSearch : annotationsToSearch) {
+			annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(), annotationType);
+			if (annotation != null) {
+				return MergedAnnotations.from(toSearch).get(annotationType).synthesize();
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Return whether the parameter is declared with the given annotation type.
 	 * @param annotationType the annotation type to look for
@@ -659,6 +682,16 @@ public <A extends Annotation> boolean hasParameterAnnotation(Class<A> annotation
 		return (getParameterAnnotation(annotationType) != null);
 	}
 
+	/**
+	 * Return whether the parameter is declared with the given annotation type,
+	 * either directly or as a meta-annotation.
+	 * @param annotationType the annotation type to look for
+	 * @see #getParameterNestedAnnotation(Class)
+	 */
+	public <A extends Annotation> boolean hasParameterNestedAnnotation(Class<A> annotationType) {
+		return getParameterNestedAnnotation(annotationType) != null;
+	}
+
 	/**
 	 * Initialize parameter name discovery for this method parameter.
 	 * <p>This method does not actually try to retrieve the parameter name at

spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java

@@ -41,7 +41,7 @@
  * @see RequestParam
  * @see CookieValue
  */
-@Target(ElementType.PARAMETER)
+@Target({ ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface RequestHeader {

spring-web/src/main/java/org/springframework/web/method/annotation/HandlerMethodValidationException.java

@@ -155,7 +155,7 @@ public void visitResults(Visitor visitor) {
 				}
 				continue;
 			}
-			RequestHeader requestHeader = param.getParameterAnnotation(RequestHeader.class);
+			RequestHeader requestHeader = param.getParameterNestedAnnotation(RequestHeader.class);
 			if (requestHeader != null) {
 				visitor.requestHeader(requestHeader, result);
 				continue;

spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java

@@ -61,14 +61,14 @@ public RequestHeaderMethodArgumentResolver(@Nullable ConfigurableBeanFactory bea
 
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
-		return (parameter.hasParameterAnnotation(RequestHeader.class) &&
+		return (parameter.hasParameterNestedAnnotation(RequestHeader.class) &&
 				!Map.class.isAssignableFrom(parameter.nestedIfOptional().getNestedParameterType())) &&
 				!HttpHeaders.class.isAssignableFrom(parameter.nestedIfOptional().getNestedParameterType());
 	}
 
 	@Override
 	protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
-		RequestHeader ann = parameter.getParameterAnnotation(RequestHeader.class);
+		RequestHeader ann = parameter.getParameterNestedAnnotation(RequestHeader.class);
 		Assert.state(ann != null, "No RequestHeader annotation");
 		return new RequestHeaderNamedValueInfo(ann);
 	}

spring-web/src/main/java/org/springframework/web/service/invoker/RequestHeaderArgumentResolver.java

@@ -60,7 +60,7 @@ public RequestHeaderArgumentResolver(ConversionService conversionService) {
 
 	@Override
 	protected @Nullable NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
-		RequestHeader annot = parameter.getParameterAnnotation(RequestHeader.class);
+		RequestHeader annot = parameter.getParameterNestedAnnotation(RequestHeader.class);
 		return (annot == null ? null :
 				new NamedValueInfo(annot.name(), annot.required(), annot.defaultValue(), "request header", true));
 	}

spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java

@@ -16,6 +16,10 @@
 
 package org.springframework.web.method.annotation;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.lang.reflect.Method;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
@@ -69,6 +73,7 @@ class RequestHeaderMethodArgumentResolverTests {
 	private MethodParameter paramUuid;
 	private MethodParameter paramUuidOptional;
 	private MethodParameter paramUuidPlaceholder;
+	private MethodParameter paramNestedAnnotation;
 
 	private MockHttpServletRequest servletRequest;
 
@@ -94,6 +99,7 @@ void setup() throws Exception {
 		paramUuid = new SynthesizingMethodParameter(method, 9);
 		paramUuidOptional = new SynthesizingMethodParameter(method, 10);
 		paramUuidPlaceholder = new SynthesizingMethodParameter(method, 11);
+		paramNestedAnnotation = new SynthesizingMethodParameter(method, 12);
 
 		servletRequest = new MockHttpServletRequest();
 		webRequest = new ServletWebRequest(servletRequest, new MockHttpServletResponse());
@@ -113,6 +119,8 @@ void supportsParameter() {
 		assertThat(resolver.supportsParameter(paramNamedDefaultValueStringHeader)).as("String parameter not supported").isTrue();
 		assertThat(resolver.supportsParameter(paramNamedValueStringArray)).as("String array parameter not supported").isTrue();
 		assertThat(resolver.supportsParameter(paramNamedValueMap)).as("non-@RequestParam parameter supported").isFalse();
+		assertThat(resolver.supportsParameter(paramNestedAnnotation)).as("String parameter with nested annotation not supported").isTrue();
+
 	}
 
 	@Test
@@ -332,6 +340,16 @@ public void uuidPlaceholderConversionWithEmptyValue() {
 		}
 	}
 
+	@Test
+	void resolveStringNestedAnnotationArgument() throws Exception {
+		String expected = "foo";
+		servletRequest.addHeader("name", expected);
+
+		Object result = resolver.resolveArgument(paramNestedAnnotation, null, webRequest, null);
+
+		assertThat(result).isEqualTo(expected);
+	}
+
 	void params(
 			@RequestHeader(name = "name", defaultValue = "bar") String param1,
 			@RequestHeader("name") String[] param2,
@@ -344,7 +362,15 @@ void params(
 			@RequestHeader("name") Instant instantParam,
 			@RequestHeader("name") UUID uuid,
 			@RequestHeader(name = "name", required = false) UUID uuidOptional,
-			@RequestHeader(name = "${systemProperty}") UUID uuidPlaceholder) {
+			@RequestHeader(name = "${systemProperty}") UUID uuidPlaceholder,
+			@NameRequestHeader String param7) {
+	}
+
+
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.RUNTIME)
+	@RequestHeader(name = "name", defaultValue = "bar")
+	private @interface NameRequestHeader {
 	}
 
 }

spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodValidationExceptionTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.web.method.support;
 
-import java.lang.annotation.Annotation;
+import java.lang.annotation.*;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
@@ -68,7 +68,7 @@ class HandlerMethodValidationExceptionTests {
 
 
 	private final HandlerMethod handlerMethod = handlerMethod(new ValidController(),
-			controller -> controller.handle(person, person, person, List.of(), person, "", "", "", "", "", ""));
+			controller -> controller.handle(person, person, person, List.of(), person, "", "", "", "", "", "", ""));
 
 	private final TestVisitor visitor = new TestVisitor();
 
@@ -87,7 +87,7 @@ void traverse() {
 				@ModelAttribute: modelAttribute1, @ModelAttribute: modelAttribute2, \
 				@RequestBody: requestBody, @RequestBody: requestBodyList, @RequestPart: requestPart, \
 				@RequestParam: requestParam1, @RequestParam: requestParam2, \
-				@RequestHeader: header, @PathVariable: pathVariable, \
+				@RequestHeader: header, @RequestHeader: nestedAnnotationHeader, @PathVariable: pathVariable, \
 				@CookieValue: cookie, @MatrixVariable: matrixVariable""");
 	}
 
@@ -103,7 +103,7 @@ void traverseRemaining() {
 				Other: modelAttribute1, @ModelAttribute: modelAttribute2, \
 				@RequestBody: requestBody, @RequestBody: requestBodyList, @RequestPart: requestPart, \
 				Other: requestParam1, @RequestParam: requestParam2, \
-				@RequestHeader: header, @PathVariable: pathVariable, \
+				@RequestHeader: header, @RequestHeader: nestedAnnotationHeader, @PathVariable: pathVariable, \
 				@CookieValue: cookie, @MatrixVariable: matrixVariable""");
 	}
 
@@ -161,11 +161,17 @@ void handle(
 				@Size(min = 5) String requestParam1,
 				@Size(min = 5) @RequestParam String requestParam2,
 				@Size(min = 5) @RequestHeader String header,
+				@Size(min = 5) @HeaderRequestHeader String nestedAnnotationHeader,
 				@Size(min = 5) @PathVariable String pathVariable,
 				@Size(min = 5) @CookieValue String cookie,
 				@Size(min = 5) @MatrixVariable String matrixVariable) {
 		}
 
+		@Target(ElementType.PARAMETER)
+		@Retention(RetentionPolicy.RUNTIME)
+		@RequestHeader(name = "header")
+		private @interface HeaderRequestHeader {
+		}
 	}
 
 

spring-web/src/test/java/org/springframework/web/service/invoker/RequestHeaderArgumentResolverTests.java

@@ -16,6 +16,10 @@
 
 package org.springframework.web.service.invoker;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
@@ -57,6 +61,12 @@ void doesNotOverrideAnnotationHeaders() {
 		assertRequestHeaders("myHeader", "1", "2");
 	}
 
+	@Test
+	void doesNestedAnnotationNotOverrideAnnotationHeaders() {
+		this.service.executeWithAnnotationHeadersAndNestedAnnotation("2");
+		assertRequestHeaders("myHeader", "1", "2");
+	}
+
 	private void assertRequestHeaders(String key, String... values) {
 		List<String> actualValues = this.client.getRequestValues().getHeaders().get(key);
 		if (ObjectUtils.isEmpty(values)) {
@@ -76,6 +86,14 @@ private interface Service {
 		@HttpExchange(method = "GET", headers = "myHeader=1")
 		void executeWithAnnotationHeaders(@RequestHeader String myHeader);
 
+		@HttpExchange(method = "GET", headers = "myHeader=1")
+		void executeWithAnnotationHeadersAndNestedAnnotation(@MyHeader String myHeader);
+
 	}
 
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.RUNTIME)
+	@RequestHeader(name = "myHeader")
+	private @interface MyHeader {
+	}
 }