Avoided url appending with slash when matrix parameter exists (#999)

* Avoided url appending with slash when matrix parameter exists * Added UT to cover url appending with slash when matrix parameter exists
OpenFeign · Jul 18, 2019 · a57f890 · a57f890
1 parent 9519b3d
commit a57f890
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
@@ -409,7 +409,8 @@ public RequestTemplate uri(String uri, boolean append) {
     } else if ((!uri.isEmpty()
         && !uri.startsWith("/")
         && !uri.startsWith("{")
-        && !uri.startsWith("?"))) {
+        && !uri.startsWith("?")
+        && !uri.startsWith(";"))) {
       /* if the start of the url is a literal, it must begin with a slash. */
       uri = "/" + uri;
     }

diff --git a/core/src/test/java/feign/RequestTemplateTest.java b/core/src/test/java/feign/RequestTemplateTest.java
@@ -481,4 +481,12 @@ public void fragmentShouldNotBeEncodedInTarget() {
 
     assertThat(template.url()).isEqualTo("https://example.com/path?key1=value1#fragment");
   }
+
+  @Test
+  public void slashShouldNotBeAppendedForMatrixParams() {
+    RequestTemplate template =
+        new RequestTemplate().method(HttpMethod.GET).uri("/path;key1=value1;key2=value2", true);
+
+    assertThat(template.url()).isEqualTo("/path;key1=value1;key2=value2");
+  }
 }