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

Replace ModelAndViewContainer parameter with Object

Browse Source
This commit is contained in:
Rossen Stoyanchev
2011-04-06 15:30:19 +00:00
parent 3ee6734424
commit ca9a3b4584
21 changed files with 92 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessorTests.java
View File

@@ -195,20 +195,18 @@ public class ModelAttributeMethodProcessorTests {
processor.resolveArgument(notAnnotatedParam, model, webRequest, binderFactory);
}
@SuppressWarnings("rawtypes")
@Test
public void handleAnnotatedReturnValue() throws Exception {
ModelAndViewContainer<?> mavContainer = new ModelAndViewContainer(model);
ModelAndViewContainer mavContainer = new ModelAndViewContainer(model);
processor.handleReturnValue("expected", annotatedReturnParam, mavContainer, webRequest);
assertEquals("expected", mavContainer.getModel().get("modelAttrName"));
}
@SuppressWarnings("rawtypes")
@Test
public void handleNotAnnotatedReturnValue() throws Exception {
TestBean testBean = new TestBean("expected");
ModelAndViewContainer<?> mavContainer = new ModelAndViewContainer(model);
ModelAndViewContainer mavContainer = new ModelAndViewContainer(model);
processor.handleReturnValue(testBean, notAnnotatedReturnParam, mavContainer, webRequest);
assertSame(testBean, mavContainer.getModel().get("testBean"));

3
org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelMethodProcessorTests.java
View File

@@ -97,7 +97,6 @@ public class ModelMethodProcessorTests {
assertSame(model, result);
}
@SuppressWarnings("rawtypes")
@Test
public void handleReturnValue() throws Exception {
ExtendedModelMap implicitModel = new ExtendedModelMap();
@@ -106,7 +105,7 @@ public class ModelMethodProcessorTests {
ExtendedModelMap returnValue = new ExtendedModelMap();
returnValue.put("attr2", "value2");
ModelAndViewContainer<?> mavContainer = new ModelAndViewContainer(implicitModel);
ModelAndViewContainer mavContainer = new ModelAndViewContainer(implicitModel);
resolver.handleReturnValue(returnValue , modelReturnType, mavContainer, webRequest);
ModelMap actualModel = mavContainer.getModel();
assertEquals("value1", actualModel.get("attr1"));

4
org.springframework.web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerContainerTests.java
View File

@@ -34,7 +34,7 @@ public class HandlerMethodReturnValueHandlerContainerTests {
private HandlerMethodReturnValueHandlerContainer container;
ModelAndViewContainer<?> mavContainer;
ModelAndViewContainer mavContainer;
private MethodParameter paramInteger;
@@ -47,7 +47,7 @@ public class HandlerMethodReturnValueHandlerContainerTests {
this.paramInteger = new MethodParameter(getClass().getDeclaredMethod("handleInteger"), -1);
this.paramString = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1);
mavContainer = new ModelAndViewContainer<Object>(null);
mavContainer = new ModelAndViewContainer(null);
}
@Test

8
org.springframework.web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
View File

@@ -47,10 +47,10 @@ public class StubReturnValueHandler implements HandlerMethodReturnValueHandler {
return returnType.getParameterType().equals(this.supportedReturnType);
}
public <V> void handleReturnValue(Object returnValue,
MethodParameter returnType,
ModelAndViewContainer<V> mavContainer,
NativeWebRequest webRequest) throws Exception {
public void handleReturnValue(Object returnValue,
MethodParameter returnType,
ModelAndViewContainer mavContainer,
NativeWebRequest webRequest) throws Exception {
this.unhandledReturnValue = returnValue;
if (returnValue != null) {
mavContainer.addModelAttribute(Conventions.getVariableName(returnValue), returnValue);