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

8
org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessor.java
View File

@@ -160,10 +160,10 @@ public class ModelAttributeMethodProcessor
return returnType.getMethodAnnotation(ModelAttribute.class) != null;
}
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 {
String name = ModelFactory.getNameForReturnValue(returnValue, returnType);
mavContainer.addModelAttribute(name, returnValue);
}

8
org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelMethodProcessor.java
View File

@@ -70,10 +70,10 @@ public class ModelMethodProcessor implements HandlerMethodArgumentResolver, Hand
}
@SuppressWarnings({ "unchecked", "rawtypes" })
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 {
if (returnValue instanceof Model) {
mavContainer.addModelAttributes((Model) returnValue);
}

8
org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java
View File

@@ -46,9 +46,9 @@ public interface HandlerMethodReturnValueHandler extends HandlerMethodProcessor
* @param webRequest the current request
* @throws Exception in case of errors
*/
<V> void handleReturnValue(Object returnValue,
MethodParameter returnType,
ModelAndViewContainer<V> mavContainer,
NativeWebRequest webRequest) throws Exception;
void handleReturnValue(Object returnValue,
MethodParameter returnType,
ModelAndViewContainer mavContainer,
NativeWebRequest webRequest) throws Exception;
}

8
org.springframework.web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerContainer.java
View File

@@ -57,10 +57,10 @@ public class HandlerMethodReturnValueHandlerContainer implements HandlerMethodRe
* Handles the given method return value by iterating over registered {@link HandlerMethodReturnValueHandler}s
* to find one that supports it.
*/
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 {
HandlerMethodReturnValueHandler handler = getReturnValueHandler(returnType);
if (handler != null) {
handler.handleReturnValue(returnValue, returnType, mavContainer, webRequest);

4
org.springframework.web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
View File

@@ -16,6 +16,7 @@
package org.springframework.web.method.support;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -201,7 +202,8 @@ public class InvocableHandlerMethod extends HandlerMethod {
if (args != null && args.length > 0) {
builder.append(" and argument types ");
for (int i = 0; i < args.length; i++) {
builder.append(" : arg[").append(i).append("] ").append(args[i].getClass());
String argClass = (args[i] != null) ? args[i].getClass().toString() : "null";
builder.append(" : arg[").append(i).append("] ").append(argClass);
}
}
else {

10
org.springframework.web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
View File

@@ -31,14 +31,12 @@ import org.springframework.ui.ModelMap;
*
* @author Rossen Stoyanchev
* @since 3.1
*
* @param <V> Servlet or Portlet specific View type.
*/
public class ModelAndViewContainer<V> {
public class ModelAndViewContainer {
private String viewName;
private V view;
private Object view;
private final ModelMap actualModel = new ExtendedModelMap();
@@ -60,11 +58,11 @@ public class ModelAndViewContainer<V> {
this.viewName = viewName;
}
public V getView() {
public Object getView() {
return this.view;
}
public void setView(V view) {
public void setView(Object view) {
this.view = view;
}

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);