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

Merge pull request #25092 from jkatada:fix-ModelAndView-status-for-redirect 

* gh-25092:
  Fix for ModelAndView.status not working with RedirectView
This commit is contained in:
Arjen Poutsma 2021-12-07 13:56:19 +01:00
parent 14f24f43d7 9261766677
commit c0f79ee00a
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
View File

@ -1395,6 +1395,7 @@ public class DispatcherServlet extends FrameworkServlet {
}
try {
if (mv.getStatus() != null) {
request.setAttribute(View.RESPONSE_STATUS_ATTRIBUTE, mv.getStatus());
response.setStatus(mv.getStatus().value());
}
view.render(mv.getModelInternal(), request, response);

17
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
View File

@ -1897,6 +1897,18 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
assertThat(response.getForwardedUrl()).isEqualTo("view");
}
@PathPatternsParameterizedTest
void modelAndViewWithStatusForRedirect(boolean usePathPatterns) throws Exception {
initDispatcherServlet(ModelAndViewController.class, usePathPatterns);
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/redirect");
MockHttpServletResponse response = new MockHttpServletResponse();
getServlet().service(request, response);
assertThat(response.getStatus()).isEqualTo(307);
assertThat(response.getRedirectedUrl()).isEqualTo("/path");
}
@PathPatternsParameterizedTest // SPR-14796
void modelAndViewWithStatusInExceptionHandler(boolean usePathPatterns) throws Exception {
initDispatcherServlet(ModelAndViewController.class, usePathPatterns);
@ -3872,6 +3884,11 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
return new ModelAndView("view", HttpStatus.UNPROCESSABLE_ENTITY);
}
@RequestMapping("/redirect")
public ModelAndView methodWithHttpStatusForRedirect(MyEntity object) {
return new ModelAndView("redirect:/path", HttpStatus.TEMPORARY_REDIRECT);
}
@RequestMapping("/exception")
public void raiseException() throws Exception {
throw new TestException();