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

SPR-7345 - HTTP 405 (Method not supported) returned when 404 Status (Not Found) was expected

This commit is contained in:
Arjen Poutsma 2010-07-16 10:06:19 +00:00
parent b456bc107b
commit 228c0b18cb
2 changed files with 111 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@ -507,41 +507,30 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
Set<String> allowedMethods = new LinkedHashSet<String>(7); Set<String> allowedMethods = new LinkedHashSet<String>(7);
String resolvedMethodName = null; String resolvedMethodName = null;
for (Method handlerMethod : getHandlerMethods()) { for (Method handlerMethod : getHandlerMethods()) {
RequestMappingInfo mappingInfo = new RequestMappingInfo(); RequestMappingInfo mappingInfo = createRequestMappingInfo(handlerMethod);
RequestMapping mapping = AnnotationUtils.findAnnotation(handlerMethod, RequestMapping.class);
mappingInfo.paths = mapping.value();
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.method(), getTypeLevelMapping().method())) {
mappingInfo.methods = mapping.method();
}
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.params(), getTypeLevelMapping().params())) {
mappingInfo.params = mapping.params();
}
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.headers(), getTypeLevelMapping().headers())) {
mappingInfo.headers = mapping.headers();
}
boolean match = false; boolean match = false;
if (mappingInfo.paths.length > 0) { if (mappingInfo.hasPatterns()) {
List<String> matchedPaths = new ArrayList<String>(mappingInfo.paths.length); List<String> matchingPatterns = new ArrayList<String>(mappingInfo.patterns.length);
for (String mappedPattern : mappingInfo.paths) { for (String pattern : mappingInfo.patterns) {
if (!hasTypeLevelMapping() && !mappedPattern.startsWith("/")) { if (!hasTypeLevelMapping() && !pattern.startsWith("/")) {
mappedPattern = "/" + mappedPattern; pattern = "/" + pattern;
} }
String matchedPattern = getMatchedPattern(mappedPattern, lookupPath, request); String combinedPattern = getCombinedPattern(pattern, lookupPath, request);
if (matchedPattern != null) { if (combinedPattern != null) {
if (mappingInfo.matches(request)) { if (mappingInfo.matches(request)) {
match = true; match = true;
matchedPaths.add(matchedPattern); matchingPatterns.add(combinedPattern);
} }
else { else {
for (RequestMethod requestMethod : mappingInfo.methods) { if (!mappingInfo.matchesRequestMethod(request)) {
allowedMethods.add(requestMethod.toString()); allowedMethods.addAll(mappingInfo.methodNames());
} }
break; break;
} }
} }
} }
Collections.sort(matchedPaths, pathComparator); Collections.sort(matchingPatterns, pathComparator);
mappingInfo.matchedPaths = matchedPaths; mappingInfo.matchedPatterns = matchingPatterns;
} }
else { else {
// No paths specified: parameter match sufficient. // No paths specified: parameter match sufficient.
@ -551,15 +540,15 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
match = false; match = false;
} }
else { else {
for (RequestMethod requestMethod : mappingInfo.methods) { if (!mappingInfo.matchesRequestMethod(request)) {
allowedMethods.add(requestMethod.toString()); allowedMethods.addAll(mappingInfo.methodNames());
} }
} }
} }
if (match) { if (match) {
Method oldMappedMethod = targetHandlerMethods.put(mappingInfo, handlerMethod); Method oldMappedMethod = targetHandlerMethods.put(mappingInfo, handlerMethod);
if (oldMappedMethod != null && oldMappedMethod != handlerMethod) { if (oldMappedMethod != null && oldMappedMethod != handlerMethod) {
if (methodNameResolver != null && mappingInfo.paths.length == 0) { if (methodNameResolver != null && mappingInfo.patterns.length == 0) {
if (!oldMappedMethod.getName().equals(handlerMethod.getName())) { if (!oldMappedMethod.getName().equals(handlerMethod.getName())) {
if (resolvedMethodName == null) { if (resolvedMethodName == null) {
resolvedMethodName = methodNameResolver.getHandlerMethodName(request); resolvedMethodName = methodNameResolver.getHandlerMethodName(request);
@ -594,7 +583,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
new RequestMappingInfoComparator(pathComparator, request); new RequestMappingInfoComparator(pathComparator, request);
Collections.sort(matches, requestMappingInfoComparator); Collections.sort(matches, requestMappingInfoComparator);
RequestMappingInfo bestMappingMatch = matches.get(0); RequestMappingInfo bestMappingMatch = matches.get(0);
String bestMatchedPath = bestMappingMatch.bestMatchedPath(); String bestMatchedPath = bestMappingMatch.bestMatchedPattern();
if (bestMatchedPath != null) { if (bestMatchedPath != null) {
extractHandlerMethodUriTemplates(bestMatchedPath, lookupPath, request); extractHandlerMethodUriTemplates(bestMatchedPath, lookupPath, request);
} }
@ -605,21 +594,38 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
throw new HttpRequestMethodNotSupportedException(request.getMethod(), throw new HttpRequestMethodNotSupportedException(request.getMethod(),
StringUtils.toStringArray(allowedMethods)); StringUtils.toStringArray(allowedMethods));
} }
else { throw new NoSuchRequestHandlingMethodException(lookupPath, request.getMethod(),
throw new NoSuchRequestHandlingMethodException(lookupPath, request.getMethod(), request.getParameterMap());
request.getParameterMap());
}
} }
} }
private RequestMappingInfo createRequestMappingInfo(Method handlerMethod) {
RequestMappingInfo mappingInfo = new RequestMappingInfo();
RequestMapping mapping = AnnotationUtils.findAnnotation(handlerMethod, RequestMapping.class);
mappingInfo.patterns = mapping.value();
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.method(), getTypeLevelMapping().method())) {
mappingInfo.methods = mapping.method();
}
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.params(), getTypeLevelMapping().params())) {
mappingInfo.params = mapping.params();
}
if (!hasTypeLevelMapping() || !Arrays.equals(mapping.headers(), getTypeLevelMapping().headers())) {
mappingInfo.headers = mapping.headers();
}
return mappingInfo;
}
/** /**
* Determines the matched pattern for the given methodLevelPattern and path. * Determines the combined pattern for the given methodLevelPattern and path.
* <p>Uses the following algorithm: <ol> <li>If there is a type-level mapping with path information, it is {@linkplain * <p>Uses the following algorithm: <ol>
* PathMatcher#combine(String, String) combined} with the method-level pattern. <li>If there is a {@linkplain * <li>If there is a type-level mapping with path information, it is {@linkplain
* HandlerMapping#BEST_MATCHING_PATTERN_ATTRIBUTE best matching pattern} in the request, it is combined with the * PathMatcher#combine(String, String) combined} with the method-level pattern.</li>
* method-level pattern. <li>Otherwise, * <li>If there is a {@linkplain HandlerMapping#BEST_MATCHING_PATTERN_ATTRIBUTE best matching pattern} in the
* request, it is combined with the method-level pattern.</li>
* <li>Otherwise, the method-level pattern is returned.</li>
* </ol>
*/ */
private String getMatchedPattern(String methodLevelPattern, String lookupPath, HttpServletRequest request) { private String getCombinedPattern(String methodLevelPattern, String lookupPath, HttpServletRequest request) {
if (hasTypeLevelMapping() && (!ObjectUtils.isEmpty(getTypeLevelMapping().value()))) { if (hasTypeLevelMapping() && (!ObjectUtils.isEmpty(getTypeLevelMapping().value()))) {
String[] typeLevelPatterns = getTypeLevelMapping().value(); String[] typeLevelPatterns = getTypeLevelMapping().value();
for (String typeLevelPattern : typeLevelPatterns) { for (String typeLevelPattern : typeLevelPatterns) {
@ -978,9 +984,9 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
*/ */
static class RequestMappingInfo { static class RequestMappingInfo {
String[] paths = new String[0]; String[] patterns = new String[0];
List<String> matchedPaths = Collections.emptyList(); List<String> matchedPatterns = Collections.emptyList();
RequestMethod[] methods = new RequestMethod[0]; RequestMethod[] methods = new RequestMethod[0];
@ -988,28 +994,69 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
String[] headers = new String[0]; String[] headers = new String[0];
public String bestMatchedPath() { public boolean hasPatterns() {
return (!this.matchedPaths.isEmpty() ? this.matchedPaths.get(0) : null); return patterns.length > 0;
}
public String bestMatchedPattern() {
return (!this.matchedPatterns.isEmpty() ? this.matchedPatterns.get(0) : null);
} }
public boolean matches(HttpServletRequest request) { public boolean matches(HttpServletRequest request) {
return ServletAnnotationMappingUtils.checkRequestMethod(this.methods, request) && return matchesRequestMethod(request) && matchesParameters(request) && matchesHeaders(request);
ServletAnnotationMappingUtils.checkParameters(this.params, request) && }
ServletAnnotationMappingUtils.checkHeaders(this.headers, request);
public boolean matchesHeaders(HttpServletRequest request) {
return ServletAnnotationMappingUtils.checkHeaders(this.headers, request);
}
public boolean matchesParameters(HttpServletRequest request) {
return ServletAnnotationMappingUtils.checkParameters(this.params, request);
}
public boolean matchesRequestMethod(HttpServletRequest request) {
return ServletAnnotationMappingUtils.checkRequestMethod(this.methods, request);
}
public Set<String> methodNames() {
Set<String> methodNames = new LinkedHashSet<String>(methods.length);
for (RequestMethod method : methods) {
methodNames.add(method.name());
}
return methodNames;
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
RequestMappingInfo other = (RequestMappingInfo) obj; RequestMappingInfo other = (RequestMappingInfo) obj;
return (Arrays.equals(this.paths, other.paths) && Arrays.equals(this.methods, other.methods) && return (Arrays.equals(this.patterns, other.patterns) && Arrays.equals(this.methods, other.methods) &&
Arrays.equals(this.params, other.params) && Arrays.equals(this.headers, other.headers)); Arrays.equals(this.params, other.params) && Arrays.equals(this.headers, other.headers));
} }
@Override @Override
public int hashCode() { public int hashCode() {
return (Arrays.hashCode(this.paths) * 23 + Arrays.hashCode(this.methods) * 29 + return (Arrays.hashCode(this.patterns) * 23 + Arrays.hashCode(this.methods) * 29 +
Arrays.hashCode(this.params) * 31 + Arrays.hashCode(this.headers)); Arrays.hashCode(this.params) * 31 + Arrays.hashCode(this.headers));
} }
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append(Arrays.asList(patterns));
if (methods.length > 0) {
builder.append(',');
builder.append(Arrays.asList(methods));
}
if (headers.length > 0) {
builder.append(',');
builder.append(Arrays.asList(headers));
}
if (params.length > 0) {
builder.append(',');
builder.append(Arrays.asList(params));
}
return builder.toString();
}
} }
@ -1017,7 +1064,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
* Comparator capable of sorting {@link RequestMappingInfo}s (RHIs) so that sorting a list with this comparator will * Comparator capable of sorting {@link RequestMappingInfo}s (RHIs) so that sorting a list with this comparator will
* result in: * result in:
* <ul> * <ul>
* <li>RHIs with {@linkplain RequestMappingInfo#matchedPaths better matched paths} take prescedence * <li>RHIs with {@linkplain RequestMappingInfo#matchedPatterns better matched paths} take prescedence
* over those with a weaker match (as expressed by the {@linkplain PathMatcher#getPatternComparator(String) path * over those with a weaker match (as expressed by the {@linkplain PathMatcher#getPatternComparator(String) path
* pattern comparator}.) Typically, this means that patterns without wild cards and uri templates will be ordered * pattern comparator}.) Typically, this means that patterns without wild cards and uri templates will be ordered
* before those without.</li> * before those without.</li>
@ -1039,7 +1086,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
} }
public int compare(RequestMappingInfo info1, RequestMappingInfo info2) { public int compare(RequestMappingInfo info1, RequestMappingInfo info2) {
int pathComparison = pathComparator.compare(info1.bestMatchedPath(), info2.bestMatchedPath()); int pathComparison = pathComparator.compare(info1.bestMatchedPattern(), info2.bestMatchedPattern());
if (pathComparison != 0) { if (pathComparison != 0) {
return pathComparison; return pathComparison;
} }

25
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
View File

@ -1071,7 +1071,7 @@ public class ServletAnnotationControllerTests {
@Test @Test
public void requestBodyResponseBody() throws ServletException, IOException { public void requestBodyResponseBody() throws ServletException, IOException {
initServlet(RequestBodyController.class); initServlet(RequestResponseBodyController.class);
MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something"); MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something");
String requestBody = "Hello World"; String requestBody = "Hello World";
@ -1090,7 +1090,7 @@ public class ServletAnnotationControllerTests {
@Override @Override
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
GenericWebApplicationContext wac = new GenericWebApplicationContext(); GenericWebApplicationContext wac = new GenericWebApplicationContext();
wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestBodyController.class)); wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestResponseBodyController.class));
RootBeanDefinition converterDef = new RootBeanDefinition(StringHttpMessageConverter.class); RootBeanDefinition converterDef = new RootBeanDefinition(StringHttpMessageConverter.class);
converterDef.getPropertyValues().add("supportedMediaTypes", new MediaType("text", "plain")); converterDef.getPropertyValues().add("supportedMediaTypes", new MediaType("text", "plain"));
RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class); RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class);
@ -1116,7 +1116,7 @@ public class ServletAnnotationControllerTests {
@Test @Test
public void responseBodyWildCardMediaType() throws ServletException, IOException { public void responseBodyWildCardMediaType() throws ServletException, IOException {
initServlet(RequestBodyController.class); initServlet(RequestResponseBodyController.class);
MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something"); MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something");
String requestBody = "Hello World"; String requestBody = "Hello World";
@ -1134,7 +1134,7 @@ public class ServletAnnotationControllerTests {
@Override @Override
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
GenericWebApplicationContext wac = new GenericWebApplicationContext(); GenericWebApplicationContext wac = new GenericWebApplicationContext();
wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestBodyController.class)); wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestResponseBodyController.class));
RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class); RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class);
adapterDef.getPropertyValues().add("messageConverters", new ByteArrayHttpMessageConverter()); adapterDef.getPropertyValues().add("messageConverters", new ByteArrayHttpMessageConverter());
wac.registerBeanDefinition("handlerAdapter", adapterDef); wac.registerBeanDefinition("handlerAdapter", adapterDef);
@ -1150,14 +1150,13 @@ public class ServletAnnotationControllerTests {
request.addHeader("Content-Type", "application/pdf"); request.addHeader("Content-Type", "application/pdf");
MockHttpServletResponse response = new MockHttpServletResponse(); MockHttpServletResponse response = new MockHttpServletResponse();
servlet.service(request, response); servlet.service(request, response);
assertEquals("Invalid response status code", HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, assertEquals(415, response.getStatus());
response.getStatus());
assertNotNull("No Accept response header set", response.getHeader("Accept")); assertNotNull("No Accept response header set", response.getHeader("Accept"));
} }
@Test @Test
public void responseBodyNoAcceptHeader() throws ServletException, IOException { public void responseBodyNoAcceptHeader() throws ServletException, IOException {
initServlet(RequestBodyController.class); initServlet(RequestResponseBodyController.class);
MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something"); MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/something");
String requestBody = "Hello World"; String requestBody = "Hello World";
@ -1175,7 +1174,7 @@ public class ServletAnnotationControllerTests {
@Override @Override
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
GenericWebApplicationContext wac = new GenericWebApplicationContext(); GenericWebApplicationContext wac = new GenericWebApplicationContext();
wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestBodyController.class)); wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestResponseBodyController.class));
RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class); RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class);
adapterDef.getPropertyValues().add("messageConverters", new NotReadableMessageConverter()); adapterDef.getPropertyValues().add("messageConverters", new NotReadableMessageConverter());
wac.registerBeanDefinition("handlerAdapter", adapterDef); wac.registerBeanDefinition("handlerAdapter", adapterDef);
@ -1226,7 +1225,7 @@ public class ServletAnnotationControllerTests {
@Override @Override
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
GenericWebApplicationContext wac = new GenericWebApplicationContext(); GenericWebApplicationContext wac = new GenericWebApplicationContext();
wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestBodyController.class)); wac.registerBeanDefinition("controller", new RootBeanDefinition(RequestResponseBodyController.class));
RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class); RootBeanDefinition adapterDef = new RootBeanDefinition(AnnotationMethodHandlerAdapter.class);
List<HttpMessageConverter> messageConverters = new ArrayList<HttpMessageConverter>(); List<HttpMessageConverter> messageConverters = new ArrayList<HttpMessageConverter>();
messageConverters.add(new StringHttpMessageConverter()); messageConverters.add(new StringHttpMessageConverter());
@ -1314,6 +1313,12 @@ public class ServletAnnotationControllerTests {
response = new MockHttpServletResponse(); response = new MockHttpServletResponse();
servlet.service(request, response); servlet.service(request, response);
assertEquals("text", response.getContentAsString()); assertEquals("text", response.getContentAsString());
request = new MockHttpServletRequest("POST", "/something");
request.addHeader("Content-Type", "application/xml");
response = new MockHttpServletResponse();
servlet.service(request, response);
assertEquals(404, response.getStatus());
} }
@Test @Test
@ -2340,7 +2345,7 @@ public class ServletAnnotationControllerTests {
} }
@Controller @Controller
public static class RequestBodyController { public static class RequestResponseBodyController {
@RequestMapping(value = "/something", method = RequestMethod.PUT) @RequestMapping(value = "/something", method = RequestMethod.PUT)
@ResponseBody @ResponseBody