root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SPR-9093: UriTemplate not throwing IllegalArgumentException when URIVariables map missing values

This commit is contained in:
Arjen Poutsma 2012-02-07 15:40:50 +01:00
parent a3bb3769ba
commit 3ec78e2c04
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.web/src/main/java/org/springframework/web/util/UriComponents.java
View File

@ -1002,6 +1002,9 @@ public final class UriComponents {
} }
public Object getValue(String name) { public Object getValue(String name) {
if (!this.uriVariables.containsKey(name)) {
throw new IllegalArgumentException("Map has no value for '" + name + "'");
}
return this.uriVariables.get(name); return this.uriVariables.get(name);
} }
} }
@ -1010,6 +1013,7 @@ public final class UriComponents {
* URI template variables backed by a variable argument array. * URI template variables backed by a variable argument array.
*/ */
private static class VarArgsTemplateVariables implements UriTemplateVariables { private static class VarArgsTemplateVariables implements UriTemplateVariables {
private final Iterator<Object> valueIterator; private final Iterator<Object> valueIterator;
public VarArgsTemplateVariables(Object... uriVariableValues) { public VarArgsTemplateVariables(Object... uriVariableValues) {
@ -1018,7 +1022,7 @@ public final class UriComponents {
public Object getValue(String name) { public Object getValue(String name) {
if (!valueIterator.hasNext()) { if (!valueIterator.hasNext()) {
throw new IllegalArgumentException("Not enough variable values available to expand [" + name + "]"); throw new IllegalArgumentException("Not enough variable values available to expand '" + name + "'");
} }
return valueIterator.next(); return valueIterator.next();
} }

11
org.springframework.web/src/test/java/org/springframework/web/util/UriTemplateTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -89,6 +89,15 @@ public class UriTemplateTests {
assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result); assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
} }
@Test(expected = IllegalArgumentException.class)
public void expandMapUnboundVariables() throws Exception {
Map<String, String> uriVariables = new HashMap<String, String>(2);
uriVariables.put("booking", "42");
uriVariables.put("bar", "1");
UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
template.expand(uriVariables);
}
@Test @Test
public void expandEncoded() throws Exception { public void expandEncoded() throws Exception {
UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}"); UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");