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

SPR-7314 - RestTemplate does not handle null uri template parameters

Browse Source
This commit is contained in:
Arjen Poutsma
2010-06-24 09:33:06 +00:00
parent ccdd1a9efd
commit 3160ddf0e8
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.web/src/main/java/org/springframework/web/util/UriTemplate.java
View File

@@ -125,8 +125,9 @@ public class UriTemplate {
StringBuffer buffer = new StringBuffer();
int i = 0;
while (matcher.find()) {
String uriVariable = uriVariableValues[i++].toString();
matcher.appendReplacement(buffer, Matcher.quoteReplacement(uriVariable));
Object uriVariable = uriVariableValues[i++];
String replacement = Matcher.quoteReplacement(uriVariable != null ? uriVariable.toString() : "");
matcher.appendReplacement(buffer, replacement);
}
matcher.appendTail(buffer);
return encodeUri(buffer.toString());

34
org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateTests.java
View File

@@ -20,6 +20,7 @@ import java.io.IOException;
import java.net.URI;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -82,6 +83,21 @@ public class RestTemplateTests {
verifyMocks();
}
@Test
public void varArgsNullTemplateVariable() throws Exception {
expect(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
response.close();
replayMocks();
template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, null, "foo");
verifyMocks();
}
@Test
public void mapTemplateVariables() throws Exception {
@@ -99,6 +115,24 @@ public class RestTemplateTests {
verifyMocks();
}
@Test
public void mapNullTemplateVariable() throws Exception {
expect(requestFactory.createRequest(new URI("http://example.com/-foo"), HttpMethod.GET))
.andReturn(request);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
response.close();
replayMocks();
Map<String, String> vars = new HashMap<String, String>(2);
vars.put("first", null);
vars.put("last", "foo");
template.execute("http://example.com/{first}-{last}", HttpMethod.GET, null, null, vars);
verifyMocks();
}
@Test
public void errorHandling() throws Exception {
expect(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.GET)).andReturn(request);