root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Consistently expose parameter annotations from base classes as well 

Closes gh-25788
This commit is contained in:
Juergen Hoeller 2024-01-08 21:03:32 +01:00
parent 37fa82c578
commit bb1cdb6b48
2 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-core/src/main/java/org/springframework/core/annotation/AnnotatedMethod.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -28,7 +28,6 @@ import org.springframework.core.ResolvableType;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
@ -54,7 +53,7 @@ public class AnnotatedMethod {
private final MethodParameter[] parameters;
@Nullable
private volatile List<Annotation[][]> interfaceParameterAnnotations;
private volatile List<Annotation[][]> inheritedParameterAnnotations;
/**
@ -77,7 +76,7 @@ public class AnnotatedMethod {
this.method = annotatedMethod.method;
this.bridgedMethod = annotatedMethod.bridgedMethod;
this.parameters = annotatedMethod.parameters;
this.interfaceParameterAnnotations = annotatedMethod.interfaceParameterAnnotations;
this.inheritedParameterAnnotations = annotatedMethod.inheritedParameterAnnotations;
}
@ -164,18 +163,32 @@ public class AnnotatedMethod {
return AnnotatedElementUtils.hasAnnotation(this.method, annotationType);
}
private List<Annotation[][]> getInterfaceParameterAnnotations() {
List<Annotation[][]> parameterAnnotations = this.interfaceParameterAnnotations;
private List<Annotation[][]> getInheritedParameterAnnotations() {
List<Annotation[][]> parameterAnnotations = this.inheritedParameterAnnotations;
if (parameterAnnotations == null) {
parameterAnnotations = new ArrayList<>();
for (Class<?> ifc : ClassUtils.getAllInterfacesForClassAsSet(this.method.getDeclaringClass())) {
Class<?> clazz = this.method.getDeclaringClass();
while (clazz != null) {
for (Class<?> ifc : clazz.getInterfaces()) {
for (Method candidate : ifc.getMethods()) {
if (isOverrideFor(candidate)) {
parameterAnnotations.add(candidate.getParameterAnnotations());
}
}
}
this.interfaceParameterAnnotations = parameterAnnotations;
clazz = clazz.getSuperclass();
if (clazz == Object.class) {
clazz = null;
}
if (clazz != null) {
for (Method candidate : clazz.getMethods()) {
if (isOverrideFor(candidate)) {
parameterAnnotations.add(candidate.getParameterAnnotations());
}
}
}
}
this.inheritedParameterAnnotations = parameterAnnotations;
}
return parameterAnnotations;
}
@ -281,7 +294,7 @@ public class AnnotatedMethod {
anns = super.getParameterAnnotations();
int index = getParameterIndex();
if (index >= 0) {
for (Annotation[][] ifcAnns : getInterfaceParameterAnnotations()) {
for (Annotation[][] ifcAnns : getInheritedParameterAnnotations()) {
if (index < ifcAnns.length) {
Annotation[] paramAnns = ifcAnns[index];
if (paramAnns.length > 0) {

35
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -765,6 +765,24 @@ class RequestResponseBodyMethodProcessorTests {
assertThat(value).isEqualTo("foo");
}
@Test // gh-25788
void resolveArgumentTypeVariableWithAbstractMethod() throws Exception {
this.servletRequest.setContent("\"foo\"".getBytes(StandardCharsets.UTF_8));
this.servletRequest.setContentType(MediaType.APPLICATION_JSON_VALUE);
Method method = SubControllerImplementingAbstractMethod.class.getMethod("handle", Object.class);
HandlerMethod handlerMethod = new HandlerMethod(new SubControllerImplementingAbstractMethod(), method);
MethodParameter methodParameter = handlerMethod.getMethodParameters()[0];
List<HttpMessageConverter<?>> converters = List.of(new MappingJackson2HttpMessageConverter());
RequestResponseBodyMethodProcessor processor = new RequestResponseBodyMethodProcessor(converters);
assertThat(processor.supportsParameter(methodParameter)).isTrue();
String value = (String) processor.readWithMessageConverters(
this.request, methodParameter, methodParameter.getGenericParameterType());
assertThat(value).isEqualTo("foo");
}
private void assertContentDisposition(RequestResponseBodyMethodProcessor processor,
boolean expectContentDisposition, String requestURI, String comment) throws Exception {
@ -1149,4 +1167,19 @@ class RequestResponseBodyMethodProcessorTests {
}
}
abstract static class MyControllerWithAbstractMethod<A> {
public abstract A handle(@RequestBody A arg);
}
static class SubControllerImplementingAbstractMethod extends MyControllerWithAbstractMethod<String> {
@Override
public String handle(String arg) {
return arg;
}
}
}