More consistent naming of set/build methods

6 files changed, 11 insertions, 11 deletions

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 bd36ff88aeb..5d1d8da3648 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
@@ -18,7 +18,7 @@ import java.util.Optional;
  */
 public class LogRetriever {
 
-    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().build().build();
+    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient();
 
     @SuppressWarnings("deprecation")
     public HttpResponse getLogs(String logServerUri, Optional<Instant> deployTime) {
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 c4d849c3be0..58d2e6a2c90 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
@@ -33,7 +33,7 @@ public class SecretStoreValidator {
     private static final String PROTOCOL = "http://";
     private static final String AWS_PARAMETER_VALIDATION_HANDLER_POSTFIX = ":4080/validate-secret-store";
     private final SecretStore secretStore;
-    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().build().build();
+    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient();
 
     public SecretStoreValidator(SecretStore secretStore) {
         this.secretStore = secretStore;
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 7bab17b2814..25d87b5c940 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
@@ -26,11 +26,11 @@ public class SimpleHttpFetcher implements HttpFetcher {
     public SimpleHttpFetcher(Duration connectTimeout) { this(connectTimeout, null); }
 
     public SimpleHttpFetcher(Duration connectTimeout, NodeHostnameVerifier verifier) {
-        VespaHttpClientBuilder builder = VespaHttpClientBuilder.custom().setConnectTimeout(Timeout.of(connectTimeout));
+        VespaHttpClientBuilder builder = VespaHttpClientBuilder.custom().connectTimeout(Timeout.of(connectTimeout));
         if (verifier != null) {
-            builder.set(verifier::verify);
+            builder.hostnameVerifier(verifier::verify);
         }
-        this.client = builder.build().build();
+        this.client = builder.buildClient();
     }
 
     @Override
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 74dbe05ba62..6393243a92f 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
@@ -23,7 +23,7 @@ import java.util.logging.Logger;
  */
 public class TesterClient {
 
-    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().build().build();
+    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient();
     private static final Logger logger = Logger.getLogger(TesterClient.class.getName());
 
     public HttpResponse getStatus(String testerHostname, int port) {
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 f52f0783f62..918af318397 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
@@ -57,9 +57,9 @@ public class ClusterDeploymentMetricsRetriever {
 
     private static final CloseableHttpClient httpClient =
             VespaHttpClientBuilder.custom()
-                    .setConnectTimeout(Timeout.ofSeconds(10))
-                    .set(registry -> new PoolingHttpClientConnectionManager(registry, null, null, TimeValue.ofMinutes(1)))
-                    .build()
+                    .connectTimeout(Timeout.ofSeconds(10))
+                    .connectionManagerFactory(registry -> new PoolingHttpClientConnectionManager(registry, null, null, TimeValue.ofMinutes(1)))
+                    .apacheBuilder()
                     .setDefaultRequestConfig(
                             RequestConfig.custom()
                                          .setConnectionRequestTimeout(Timeout.ofSeconds(60))
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 edc0e18edc7..5f3711e43b6 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
@@ -29,8 +29,8 @@ public class ClusterProtonMetricsRetriever {
     private static final CloseableHttpClient httpClient =
             VespaHttpClientBuilder
                     .custom()
-                    .setConnectTimeout(Timeout.ofSeconds(10))
-                    .build()
+                    .connectTimeout(Timeout.ofSeconds(10))
+                    .apacheBuilder()
                     .setDefaultRequestConfig(RequestConfig.custom()
                             .setResponseTimeout(Timeout.ofSeconds(10))
                             .build())