|
|
@ -246,13 +246,13 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi |
|
|
|
if (annotatedElement instanceof Class<?>) { |
|
|
|
if (annotatedElement instanceof Class<?>) { |
|
|
|
Class<?> type = (Class<?>) annotatedElement; |
|
|
|
Class<?> type = (Class<?>) annotatedElement; |
|
|
|
annotation = AnnotationUtils.findAnnotation(type, RequestMapping.class); |
|
|
|
annotation = AnnotationUtils.findAnnotation(type, RequestMapping.class); |
|
|
|
attributes = AnnotatedElementUtils.getAnnotationAttributes(type, annotationType); |
|
|
|
attributes = AnnotatedElementUtils.findAnnotationAttributes(type, annotationType); |
|
|
|
customCondition = getCustomTypeCondition(type); |
|
|
|
customCondition = getCustomTypeCondition(type); |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|
Method method = (Method) annotatedElement; |
|
|
|
Method method = (Method) annotatedElement; |
|
|
|
annotation = AnnotationUtils.findAnnotation(method, RequestMapping.class); |
|
|
|
annotation = AnnotationUtils.findAnnotation(method, RequestMapping.class); |
|
|
|
attributes = AnnotatedElementUtils.getAnnotationAttributes(method, annotationType); |
|
|
|
attributes = AnnotatedElementUtils.findAnnotationAttributes(method, annotationType); |
|
|
|
customCondition = getCustomMethodCondition(method); |
|
|
|
customCondition = getCustomMethodCondition(method); |
|
|
|
} |
|
|
|
} |
|
|
|
RequestMappingInfo info = null; |
|
|
|
RequestMappingInfo info = null; |
|
|
|