From f954a11e47e3370af4cf76f2d117c384284861df Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Tue, 11 Mar 2014 19:12:59 +0100
Subject: [PATCH] =?UTF-8?q?#160=20-=20Fixed=20UriTemplate.expand(=E2=80=A6?=
 =?UTF-8?q?)=20method=20declaration.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UriTemplate.expand(Map) not takes a Map<String, ? extends Object> to make sure Link.expand(Map) binds to the correct method. Previously it was bound to the method overload taking an Object vararg which caused an invalid expansion.
---
 src/main/java/org/springframework/hateoas/UriTemplate.java      | 2 +-
 .../java/org/springframework/hateoas/UriTemplateUnitTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springframework/hateoas/UriTemplate.java b/src/main/java/org/springframework/hateoas/UriTemplate.java
index 1d6bfa34..c0bfc809 100644
--- a/src/main/java/org/springframework/hateoas/UriTemplate.java
+++ b/src/main/java/org/springframework/hateoas/UriTemplate.java
@@ -179,7 +179,7 @@ public class UriTemplate implements Iterable<TemplateVariable> {
 	 * @param parameters must not be {@literal null}.
 	 * @return
 	 */
-	public URI expand(Map<String, Object> parameters) {
+	public URI expand(Map<String, ? extends Object> parameters) {
 
 		if (TemplateVariables.NONE.equals(variables)) {
 			return URI.create(baseUri);
diff --git a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
index b7d84863..d243c2c7 100644
--- a/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
+++ b/src/test/java/org/springframework/hateoas/UriTemplateUnitTest.java
@@ -124,7 +124,7 @@ public class UriTemplateUnitTest {
 
 		UriTemplate template = new UriTemplate("/foo{?bar}");
 
-		URI uri = template.expand(Collections.<String, Object> singletonMap("bar", "myBar"));
+		URI uri = template.expand(Collections.singletonMap("bar", "myBar"));
 		assertThat(uri.toString(), is("/foo?bar=myBar"));
 	}