SPR-7667

Author: poutsma

org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java

@@ -96,7 +96,7 @@ public List<String> getVariableNames() {
 	 */
 	public URI expand(Map<String, ?> uriVariables) {
 		Assert.notNull(uriVariables, "'uriVariables' must not be null");
-		Object[] values = new String[this.variableNames.size()];
+		Object[] values = new Object[this.variableNames.size()];
 		for (int i = 0; i < this.variableNames.size(); i++) {
 			String name = this.variableNames.get(i);
 			if (!uriVariables.containsKey(name)) {

org.springframework.web/src/test/java/org/springframework/web/util/UriTemplateTests.java

@@ -70,6 +70,16 @@ public void expandMap() throws Exception {
 		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
 	}
 
+	@Test
+	public void expandMapNonString() throws Exception {
+		Map<String, Integer> uriVariables = new HashMap<String, Integer>(2);
+		uriVariables.put("booking", 42);
+		uriVariables.put("hotel", 1);
+		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		URI result = template.expand(uriVariables);
+		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+	}
+
 	@Test(expected = IllegalArgumentException.class)
 	public void expandMapInvalidAmountVariables() throws Exception {
 		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");