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

SPR-8429 Add test cases for missing header, cookie, and pathvar values

Browse Source
This commit is contained in:
Rossen Stoyanchev
2011-06-23 12:47:54 +00:00
parent 465712c845
commit 69bba30ed8
6 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractCookieValueMethodArgumentResolver.java
View File

@@ -18,6 +18,7 @@ package org.springframework.web.method.annotation.support;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.ServletRequestBindingException;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.CookieValue;
@@ -57,10 +58,10 @@ public abstract class AbstractCookieValueMethodArgumentResolver extends Abstract
}
@Override
protected void handleMissingValue(String cookieName, MethodParameter parameter) {
String paramTypeName = parameter.getParameterType().getName();
throw new IllegalStateException(
"Missing cookie named '" + cookieName + "' for method parameter type [" + paramTypeName + "]");
protected void handleMissingValue(String cookieName, MethodParameter param) throws ServletRequestBindingException {
String paramType = param.getParameterType().getName();
throw new ServletRequestBindingException(
"Missing cookie named '" + cookieName + "' for method parameter type [" + paramType + "]");
}
private static class CookieValueNamedValueInfo extends NamedValueInfo {

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

@@ -17,7 +17,6 @@
package org.springframework.web.method.annotation.support;
import java.util.ArrayList;
import java.util.List;
import org.springframework.core.MethodParameter;
import org.springframework.ui.ModelMap;
@@ -50,9 +49,9 @@ public class ErrorsMethodArgumentResolver implements HandlerMethodArgumentResolv
WebDataBinderFactory binderFactory) throws Exception {
ModelMap model = mavContainer.getModel();
if (model.size() > 0) {
List<String> keys = new ArrayList<String>(model.keySet());
String lastKey = keys.get(model.size()-1);
if (isBindingResultKey(lastKey)) {
int lastIndex = model.size()-1;
String lastKey = new ArrayList<String>(model.keySet()).get(lastIndex);
if (lastKey.startsWith(BindingResult.MODEL_KEY_PREFIX)) {
return model.get(lastKey);
}
}
@@ -61,7 +60,4 @@ public class ErrorsMethodArgumentResolver implements HandlerMethodArgumentResolv
+ "without preceding model attribute. Check your handler method signature!");
}
private boolean isBindingResultKey(String key) {
return key.startsWith(BindingResult.MODEL_KEY_PREFIX);
}
}

9
org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolver.java
View File

@@ -20,6 +20,7 @@ import java.util.Map;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.ServletRequestBindingException;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.context.request.NativeWebRequest;
@@ -72,10 +73,10 @@ public class RequestHeaderMethodArgumentResolver extends AbstractNamedValueMetho
}
@Override
protected void handleMissingValue(String headerName, MethodParameter parameter) {
String paramTypeName = parameter.getParameterType().getName();
throw new IllegalStateException(
"Missing header '" + headerName + "' for method parameter type [" + paramTypeName + "]");
protected void handleMissingValue(String headerName, MethodParameter param) throws ServletRequestBindingException {
String paramType = param.getParameterType().getName();
throw new ServletRequestBindingException(
"Missing header '" + headerName + "' for method parameter type [" + paramType + "]");
}
private static class RequestHeaderNamedValueInfo extends NamedValueInfo {

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

@@ -165,7 +165,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
* Attempt to resolve a method parameter from the list of provided argument values.
*/
private Object resolveProvidedArgument(MethodParameter parameter, Object... providedArgs) {
if (providedArgs == null) {
if (providedArgs == null || parameter.hasParameterAnnotations()) {
return null;
}
for (Object providedArg : providedArgs) {