diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-05-25 15:37:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-25 15:37:56 +0200 |
commit | 6af8b84a5f6aca68f685075f87d754ca9db70cbd (patch) | |
tree | 04b71e4cd5b7a0bc192cc31b337000d73f5b1309 /configserver | |
parent | 32e18c5152ebed0d7a2f94d3d24da3e5ffa8b781 (diff) | |
parent | e70efd0b531b4efaf711aceb1fb33bf2bfd1fcfb (diff) |
Merge pull request #17969 from vespa-engine/bjorncs/upgrade-httpclient5
Bjorncs/upgrade httpclient5
Diffstat (limited to 'configserver')
2 files changed, 4 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java index 2dd655c91d8..a6e15223f74 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java @@ -13,14 +13,13 @@ import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.slime.Cursor; import com.yahoo.vespa.config.server.http.JSONResponse; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; -import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; +import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.HttpStatus; -import org.apache.hc.core5.http2.HttpVersionPolicy; import org.apache.hc.core5.net.URIBuilder; import org.apache.hc.core5.reactor.IOReactorConfig; import org.apache.hc.core5.util.TimeValue; @@ -152,7 +151,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { /** Get service generation of service at given URL */ private CompletableFuture<Long> getServiceGeneration(CloseableHttpAsyncClient client, URI serviceUrl, Duration timeout) { - SimpleHttpRequest request = SimpleHttpRequests.get(createApiUri(serviceUrl)); + SimpleHttpRequest request = SimpleRequestBuilder.get(createApiUri(serviceUrl)).build(); request.setConfig(createRequestConfig(timeout)); // Ignoring returned Future object as we want to use the more flexible CompletableFuture instead diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java index 1887bf1db9d..65a960e38f4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/DefaultClusterReindexingStatusClient.java @@ -10,8 +10,8 @@ import com.yahoo.config.model.api.PortInfo; import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.config.server.modelfactory.ModelResult; -import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; +import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.core5.concurrent.FutureCallback; @@ -80,7 +80,7 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt private CompletableFuture<Map<String, ClusterReindexing>> getReindexingStatus(ServiceInfo service) { URI uri = URI.create(String.format("http://%s:%d/reindexing/v1/status", service.getHostName(), getStatePort(service))); CompletableFuture<SimpleHttpResponse> responsePromise = new CompletableFuture<>(); - httpClient.execute(SimpleHttpRequests.get(uri), new FutureCallback<>() { + httpClient.execute(SimpleRequestBuilder.get(uri).build(), new FutureCallback<>() { @Override public void completed(SimpleHttpResponse result) { responsePromise.complete(result); } @Override public void failed(Exception ex) { responsePromise.completeExceptionally(ex); } @Override public void cancelled() { responsePromise.cancel(false); } |