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

UriTemplate properly quotes variable values (SPR-6854)

This commit is contained in:
Juergen Hoeller 2010-02-17 21:58:56 +00:00
parent 36940c5fc8
commit 54acebd086
2 changed files with 17 additions and 6 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/UriTemplate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 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.
@ -36,8 +36,8 @@ import org.springframework.util.Assert;
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Juergen Hoeller * @author Juergen Hoeller
* @see <a href="http://bitworking.org/projects/URI-Templates/">URI Templates</a>
* @since 3.0 * @since 3.0
* @see <a href="http://bitworking.org/projects/URI-Templates/">URI Templates</a>
*/ */
public class UriTemplate { public class UriTemplate {
@ -126,7 +126,7 @@ public class UriTemplate {
int i = 0; int i = 0;
while (matcher.find()) { while (matcher.find()) {
String uriVariable = uriVariableValues[i++].toString(); String uriVariable = uriVariableValues[i++].toString();
matcher.appendReplacement(buffer, uriVariable); matcher.appendReplacement(buffer, Matcher.quoteReplacement(uriVariable));
} }
matcher.appendTail(buffer); matcher.appendTail(buffer);
return encodeUri(buffer.toString()); return encodeUri(buffer.toString());

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 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.
@ -26,7 +26,10 @@ import java.util.Map;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
/** @author Arjen Poutsma */ /**
* @author Arjen Poutsma
* @author Juergen Hoeller
*/
public class UriTemplateTests { public class UriTemplateTests {
@Test @Test
@ -141,4 +144,12 @@ public class UriTemplateTests {
template = new UriTemplate("/search?query={query}#{fragment}"); template = new UriTemplate("/search?query={query}#{fragment}");
assertTrue(template.matches("/search?query=foo#bar")); assertTrue(template.matches("/search?query=foo#bar"));
} }
}
@Test
public void expandWithDollar() {
UriTemplate template = new UriTemplate("/{a}");
URI uri = template.expand("$replacement");
assertEquals("/$replacement", uri.toString());
}
}