From d5a79bc8f72a0c7b78341995c9d20bb9dbc50ff3 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Mon, 26 Apr 2021 11:54:47 +0200 Subject: Let null values mean no query, and allow explicitly empty parameters --- .../vespa/hosted/client/AbstractConfigServerClient.java | 15 +++++++++++++-- .../java/ai/vespa/hosted/client/ConfigServerClient.java | 14 ++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) (limited to 'configserver-client/src') 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 626b08d17ee..d7853320149 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 @@ -145,13 +145,24 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient { return this; } + @Override + public ConfigServerClient.RequestBuilder emptyParameters(List keys) { + for (String key : keys) + uriBuilder.setParameter(key, null); + + return this; + } + @Override public RequestBuilder parameters(List pairs) { if (pairs.size() % 2 != 0) throw new IllegalArgumentException("Must supply parameter key/values in pairs"); - for (int i = 0; i < pairs.size(); ) - uriBuilder.setParameter(pairs.get(i++), pairs.get(i++)); + for (int i = 0; i < pairs.size(); ) { + String key = pairs.get(i++), value = pairs.get(i++); + if (value != null) + uriBuilder.setParameter(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 f8cb22c65b0..c92acd7cd0b 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 @@ -4,7 +4,6 @@ package ai.vespa.hosted.client; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; -import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.Method; @@ -21,7 +20,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.IntStream; @@ -77,12 +75,20 @@ public interface ConfigServerClient extends Closeable { /** Sets the request body. */ RequestBuilder body(HttpEntity entity); - /** Sets the parameter key/values for the request. Number of arguments must be even. */ + /** Sets query parameters without a value, like {@code ?debug&recursive}. */ + default RequestBuilder emptyParameters(String... keys) { + return emptyParameters(Arrays.asList(keys)); + } + + /** Sets query parameters without a value, like {@code ?debug&recursive}. */ + RequestBuilder emptyParameters(List keys); + + /** Sets the parameter key/values for the request. Number of arguments must be even. Null values are omitted. */ default RequestBuilder parameters(String... pairs) { return parameters(Arrays.asList(pairs)); } - /** Sets the parameter key/values for the request. Number of arguments must be even. */ + /** Sets the parameter key/values for the request. Number of arguments must be even. Null values are omitted. */ RequestBuilder parameters(List pairs); /** Overrides the default socket read timeout of the request. {@code Duration.ZERO} gives infinite timeout. */ -- cgit v1.2.3