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-7608 ALLOW EXCEPTION WHEN MODEL ATTR IS CREATED FROM URI VARIABLE 

When a @ModelAttribute is instantiated from a URI variable with type
conversion, if conversion fails allow the exception to propagate. 
This is consistent with what happens on type conversion failure with
@PathVariable and other args that rely on type conversion.
This commit is contained in:
Rossen Stoyanchev 2011-09-27 11:22:43 +00:00
parent 5afe139285
commit 57fffb147c
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletModelAttributeMethodProcessor.java
View File

@ -36,7 +36,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ServletRequestDataB
* A Servlet-specific {@link ModelAttributeMethodProcessor} that applies data
* binding through a WebDataBinder of type {@link ServletRequestDataBinder}.
*
* <p>Also adds a fall-back strategy to instantiate a model attribute from a
* <p>Adds a fall-back strategy to instantiate a model attribute from a
* URI template variable combined with type conversion, if the model attribute
* name matches to a URI template variable name.
*
@ -57,28 +57,20 @@ public class ServletModelAttributeMethodProcessor extends ModelAttributeMethodPr
/**
* Add a fall-back strategy to instantiate the model attribute from a URI
* template variable and type conversion, assuming the model attribute
* name matches to a URI variable name. If instantiation fails for _any_
* reason, the call is delegated to the base class.
* template variable with type conversion, if the model attribute name
* matches to a URI variable name.
*/
@Override
protected Object createAttribute(String attributeName,
MethodParameter parameter,
WebDataBinderFactory binderFactory,
NativeWebRequest request) throws Exception {
Map<String, String> uriVariables = getUriTemplateVariables(request);
if (uriVariables.containsKey(attributeName)) {
try {
DataBinder binder = binderFactory.createBinder(request, null, attributeName);
return binder.convertIfNecessary(uriVariables.get(attributeName), parameter.getParameterType());
} catch (Exception exception) {
logger.info("Model attribute name '" + attributeName + "' matches to a URI template variable name "
+ "but the variable String value could not be converted into an attribute instance: "
+ exception.getMessage());
}
DataBinder binder = binderFactory.createBinder(request, null, attributeName);
return binder.convertIfNecessary(uriVariables.get(attributeName), parameter.getParameterType());
}
return super.createAttribute(attributeName, parameter, binderFactory, request);
@ -90,7 +82,7 @@ public class ServletModelAttributeMethodProcessor extends ModelAttributeMethodPr
Map<String, String> uriTemplateVars =
(Map<String, String>) request.getAttribute(
HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
return (uriTemplateVars != null) ? uriTemplateVars : Collections.<String, String>emptyMap();
}