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

ranjitc5 · kdavisk6 · commit 028ae8675332 · 2019-07-18T15:13:31.000-04:00
* Avoided url appending with slash when matrix parameter exists

* Added UT to cover url appending with slash when matrix parameter exists
diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
@@ -406,7 +406,7 @@ public RequestTemplate uri(String uri, boolean append) {
     if (uri == null) {
       uri = "/";
     } 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
@@ -469,4 +469,13 @@ 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");
+
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ public RequestTemplate uri(String uri, boolean append) {`
`406`	`406`	`if (uri == null) {`
`407`	`407`	`uri = "/";`
`408`	`408`	`} else if ((!uri.isEmpty() && !uri.startsWith("/") && !uri.startsWith("{")`
`409`		`- && !uri.startsWith("?"))) {`
	`409`	`+ && !uri.startsWith("?") && !uri.startsWith(";"))) {`
`410`	`410`	`/* if the start of the url is a literal, it must begin with a slash. */`
`411`	`411`	`uri = "/" + uri;`
`412`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -469,4 +469,13 @@ public void fragmentShouldNotBeEncodedInTarget() {`
`469`	`469`
`470`	`470`	`assertThat(template.url()).isEqualTo("https://example.com/path?key1=value1#fragment");`
`471`	`471`	`}`
	`472`	`+`
	`473`	`+ @Test`
	`474`	`+ public void slashShouldNotBeAppendedForMatrixParams(){`
	`475`	`+ RequestTemplate template = new RequestTemplate().method(HttpMethod.GET)`
	`476`	`+ .uri("/path;key1=value1;key2=value2",true);`
	`477`	`+`
	`478`	`+ assertThat(template.url()).isEqualTo("/path;key1=value1;key2=value2");`
	`479`	`+`
	`480`	`+ }`
`472`	`481`	`}`