Another utility method

2 files changed, 7 insertions, 2 deletions

diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
index 6a76ef65082..ed3fee101ed 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java
@@ -147,10 +147,10 @@ public abstract class AbstractHttpClient implements HttpClient {
 
         private final Method method;
         private final HostStrategy hosts;
+        private final List<Supplier<Query>> dynamicQuery = new ArrayList<>();
+        private final Map<String, List<String>> headers = new LinkedHashMap<>();
         private HttpURL.Path path = Path.empty();
         private HttpURL.Query query = Query.empty();
-        private List<Supplier<Query>> dynamicQuery = new ArrayList<>();
-        private Map<String, List<String>> headers = new LinkedHashMap<>();
         private Supplier<HttpEntity> entity = () -> null;
         private RequestConfig config = HttpClient.defaultRequestConfig;
         private ResponseVerifier verifier = HttpClient.throwOnError;
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
index 16a419bf324..eeb9c353f64 100644
--- a/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
+++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java
@@ -249,6 +249,11 @@ public interface HttpClient extends Closeable {
     @FunctionalInterface
     interface HostStrategy extends Iterable<URI> {
 
+        /** Attempts the given host once. */
+        static HostStrategy of(URI host) {
+            return repeating(host, 1);
+        }
+
         /** Attempts each request once against each listed host. */
         static HostStrategy ordered(List<URI> hosts) {
             return List.copyOf(hosts)::iterator;