The default value is {@code true}. + *
The default value is {@code true}.
*/
public void setUseSuffixPatternMatch(boolean useSuffixPatternMatch) {
this.useSuffixPatternMatch = useSuffixPatternMatch;
}
-
+
/**
* Whether to match to URLs irrespective of the presence of a trailing slash.
* If enabled a method mapped to "/users" also matches to "/users/".
@@ -78,21 +78,22 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}
* Expects a handler to have a type-level @{@link Controller} annotation.
*/
@Override
protected boolean isHandler(Class beanType) {
- return AnnotationUtils.findAnnotation(beanType, Controller.class) != null;
+ return ((AnnotationUtils.findAnnotation(beanType, Controller.class) != null) ||
+ (AnnotationUtils.findAnnotation(beanType, RequestMapping.class) != null));
}
/**
* Uses method and type-level @{@link RequestMapping} annotations to create
* the RequestMappingInfo.
- *
+ *
* @return the created RequestMappingInfo, or {@code null} if the method
* does not have a {@code @RequestMapping} annotation.
- *
+ *
* @see #getCustomMethodCondition(Method)
* @see #getCustomTypeCondition(Class)
*/
@@ -114,22 +115,22 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
/**
* Provide a custom method-level request condition.
- * The custom {@link RequestCondition} can be of any type so long as the
+ * The custom {@link RequestCondition} can be of any type so long as the
* same condition type is returned from all calls to this method in order
- * to ensure custom request conditions can be combined and compared.
+ * to ensure custom request conditions can be combined and compared.
* @param method the handler method for which to create the condition
* @return the condition, or {@code null}
*/
protected RequestCondition getCustomMethodCondition(Method method) {
return null;
}
-
+
/**
* Provide a custom type-level request condition.
- * The custom {@link RequestCondition} can be of any type so long as the
+ * The custom {@link RequestCondition} can be of any type so long as the
* same condition type is returned from all calls to this method in order
- * to ensure custom request conditions can be combined and compared.
- * @param method the handler method for which to create the condition
+ * to ensure custom request conditions can be combined and compared.
+ * @param handlerType the handler type for which to create the condition
* @return the condition, or {@code null}
*/
protected RequestCondition getCustomTypeCondition(Class handlerType) {
@@ -141,13 +142,13 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
*/
private RequestMappingInfo createRequestMappingInfo(RequestMapping annotation, RequestCondition customCondition) {
return new RequestMappingInfo(
- new PatternsRequestCondition(annotation.value(),
+ new PatternsRequestCondition(annotation.value(),
getUrlPathHelper(), getPathMatcher(), this.useSuffixPatternMatch, this.useTrailingSlashMatch),
new RequestMethodsRequestCondition(annotation.method()),
new ParamsRequestCondition(annotation.params()),
new HeadersRequestCondition(annotation.headers()),
new ConsumesRequestCondition(annotation.consumes(), annotation.headers()),
- new ProducesRequestCondition(annotation.produces(), annotation.headers()),
+ new ProducesRequestCondition(annotation.produces(), annotation.headers()),
customCondition);
}
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
index e624933bdd8..3816f4b5de8 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
@@ -51,37 +51,37 @@ import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.ModelAndView;
/**
- * Test various scenarios for detecting method-level and method parameter annotations depending
- * on where they are located -- on interfaces, parent classes, in parameterized methods, or in
+ * Test various scenarios for detecting method-level and method parameter annotations depending
+ * on where they are located -- on interfaces, parent classes, in parameterized methods, or in
* combination with proxies.
- *
+ *
* @author Rossen Stoyanchev
*/
@RunWith(Parameterized.class)
public class HandlerMethodAnnotationDetectionTests {
-
+
@Parameters
public static Collection All annotations can be on methods in the abstract class except parameter annotations.
*/
static class AbstractClassController extends MappingAbstractClass {
@@ -202,14 +202,15 @@ public class HandlerMethodAnnotationDetectionTests {
public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
return date;
}
-
+
public String handleException(Exception exception) {
return exception.getMessage();
}
}
-
-
- @Controller
+
+ // SPR-9374
+
+ @RequestMapping
static interface MappingInterface {
@InitBinder
@@ -221,15 +222,15 @@ public class HandlerMethodAnnotationDetectionTests {
@RequestMapping(value="/path1/path2", method=RequestMethod.POST)
@ModelAttribute("attr2")
Date handle(@RequestHeader("header2") Date date, Model model) throws Exception;
-
+
@ExceptionHandler(Exception.class)
@ResponseBody
String handleException(Exception exception);
- }
+ }
/**
* CONTROLLER WITH INTERFACE
- *
+ *
* No AOP:
* All annotations can be on interface methods except parameter annotations.
*
@@ -250,7 +251,7 @@ public class HandlerMethodAnnotationDetectionTests {
public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
return date;
}
-
+
public String handleException(Exception exception) {
return exception.getMessage();
}
@@ -269,15 +270,15 @@ public class HandlerMethodAnnotationDetectionTests {
@RequestMapping(value="/path1/path2", method=RequestMethod.POST)
@ModelAttribute("attr2")
public abstract Date handle(C date, Model model) throws Exception;
-
+
@ExceptionHandler(Exception.class)
@ResponseBody
public abstract String handleException(Exception exception);
- }
+ }
/**
* CONTROLLER WITH PARAMETERIZED BASE CLASS
- *
+ *
* All annotations can be on methods in the abstract class except parameter annotations.
*/
static class ParameterizedAbstractClassController extends MappingParameterizedAbstractClass All annotations can be on interface except parameter annotations.
- *
+ *
* Cannot be used as JDK dynamic proxy since parameterized interface does not contain type information.
*/
static class ParameterizedInterfaceController implements MappingParameterizedInterface Support class contains all annotations. Subclass has type-level @{@link RequestMapping}.
*/
@Controller
@@ -377,17 +377,17 @@ public class HandlerMethodAnnotationDetectionTests {
public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
return date;
}
-
+
@ExceptionHandler(Exception.class)
@ResponseBody
public String handleException(Exception exception) {
return exception.getMessage();
}
- }
+ }
@Controller
@RequestMapping("/path1")
static class SupportClassController extends MappingSupportClass {
- }
+ }
}