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

SPR-5251: URI Templates for @InitBinder

Browse Source
This commit is contained in:
Arjen Poutsma
2008-11-18 12:37:12 +00:00
parent fe72e8a5f7
commit b33db73c93
3 changed files with 120 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web.servlet/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
View File

@@ -280,6 +280,7 @@ public class HandlerMethodInvoker {
String paramName = null;
boolean paramRequired = false;
String paramDefaultValue = null;
String pathVarName = null;
Object[] paramAnns = methodParam.getParameterAnnotations();
for (Object paramAnn : paramAnns) {
@@ -294,9 +295,13 @@ public class HandlerMethodInvoker {
throw new IllegalStateException(
"@ModelAttribute is not supported on @InitBinder methods: " + initBinderMethod);
}
else if (PathVariable.class.isInstance(paramAnn)) {
PathVariable pathVar = (PathVariable) paramAnn;
pathVarName = pathVar.value();
}
}
if (paramName == null) {
if (paramName == null && pathVarName == null) {
Object argValue = resolveCommonArgument(methodParam, webRequest);
if (argValue != WebArgumentResolver.UNRESOLVED) {
initBinderArgs[i] = argValue;
@@ -319,6 +324,8 @@ public class HandlerMethodInvoker {
if (paramName != null) {
initBinderArgs[i] =
resolveRequestParam(paramName, paramRequired, paramDefaultValue, methodParam, webRequest, null);
} else if (pathVarName != null) {
initBinderArgs[i] = resolvePathVariable(pathVarName, methodParam, webRequest, null);
}
}