Upgrade apache 5.1 => 5.2 and add deprecation suppressions.

8 files changed, 25 insertions, 23 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..1577e807036 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,31 +129,22 @@ 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()));
+                        aggregator.get().addContainerLatency(qlSum, values.field("query_latency.count").asDouble()));
                 optionalDouble(values.field("feed.latency.sum")).ifPresent(flSum ->
-                        aggregator.get()
-                                .addFeedLatency(flSum, values.field("feed.latency.count").asDouble()));
-                break;
-            case VESPA_QRSERVER:
-                optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum ->
-                        aggregator.get()
-                                .addQrLatency(qlSum, values.field("query_latency.count").asDouble()));
-                break;
-            case VESPA_DISTRIBUTOR:
-                optionalDouble(values.field("vds.distributor.docsstored.average"))
-                        .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount));
-                break;
-            case VESPA_CONTAINER_CLUSTERCONTROLLER:
-                optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil ->
-                        aggregator.get()
-                                .addMemoryUsage(memoryUtil,
-                                        values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble())
-                                .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(),
-                                        values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble()));
-                break;
+                        aggregator.get().addFeedLatency(flSum, values.field("feed.latency.count").asDouble()));
+            }
+            case VESPA_QRSERVER -> optionalDouble(values.field("query_latency.sum")).ifPresent(qlSum ->
+                    aggregator.get().addQrLatency(qlSum, values.field("query_latency.count").asDouble()));
+            case VESPA_DISTRIBUTOR -> optionalDouble(values.field("vds.distributor.docsstored.average"))
+                    .ifPresent(docCount -> aggregator.get().addDocumentCount(docCount));
+            case VESPA_CONTAINER_CLUSTERCONTROLLER ->
+                    optionalDouble(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_MEMORY_UTILIZATION.max())).ifPresent(memoryUtil ->
+                            aggregator.get()
+                                    .addMemoryUsage(memoryUtil, values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MEMORY_LIMIT.last()).asDouble())
+                                    .addDiskUsage(values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_MAX_DISK_UTILIZATION.max()).asDouble(),
+                                            values.field(ContainerMetrics.CLUSTER_CONTROLLER_RESOURCE_USAGE_DISK_LIMIT.last()).asDouble()));
         }
     }
 
@@ -160,6 +152,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)) {