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-7060 - @ResponseStatus: The reason value is not used.

This commit is contained in:
Arjen Poutsma 2010-04-02 08:39:26 +00:00
parent 580dc8e72a
commit 8a1a23af83
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,9 +814,17 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
ResponseStatus responseStatusAnn = AnnotationUtils.findAnnotation(handlerMethod, ResponseStatus.class); ResponseStatus responseStatusAnn = AnnotationUtils.findAnnotation(handlerMethod, ResponseStatus.class);
if (responseStatusAnn != null) { if (responseStatusAnn != null) {
HttpStatus responseStatus = responseStatusAnn.value(); HttpStatus responseStatus = responseStatusAnn.value();
String reason = responseStatusAnn.reason();
if (!StringUtils.hasText(reason)) {
webRequest.getResponse().setStatus(responseStatus.value());
}
else {
webRequest.getResponse().sendError(responseStatus.value(), reason);
}
// to be picked up by the RedirectView // to be picked up by the RedirectView
webRequest.getRequest().setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, responseStatus); webRequest.getRequest().setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, responseStatus);
webRequest.getResponse().setStatus(responseStatus.value());
responseArgumentUsed = true; responseArgumentUsed = true;
} }

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

@ -1307,6 +1307,7 @@ public class ServletAnnotationControllerTests {
servlet.service(request, response); servlet.service(request, response);
assertEquals("something", response.getContentAsString()); assertEquals("something", response.getContentAsString());
assertEquals(201, response.getStatus()); assertEquals(201, response.getStatus());
assertEquals("It's alive!", response.getErrorMessage());
} }
@Test @Test
@ -2382,7 +2383,7 @@ public class ServletAnnotationControllerTests {
public static class ResponseStatusController { public static class ResponseStatusController {
@RequestMapping("/something") @RequestMapping("/something")
@ResponseStatus(HttpStatus.CREATED) @ResponseStatus(value = HttpStatus.CREATED, reason = "It's alive!")
public void handle(Writer writer) throws IOException { public void handle(Writer writer) throws IOException {
writer.write("something"); writer.write("something");
} }