Do not decode URL encoding while setting up RequestTemplate (#2228)

* Do not decode URL encoding while setting up RequestTemplate (#2227) * Add unit test for preserving URL encoding in RequestTemplate (#2227)
OpenFeign · Nov 8, 2023 · 3c4e713 · 3c4e713
1 parent 0112f65
commit 3c4e713
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
@@ -520,7 +520,8 @@ public RequestTemplate target(String target) {
       }
 
       /* strip the query string */
-      this.target = targetUri.getScheme() + "://" + targetUri.getAuthority() + targetUri.getPath();
+      this.target =
+          targetUri.getScheme() + "://" + targetUri.getRawAuthority() + targetUri.getRawPath();
       if (targetUri.getFragment() != null) {
         this.fragment = "#" + targetUri.getFragment();
       }

diff --git a/core/src/test/java/feign/RequestTemplateTest.java b/core/src/test/java/feign/RequestTemplateTest.java
@@ -524,6 +524,14 @@ public void fragmentShouldNotBeEncodedInTarget() {
     assertThat(template.url()).isEqualTo("https://example.com/path?key1=value1#fragment");
   }
 
+  @Test
+  public void urlEncodingRemainsInPlace() {
+    RequestTemplate template =
+        new RequestTemplate().method(HttpMethod.GET).target("https://exa%23mple.com/path%7Cpath");
+
+    assertThat(template.url()).isEqualTo("https://exa%23mple.com/path%7Cpath");
+  }
+
   @Test
   public void slashShouldNotBeAppendedForMatrixParams() {
     RequestTemplate template =