Use default value for empty values in @RequestParam

Issue: SPR-10180
Hyacinth · Feb 15, 2013 · 221562d · 221562d
1 parent f5c9fe6
commit 221562d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/...a/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java b/...a/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java
@@ -92,6 +92,9 @@ else if (namedValueInfo.required) {
 			}
 			arg = handleNullValue(namedValueInfo.name, arg, paramType);
 		}
+		else if ("".equals(arg) && (namedValueInfo.defaultValue != null)) {
+			arg = resolveDefaultValue(namedValueInfo.defaultValue);
+		}
 
 		if (binderFactory != null) {
 			WebDataBinder binder = binderFactory.createBinder(webRequest, null, namedValueInfo.name);

diff --git a/...va/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/...va/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
@@ -68,6 +68,7 @@ public class RequestParamMethodArgumentResolverTests {
 	private MethodParameter paramMultipartFileList;
 	private MethodParameter paramServlet30Part;
 	private MethodParameter paramRequestPartAnnot;
+	private MethodParameter paramRequired;
 
 	private NativeWebRequest webRequest;
 
@@ -80,7 +81,7 @@ public void setUp() throws Exception {
 		ParameterNameDiscoverer paramNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
 
 		Method method = getClass().getMethod("params", String.class, String[].class, Map.class, MultipartFile.class,
-				Map.class, String.class, MultipartFile.class, List.class, Part.class, MultipartFile.class);
+				Map.class, String.class, MultipartFile.class, List.class, Part.class, MultipartFile.class, String.class);
 
 		paramNamedDefaultValueString = new MethodParameter(method, 0);
 		paramNamedStringArray = new MethodParameter(method, 1);
@@ -96,6 +97,7 @@ public void setUp() throws Exception {
 		paramServlet30Part = new MethodParameter(method, 8);
 		paramServlet30Part.initParameterNameDiscovery(paramNameDiscoverer);
 		paramRequestPartAnnot = new MethodParameter(method, 9);
+		paramRequired = new MethodParameter(method, 10);
 
 		request = new MockHttpServletRequest();
 		webRequest = new ServletWebRequest(request, new MockHttpServletResponse());
@@ -257,16 +259,41 @@ public void resolveSimpleTypeParamToNull() throws Exception {
 		assertNull(result);
 	}
 
+	// SPR-10180
+
+	@Test
+	public void resolveEmptyValueToDefault() throws Exception {
+		this.request.addParameter("name", "");
+		Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null);
+		assertEquals("bar", result);
+	}
+
+	@Test
+	public void resolveEmptyValueWithoutDefault() throws Exception {
+		this.request.addParameter("stringNotAnnot", "");
+		Object result = resolver.resolveArgument(paramStringNotAnnot, null, webRequest, null);
+		assertEquals("", result);
+	}
+
+	@Test
+	public void resolveEmptyValueRequiredWithoutDefault() throws Exception {
+		this.request.addParameter("name", "");
+		Object result = resolver.resolveArgument(paramRequired, null, webRequest, null);
+		assertEquals("", result);
+	}
+
+
 	public void params(@RequestParam(value = "name", defaultValue = "bar") String param1,
-					   @RequestParam("name") String[] param2,
-					   @RequestParam("name") Map<?, ?> param3,
-					   @RequestParam(value = "file") MultipartFile param4,
-					   @RequestParam Map<?, ?> param5,
-					   String stringNotAnnot,
-					   MultipartFile multipartFileNotAnnot,
-					   List<MultipartFile> multipartFileList,
-					   Part servlet30Part,
-					   @RequestPart MultipartFile requestPartAnnot) {
+			@RequestParam("name") String[] param2,
+			@RequestParam("name") Map<?, ?> param3,
+			@RequestParam(value = "file") MultipartFile param4,
+			@RequestParam Map<?, ?> param5,
+			String stringNotAnnot,
+			MultipartFile multipartFileNotAnnot,
+			List<MultipartFile> multipartFileList,
+			Part servlet30Part,
+			@RequestPart MultipartFile requestPartAnnot,
+			@RequestParam(value = "name") String paramRequired) {
 	}
 
 }