Switches body parameter substitution to use encoded parameters

Drew Teeter · Drew Teeter · commit 00b7b6c82f83 · 2015-09-09T07:48:27.000-06:00
Resolves issue where some characters (+ %..) would end up double decoded if existing in parameters. Fixes OpenFeign#264
diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
@@ -229,7 +229,7 @@ public RequestTemplate resolve(Map<String, ?> unencoded) {
     headers.clear();
     headers.putAll(resolvedHeaders);
     if (bodyTemplate != null) {
-      body(urlDecode(expand(bodyTemplate, unencoded)));
+      body(urlDecode(expand(bodyTemplate, encoded)));
     }
     return this;
   }
diff --git a/core/src/test/java/feign/RequestTemplateTest.java b/core/src/test/java/feign/RequestTemplateTest.java
@@ -197,6 +197,26 @@ public void resolveTemplateWithBodyTemplateSetsBodyAndContentLength() {
         );
   }
 
+  @Test
+  public void resolveTemplateWithBodyTemplateDoesNotDoubleDecode() {
+    RequestTemplate template = new RequestTemplate().method("POST")
+      .bodyTemplate(
+        "%7B\"customer_name\": \"{customer_name}\", \"user_name\": \"{user_name}\", \"password\": \"{password}\"%7D");
+
+    template = template.resolve(
+      mapOf(
+        "customer_name", "netflix",
+        "user_name", "denominator",
+        "password", "abc+123%25d8"
+      )
+    );
+
+    assertThat(template)
+      .hasBody(
+        "{\"customer_name\": \"netflix\", \"user_name\": \"denominator\", \"password\": \"abc+123%25d8\"}"
+      );
+  }
+
   @Test
   public void skipUnresolvedQueries() throws Exception {
     RequestTemplate template = new RequestTemplate().method("GET")//

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public RequestTemplate resolve(Map<String, ?> unencoded) {`
`229`	`229`	`headers.clear();`
`230`	`230`	`headers.putAll(resolvedHeaders);`
`231`	`231`	`if (bodyTemplate != null) {`
`232`		`- body(urlDecode(expand(bodyTemplate, unencoded)));`
	`232`	`+ body(urlDecode(expand(bodyTemplate, encoded)));`
`233`	`233`	`}`
`234`	`234`	`return this;`
`235`	`235`	`}`