diff options
author | jonmv <venstad@gmail.com> | 2022-04-28 10:34:39 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-04-28 10:34:39 +0200 |
commit | 3af9c40612e539660c9a831520066420eb9f88ab (patch) | |
tree | 9f974e65c7eaea74c81ef2460b4a218eaeeb1ff8 /http-client | |
parent | 1a4c0d52ab509782dacf128624665789c9b0f59b (diff) |
Rename, remove configserver from names
Diffstat (limited to 'http-client')
-rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java (renamed from http-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java) | 24 | ||||
-rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java (renamed from http-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java) | 2 | ||||
-rw-r--r-- | http-client/src/main/java/ai/vespa/hosted/client/MockHttpClient.java (renamed from http-client/src/main/java/ai/vespa/hosted/client/MockConfigServerClient.java) | 2 | ||||
-rw-r--r-- | http-client/src/test/java/ai/vespa/hosted/client/ApacheHttpClientTest.java (renamed from http-client/src/test/java/ai/vespa/hosted/client/HttpConfigServerClientTest.java) | 10 |
4 files changed, 19 insertions, 19 deletions
diff --git a/http-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java index ec952c5c1ad..21a6c3c9cb9 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/AbstractConfigServerClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/AbstractHttpClient.java @@ -34,12 +34,12 @@ import static java.util.logging.Level.WARNING; /** * @author jonmv */ -public abstract class AbstractConfigServerClient implements ConfigServerClient { +public abstract class AbstractHttpClient implements HttpClient { - private static final Logger log = Logger.getLogger(AbstractConfigServerClient.class.getName()); + private static final Logger log = Logger.getLogger(AbstractHttpClient.class.getName()); - public static ConfigServerClient wrapping(CloseableHttpClient client) { - return new AbstractConfigServerClient() { + public static HttpClient wrapping(CloseableHttpClient client) { + return new AbstractHttpClient() { @Override protected ClassicHttpResponse execute(ClassicHttpRequest request, HttpClientContext context) throws IOException { return client.execute(request, context); @@ -105,21 +105,21 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient { } @Override - public ConfigServerClient.RequestBuilder send(HostStrategy hosts, Method method) { + public HttpClient.RequestBuilder send(HostStrategy hosts, Method method) { return new RequestBuilder(hosts, method); } /** Builder for a request against a given set of hosts. */ - class RequestBuilder implements ConfigServerClient.RequestBuilder { + class RequestBuilder implements HttpClient.RequestBuilder { private final Method method; private final HostStrategy hosts; private HttpURL.Path path = Path.empty(); private HttpURL.Query query = Query.empty(); private HttpEntity entity; - private RequestConfig config = ConfigServerClient.defaultRequestConfig; - private ResponseVerifier verifier = ConfigServerClient.throwOnError; - private ExceptionHandler catcher = ConfigServerClient.retryAll; + private RequestConfig config = HttpClient.defaultRequestConfig; + private ResponseVerifier verifier = HttpClient.throwOnError; + private ExceptionHandler catcher = HttpClient.retryAll; private RequestBuilder(HostStrategy hosts, Method method) { if ( ! hosts.iterator().hasNext()) @@ -136,7 +136,7 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient { } @Override - public ConfigServerClient.RequestBuilder body(byte[] json) { + public HttpClient.RequestBuilder body(byte[] json) { return body(HttpEntities.create(json, ContentType.APPLICATION_JSON)); } @@ -147,7 +147,7 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient { } @Override - public ConfigServerClient.RequestBuilder emptyParameters(List<String> keys) { + public HttpClient.RequestBuilder emptyParameters(List<String> keys) { for (String key : keys) query = query.add(key); @@ -169,7 +169,7 @@ public abstract class AbstractConfigServerClient implements ConfigServerClient { } @Override - public ConfigServerClient.RequestBuilder parameters(Query query) { + public HttpClient.RequestBuilder parameters(Query query) { this.query = this.query.add(query.entries()); return this; } diff --git a/http-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java index 47e062766c6..ff29a51165c 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/ConfigServerClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/HttpClient.java @@ -33,7 +33,7 @@ import static java.util.stream.Collectors.toUnmodifiableList; /** * @author jonmv */ -public interface ConfigServerClient extends Closeable { +public interface HttpClient extends Closeable { RequestConfig defaultRequestConfig = RequestConfig.custom() .setConnectionRequestTimeout(Timeout.ofSeconds(5)) diff --git a/http-client/src/main/java/ai/vespa/hosted/client/MockConfigServerClient.java b/http-client/src/main/java/ai/vespa/hosted/client/MockHttpClient.java index 16aad80670b..09f618f70cb 100644 --- a/http-client/src/main/java/ai/vespa/hosted/client/MockConfigServerClient.java +++ b/http-client/src/main/java/ai/vespa/hosted/client/MockHttpClient.java @@ -16,7 +16,7 @@ import java.util.function.Function; /** * @author jonmv */ -public class MockConfigServerClient extends AbstractConfigServerClient { +public class MockHttpClient extends AbstractHttpClient { private final Deque<Expectation> expectations = new ArrayDeque<>(); diff --git a/http-client/src/test/java/ai/vespa/hosted/client/HttpConfigServerClientTest.java b/http-client/src/test/java/ai/vespa/hosted/client/ApacheHttpClientTest.java index 1bb352568bc..647da68ab07 100644 --- a/http-client/src/test/java/ai/vespa/hosted/client/HttpConfigServerClientTest.java +++ b/http-client/src/test/java/ai/vespa/hosted/client/ApacheHttpClientTest.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package ai.vespa.hosted.client; -import ai.vespa.hosted.client.ConfigServerClient.HostStrategy; -import ai.vespa.hosted.client.ConfigServerClient.ResponseException; +import ai.vespa.hosted.client.HttpClient.HostStrategy; +import ai.vespa.hosted.client.HttpClient.ResponseException; import com.github.tomakehurst.wiremock.http.Fault; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.core5.http.Method; @@ -33,16 +33,16 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author jonmv */ -class HttpConfigServerClientTest { +class ApacheHttpClientTest { @RegisterExtension final WireMockExtension server = new WireMockExtension(); - ConfigServerClient client; + HttpClient client; @BeforeEach void setup() { - client = AbstractConfigServerClient.wrapping(HttpClients.createMinimal()); + client = AbstractHttpClient.wrapping(HttpClients.createMinimal()); } @Test |