Fixed ClientUri to extract query params when created from a URI.

Signed-off-by: Santiago Pericasgeertsen <[email protected]>
spericas · Aug 2, 2023 · 21bface · 21bface
1 parent 39b644b
commit 21bface
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/nima/webclient/api/src/main/java/io/helidon/nima/webclient/api/ClientUri.java b/nima/webclient/api/src/main/java/io/helidon/nima/webclient/api/ClientUri.java
@@ -191,8 +191,11 @@ public ClientUri resolve(URI uri) {
             uriBuilder.port(uri.getPort());
         }
 
-        String uriPath = extractQuery(uri.getPath());
-        uriBuilder.path(resolvePath(uriBuilder.path().path(), uriPath));
+        uriBuilder.path(resolvePath(uriBuilder.path().path(), uri.getPath()));
+
+        if (uri.getRawQuery() != null) {
+            query.fromQueryString(uri.getRawQuery());
+        }
 
         if (uri.getRawFragment() != null) {
             uriBuilder.fragment(UriFragment.create(uri.getRawFragment()));

diff --git a/nima/webclient/api/src/test/java/io/helidon/nima/webclient/api/ClientUriTest.java b/nima/webclient/api/src/test/java/io/helidon/nima/webclient/api/ClientUriTest.java
@@ -19,7 +19,7 @@
 import java.net.URI;
 
 import io.helidon.common.uri.UriPath;
-
+import io.helidon.common.uri.UriQueryWriteable;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -59,6 +59,20 @@ void testNonDefaults() {
         assertThat(helper.scheme(), is("http"));
     }
 
+    @Test
+    void testQueryParams() {
+        UriQueryWriteable query = UriQueryWriteable.create();
+        query.fromQueryString("p1=v1&p2=v2&p3=%2F%2Fv3%2F%2F");
+        ClientUri helper = ClientUri.create(URI.create("http://localhost:8080/loom/quick?" + query.value()));
+
+        assertThat(helper.authority(), is("localhost:8080"));
+        assertThat(helper.host(), is("localhost"));
+        assertThat(helper.path(), is(UriPath.create("/loom/quick")));
+        assertThat(helper.port(), is(8080));
+        assertThat(helper.scheme(), is("http"));
+        assertThat(helper.query(), is(query));
+    }
+
     @Test
     void testResolvePath() {
         ClientUri helper = ClientUri.create(URI.create("http://localhost:8080/loom"));