Support multiple values for same key, in HttpURL.Query

2 files changed, 4 insertions, 3 deletions

diff --git a/configserver-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java b/configserver-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java
index 865280def6c..02a0d07626c 100644
--- a/configserver-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java
+++ b/configserver-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java
@@ -52,7 +52,7 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient {
             ClassicHttpRequest request = ClassicRequestBuilder.create(builder.method.name())
                                                               .setUri(HttpURL.from(host)
                                                                              .appendPath(builder.path)
-                                                                             .mergeQuery(builder.query)
+                                                                             .appendQuery(builder.query)
                                                                              .asURI())
                                                               .build();
             request.setEntity(builder.entity);
@@ -148,7 +148,7 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient {
             for (int i = 0; i < pairs.size(); ) {
                 String key = pairs.get(i++), value = pairs.get(i++);
                 if (value != null)
-                    query = query.put(key, value);
+                    query = query.add(key, value);
             }
 
             return this;
diff --git a/configserver-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java b/configserver-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java
index 9cbe59c6bec..2dde98086e8 100644
--- a/configserver-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java
+++ b/configserver-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java
@@ -3,6 +3,7 @@ package ai.vespa.hosted.client;
 
 import ai.vespa.http.HttpURL;
 import ai.vespa.http.HttpURL.Path;
+import ai.vespa.http.HttpURL.Query;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
@@ -66,7 +67,7 @@ public interface ConfigServerClient extends Closeable {
         default RequestBuilder at(String... pathSegments) { return at(List.of(pathSegments)); }
 
         /** Appends to the request path, with no trailing slash. */
-        default RequestBuilder at(List<String> pathSegments) { return at(Path.from(pathSegments).withoutTrailingSlash()); }
+        default RequestBuilder at(List<String> pathSegments) { return at(Path.empty().append(pathSegments).withoutTrailingSlash()); }
 
         /** Appends to the request path. */
         RequestBuilder at(HttpURL.Path path);