From 312fa3ead9780f7ca169b3019934bf73710eb610 Mon Sep 17 00:00:00 2001
From: Oemer Yildiz <oemer@systemfreund.com>
Date: Mon, 13 Apr 2015 14:41:08 +0200
Subject: [PATCH] #331 - Fixed handling of @RequestParam with default value
 set.

ControllerLinkBuilderFactory now checks the default value of an @RequestParam annotated handler method parameter before triggering strict validation.

Original pull request: #332.
---
 .../mvc/ControllerLinkBuilderFactory.java     |  5 ++++-
 .../mvc/ControllerLinkBuilderUnitTest.java    | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
index 65603ce2..20fb052e 100644
--- a/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
+++ b/src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilderFactory.java
@@ -41,6 +41,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ValueConstants;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 import org.springframework.web.util.UriTemplate;
@@ -53,6 +54,7 @@ import org.springframework.web.util.UriTemplate;
  * @author Dietrich Schulten
  * @author Kamill Sokol
  * @author Ross Turner
+ * @author Oemer Yildiz
  */
 public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<ControllerLinkBuilder> {
 
@@ -233,7 +235,8 @@ public class ControllerLinkBuilderFactory implements MethodLinkBuilderFactory<Co
 		protected Object verifyParameterValue(MethodParameter parameter, Object value) {
 
 			RequestParam annotation = parameter.getParameterAnnotation(RequestParam.class);
-			return annotation.required() ? super.verifyParameterValue(parameter, value) : value;
+			return annotation.required() && annotation.defaultValue().equals(ValueConstants.DEFAULT_NONE) ? super
+					.verifyParameterValue(parameter, value) : value;
 		}
 	}
 }
diff --git a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
index e06d2f56..0628e776 100644
--- a/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/mvc/ControllerLinkBuilderUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * @author Oliver Gierke
  * @author Dietrich Schulten
  * @author Kamill Sokol
+ * @author Oemer Yildiz
  */
 public class ControllerLinkBuilderUnitTest extends TestUtils {
 
@@ -423,6 +424,17 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 		assertThat(link.getHref(), startsWith("bar://"));
 	}
 
+	/**
+	 * @see #331
+	 */
+	@Test
+	public void linksToMethodWithRequestParamImplicitlySetToFalse() {
+
+		Link link = linkTo(methodOn(ControllerWithMethods.class).methodForOptionalSizeWithDefaultValue(null)).withSelfRel();
+
+		assertThat(link.getHref(), endsWith("/bar"));
+	}
+
 	private static UriComponents toComponents(Link link) {
 		return UriComponentsBuilder.fromUriString(link.getHref()).build();
 	}
@@ -494,6 +506,11 @@ public class ControllerLinkBuilderUnitTest extends TestUtils {
 		HttpEntity<Void> methodForOptionalNextPage(@RequestParam(required = false) Integer offset) {
 			return null;
 		}
+
+		@RequestMapping(value = "/bar")
+		HttpEntity<Void> methodForOptionalSizeWithDefaultValue(@RequestParam(defaultValue = "10") Integer size) {
+			return null;
+		}
 	}
 
 	@RequestMapping("/parent")