WIP

webclient/api/src/main/java/io/helidon/webclient/api/ClientUri.java

@@ -171,15 +171,28 @@ public ClientUri skipUriEncoding(boolean skipUriEncoding) {
     }
 
     /**
-     * Resolve the provided URI against this URI.
+     * Replace {@code this} {@link ClientUri}'s URI with the result of resolving the provided {@link URI} against the
+     * current one.
      *
      * @param uri URI to use
-     * @return updated instance
+     * @return {@code this} updated instance
      */
     public ClientUri resolve(URI uri) {
+        return resolve(uri, false);
+    }
+
+    /**
+     * Resolve the provided {@link URI} against {@code this} {@link ClientUri}.
+     *
+     * @param uri
+     * @param keepQueryParameters
+     * @return {@code this} updated instance
+     */
+    public ClientUri resolve(URI uri, boolean keepQueryParameters) {
         if (uri.isAbsolute()) {
             this.uriBuilder = UriInfo.builder();
-            this.query.clear();
+            if(!keepQueryParameters)
+                this.query.clear();
         }
 
         if (uri.getScheme() != null) {

webclient/api/src/test/java/io/helidon/webclient/api/ClientUriTest.java

@@ -143,4 +143,10 @@ void testResolveQueryParameter() {
         assertThat(helper.scheme(), is("https"));
         assertThat(helper.query().get("k"), is("v"));
     }
+
+    @Test
+    void myTest() throws Exception {
+        ClientUri helper = ClientUri.create(URI.create("http://localhost:8080/?k=v"));
+        System.out.println(helper.resolve(URI.create("?a=b")));
+    }
 }