Skip to content

Commit 2a74ee7

Browse files
santhosh-tekuriAdrian Cole
authored andcommitted
Corrects encoding of space in URL parameter
According to rfc2396, space in url should be encoded as "%20" instead of "+". Closes OpenFeign#225
1 parent b9b0613 commit 2a74ee7

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎core/src/main/java/feign/RequestTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public RequestTemplate resolve(Map<String, ?> unencoded) {
188188
for (Entry<String, ?> entry : unencoded.entrySet()) {
189189
encoded.put(entry.getKey(), urlEncode(String.valueOf(entry.getValue())));
190190
}
191-
String resolvedUrl = expand(url.toString(), encoded).replace("%2F", "/");
191+
String resolvedUrl = expand(url.toString(), encoded).replace("%2F", "/").replace("+", "%20");
192192
url = new StringBuilder(resolvedUrl);
193193

194194
Map<String, Collection<String>>

‎core/src/test/java/feign/RequestTemplateTest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,4 +230,15 @@ public void allQueriesUnresolvable() throws Exception {
230230
.hasUrl("/domains/1001/records")
231231
.hasQueries();
232232
}
233+
234+
@Test
235+
public void spaceEncodingInUrlParam() {
236+
RequestTemplate template = new RequestTemplate().method("GET")//
237+
.append("/api/{value1}?key={value2}");
238+
239+
template = template.resolve(mapOf("value1", "ABC 123", "value2", "XYZ 123"));
240+
241+
assertThat(template.request().url())
242+
.isEqualTo("/api/ABC%20123?key=XYZ+123");
243+
}
233244
}

0 commit comments

Comments
 (0)