Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

request handler methods with @ModelAttribute annotation always return a model attribute (SPR-4867)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-03-31 20:34:42 +00:00
parent 50f49ffca4
commit 72cc060eaf
3 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ public class ServletAnnotationControllerTests {
request.addParameter("age", "value2");
MockHttpServletResponse response = new MockHttpServletResponse();
servlet.service(request, response);
assertEquals("myView-name1-typeMismatch-tb1-myValue", response.getContentAsString());
assertEquals("myPath-name1-typeMismatch-tb1-myValue-yourValue", response.getContentAsString());
}
@Test
@@ -360,8 +360,7 @@ public class ServletAnnotationControllerTests {
DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator();
autoProxyCreator.setBeanFactory(wac.getBeanFactory());
wac.getBeanFactory().addBeanPostProcessor(autoProxyCreator);
wac.getBeanFactory()
.registerSingleton("advisor", new DefaultPointcutAdvisor(new SimpleTraceInterceptor()));
wac.getBeanFactory().registerSingleton("advisor", new DefaultPointcutAdvisor(new SimpleTraceInterceptor()));
wac.refresh();
return wac;
}
@@ -1108,11 +1107,12 @@ public class ServletAnnotationControllerTests {
}
@RequestMapping("/myPath.do")
@ModelAttribute("yourKey")
public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, Model model) {
if (!model.containsAttribute("myKey")) {
model.addAttribute("myKey", "myValue");
}
return "myView";
return "yourValue";
}
}
@@ -1379,9 +1379,9 @@ public class ServletAnnotationControllerTests {
}
List<TestBean> testBeans = (List<TestBean>) model.get("testBeanList");
if (errors.hasFieldErrors("age")) {
response.getWriter()
.write(viewName + "-" + tb.getName() + "-" + errors.getFieldError("age").getCode() +
"-" + testBeans.get(0).getName() + "-" + model.get("myKey"));
response.getWriter().write(viewName + "-" + tb.getName() + "-" +
errors.getFieldError("age").getCode() + "-" + testBeans.get(0).getName() + "-" +
model.get("myKey") + (model.containsKey("yourKey") ? "-" + model.get("yourKey") : ""));
}
else {
response.getWriter().write(viewName + "-" + tb.getName() + "-" + tb.getAge() + "-" +
@@ -1472,6 +1472,7 @@ public class ServletAnnotationControllerTests {
}
}
@Controller
public static class PathOrderingController {
@@ -1486,6 +1487,7 @@ public class ServletAnnotationControllerTests {
}
}
@Controller
public static class RequestBodyController {
@@ -1495,6 +1497,7 @@ public class ServletAnnotationControllerTests {
}
}
public static class MyMessageConverter implements HttpMessageConverter {
public boolean supports(Class clazz) {
@@ -1516,5 +1519,4 @@ public class ServletAnnotationControllerTests {
}
}
}