support for methods that declared in interfaces and implemented in super

class

Author: s-mop

spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@@ -556,7 +556,7 @@ public static <A extends Annotation> A findAnnotation(Method method, @Nullable C
 	}
 
 	@Nullable
-	private static <A extends Annotation> A searchOnInterfaces(Method method, Class<A> annotationType, Class<?>... ifcs) {
+	public static <A extends Annotation> A searchOnInterfaces(Method method, Class<A> annotationType, Class<?>... ifcs) {
 		for (Class<?> ifc : ifcs) {
 			Set<Method> annotatedMethods = getAnnotatedMethodsInBaseType(ifc);
 			if (!annotatedMethods.isEmpty()) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java

@@ -28,6 +28,7 @@
 
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.Assert;
@@ -218,6 +219,9 @@ protected boolean isHandler(Class<?> beanType) {
 	@Nullable
 	protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handlerType) {
 		RequestMappingInfo info = createRequestMappingInfo(method);
+		if (info == null) {
+			info = createRequestMappingInfo(method, handlerType.getInterfaces());
+		}
 		if (info != null) {
 			RequestMappingInfo typeInfo = createRequestMappingInfo(handlerType);
 			if (typeInfo != null) {
@@ -259,6 +263,17 @@ private RequestMappingInfo createRequestMappingInfo(AnnotatedElement element) {
 				getCustomTypeCondition((Class<?>) element) : getCustomMethodCondition((Method) element));
 		return (requestMapping != null ? createRequestMappingInfo(requestMapping, condition) : null);
 	}
+	
+	/**
+	 * support for methods that declared in interfaces and implemented in super class
+	 * @since 5.1
+	 */
+	@Nullable
+	private RequestMappingInfo createRequestMappingInfo(Method method, Class<?>[] ifcs) {
+		RequestMapping requestMapping = AnnotationUtils.searchOnInterfaces(method, RequestMapping.class, ifcs);
+		RequestCondition<?> condition = getCustomMethodCondition(method);
+		return (requestMapping != null ? createRequestMappingInfo(requestMapping, condition) : null);
+	}
 
 	/**
 	 * Provide a custom type-level request condition.