Error in RequestTemplate#uri when there're both query and fragment (OpenFeign#2367)

gromspys · web-flow · commit 4853754791bb · 2024-04-02T09:38:53.000Z
diff --git a/core/src/main/java/feign/RequestTemplate.java b/core/src/main/java/feign/RequestTemplate.java
@@ -459,6 +459,12 @@ public RequestTemplate uri(String uri, boolean append) {
       uri = "/" + uri;
     }
 
+    int fragmentIndex = uri.indexOf('#');
+    if (fragmentIndex > -1) {
+      fragment = uri.substring(fragmentIndex);
+      uri = uri.substring(0, fragmentIndex);
+    }
+
     /*
      * templates may provide query parameters. since we want to manage those explicity, we will need
      * to extract those out, leaving the uriTemplate with only the path to deal with.
@@ -474,12 +480,6 @@ public RequestTemplate uri(String uri, boolean append) {
       uri = uri.substring(0, queryMatcher.start());
     }
 
-    int fragmentIndex = uri.indexOf('#');
-    if (fragmentIndex > -1) {
-      fragment = uri.substring(fragmentIndex);
-      uri = uri.substring(0, fragmentIndex);
-    }
-
     /* replace the uri template */
     if (append && this.uriTemplate != null) {
       this.uriTemplate = UriTemplate.append(this.uriTemplate, uri);
diff --git a/core/src/test/java/feign/RequestTemplateTest.java b/core/src/test/java/feign/RequestTemplateTest.java
@@ -524,6 +524,15 @@ void fragmentShouldNotBeEncodedInTarget() {
     assertThat(template.url()).isEqualTo("https://example.com/path?key1=value1#fragment");
   }
 
+  @Test
+  void fragmentShouldBeExtractedWhenQueryParamsExist() {
+    RequestTemplate template =
+        new RequestTemplate().method(HttpMethod.GET).uri("/path?query=queryValue#fragment", true);
+
+    assertThat(template.url()).isEqualTo("/path?query=queryValue#fragment");
+    assertThat(template.queryLine()).isEqualTo("?query=queryValue");
+  }
+
   @Test
   void urlEncodingRemainsInPlace() {
     RequestTemplate template =
