diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-04 07:59:31 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-25 10:48:38 +0100 |
commit | dd05e4b94d67b481c241cfa20ccf0e481dcb0bd7 (patch) | |
tree | d48af28cb2c6651f6a7424d599dfeb1610b8c931 /configserver | |
parent | db01dd9ebc4f63acc71d4ef9b015db4133a5de6d (diff) |
Bump apache httpclient from 5.1 to 5.2.
Diffstat (limited to 'configserver')
8 files changed, 12 insertions, 1 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 b7b509c899c..4e02964fa58 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 @@ -280,6 +280,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { } } + @SuppressWarnings("deprecation") private static RequestConfig createRequestConfig(Duration timeout) { return RequestConfig.custom() .setConnectionRequestTimeout(Timeout.ofSeconds(1)) @@ -288,6 +289,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { .build(); } + @SuppressWarnings("deprecation") private static CloseableHttpAsyncClient createHttpClient() { return VespaAsyncHttpClientBuilder .create(tlsStrategy -> 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 b2672f7ad85..89c57dd6e0e 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 @@ -146,6 +146,7 @@ public class DefaultClusterReindexingStatusClient implements ClusterReindexingSt } + @SuppressWarnings("deprecation") private static CloseableHttpAsyncClient createHttpClient() { return VespaAsyncHttpClientBuilder .create() diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java index 3be99ab8393..17a3b186beb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java @@ -20,6 +20,7 @@ public class LogRetriever { private final CloseableHttpClient httpClient = VespaHttpClientBuilder.create().build(); + @SuppressWarnings("deprecation") public HttpResponse getLogs(String logServerUri, Optional<Instant> deployTime) { HttpGet get = new HttpGet(logServerUri); try { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java index 17f33e477ec..78fdf0a4a02 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SecretStoreValidator.java @@ -58,6 +58,7 @@ public class SecretStoreValidator { return URI.create(PROTOCOL + hostname + AWS_PARAMETER_VALIDATION_HANDLER_POSTFIX); } + @SuppressWarnings("deprecation") private HttpResponse postRequest(URI uri, Slime slime) { var postRequest = new HttpPost(uri); var data = uncheck(() -> SlimeUtils.toJsonBytes(slime)); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java index a8dfe3700e7..da4e5d24c48 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SimpleHttpFetcher.java @@ -34,6 +34,7 @@ public class SimpleHttpFetcher implements HttpFetcher { } @Override + @SuppressWarnings("deprecation") public HttpResponse get(Params params, URI url) { try { HttpGet request = new HttpGet(url); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java index 69bccfe788d..4b339f72fa6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java @@ -64,6 +64,7 @@ public class TesterClient { return execute(new HttpGet(testerUri), "Failed to get test report"); } + @SuppressWarnings("deprecation") private HttpResponse execute(HttpUriRequest request, String messageIfRequestFails) { logger.log(Level.FINE, () -> "Sending request to tester container " + request.getRequestUri()); try { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java index 98f01bada3f..548ea8046d4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterDeploymentMetricsRetriever.java @@ -55,6 +55,7 @@ public class ClusterDeploymentMetricsRetriever { private static final ExecutorService executor = Executors.newFixedThreadPool(10, new DaemonThreadFactory("cluster-deployment-metrics-retriever-")); + @SuppressWarnings("deprecation") private static final CloseableHttpClient httpClient = VespaHttpClientBuilder .create(registry -> new PoolingHttpClientConnectionManager(registry, @@ -128,7 +129,7 @@ public class ClusterDeploymentMetricsRetriever { Supplier<DeploymentMetricsAggregator> aggregator = () -> clusterMetricsMap.computeIfAbsent(clusterInfo, c -> new DeploymentMetricsAggregator()); switch (serviceName) { - case VESPA_CONTAINER: + case VESPA_CONTAINER -> { optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum -> aggregator.get() .addContainerLatency(qlSum, values.field("query_latency.count").asDouble())); @@ -160,6 +161,7 @@ public class ClusterDeploymentMetricsRetriever { return new ClusterInfo(dimensions.field("clusterid").asString(), dimensions.field("clustertype").asString()); } + @SuppressWarnings("deprecation") private static Slime doMetricsRequest(URI hostURI) { HttpGet get = new HttpGet(hostURI); try (CloseableHttpResponse response = httpClient.execute(get)) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java index d6fde04cd71..0dbe0131e9b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetriever.java @@ -27,6 +27,7 @@ public class ClusterProtonMetricsRetriever { private static final Logger log = Logger.getLogger(ClusterProtonMetricsRetriever.class.getName()); + @SuppressWarnings("deprecation") private static final CloseableHttpClient httpClient = VespaHttpClientBuilder .create(PoolingHttpClientConnectionManager::new) .setDefaultRequestConfig( @@ -100,6 +101,7 @@ public class ClusterProtonMetricsRetriever { aggregator.addAll(metrics.field("values")); } + @SuppressWarnings("deprecation") private static Slime doMetricsRequest(URI hostURI) { HttpGet get = new HttpGet(hostURI); try (CloseableHttpResponse response = httpClient.execute(get)) { |