Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
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) {
if (!this.uriVariables.containsKey(name)) {
throw new IllegalArgumentException("Map has no value for '" + name + "'");
}
return this.uriVariables.get(name);
}
}
@@ -1010,6 +1013,7 @@ public final class UriComponents {
* URI template variables backed by a variable argument array.
*/
private static class VarArgsTemplateVariables implements UriTemplateVariables {
private final Iterator<Object> valueIterator;
public VarArgsTemplateVariables(Object... uriVariableValues) {
@@ -1018,7 +1022,7 @@ public final class UriComponents {
public Object getValue(String name) {
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();
}