More consistent naming of set/build methods

13 files changed, 34 insertions, 31 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java
index 89d949a5052..0399664faf2 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigVerification.java
@@ -37,7 +37,7 @@ public class ConfigVerification {
         for (String arg : args) {
             configservers.add(prefix + arg + ":" + port + "/config/v2/tenant/" + tenant + "/application/" + appName + "/environment/" + environment + "/region/" + region + "/instance/" + instance + "/?recursive=true");
         }
-        try (CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().build().build()) {
+        try (CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient()) {
             System.exit(compareConfigs(listConfigs(configservers, httpClient), httpClient));
         }
     }
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())
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
index 1a8341072aa..7c1b0cc3099 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/MetricsV2Handler.java
@@ -62,7 +62,7 @@ public class MetricsV2Handler extends HttpHandlerBase {
     }
 
     private static CloseableHttpClient createHttpClient() {
-        return VespaHttpClientBuilder.custom().setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).build()
+        return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder()
                 .setUserAgent("application-metrics-retriever")
                 .setDefaultRequestConfig(RequestConfig.custom()
                                                       .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS)
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
index b30d5886a03..960cb795ad6 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/PrometheusV1Handler.java
@@ -63,7 +63,7 @@ public class PrometheusV1Handler extends HttpHandlerBase {
     }
 
     private static CloseableHttpClient createHttpClient() {
-        return VespaHttpClientBuilder.custom().setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).build()
+        return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder()
                 .setUserAgent("application-prometheus-receiver")
                 .setDefaultRequestConfig(RequestConfig.custom()
                                             .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS)
diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
index 743ad1e8f6f..4f2bdfb213e 100644
--- a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
+++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java
@@ -2,9 +2,9 @@
 package ai.vespa.util.http.hc5;
 
 import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
 import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
@@ -26,7 +26,7 @@ import static com.yahoo.security.tls.TransportSecurityUtils.isTransportSecurityE
 /**
  * Sync HTTP client builder <em>for internal Vespa communications over http/https.</em>
  * Configures Vespa mTLS and handles TLS mixed mode automatically.
- * Custom connection managers must be configured through {@link #set(HttpClientConnectionManagerFactory)}.
+ * Custom connection managers must be configured through {@link #connectionManagerFactory(HttpClientConnectionManagerFactory)}.
  *
  * @author jonmv
  */
@@ -47,41 +47,41 @@ public class VespaHttpClientBuilder {
         return new VespaHttpClientBuilder();
     }
 
-    public VespaHttpClientBuilder set(HttpClientConnectionManagerFactory connectionManagerFactory) {
+    public VespaHttpClientBuilder connectionManagerFactory(HttpClientConnectionManagerFactory connectionManagerFactory) {
         this.connectionManagerFactory = connectionManagerFactory;
         return this;
     }
 
-    public VespaHttpClientBuilder set(HostnameVerifier hostnameVerifier) {
+    public VespaHttpClientBuilder hostnameVerifier(HostnameVerifier hostnameVerifier) {
         this.hostnameVerifier = hostnameVerifier;
         return this;
     }
-    public VespaHttpClientBuilder setRewriteHttpToHttps(boolean enable) {
+    public VespaHttpClientBuilder rewriteHttpToHttps(boolean enable) {
         this.rewriteHttpToHttps = enable;
         return this;
     }
-    public VespaHttpClientBuilder setConnectTimeout(long connectTimeout, TimeUnit timeUnit) {
+    public VespaHttpClientBuilder connectTimeout(long connectTimeout, TimeUnit timeUnit) {
         connectionConfigBuilder.setConnectTimeout(connectTimeout, timeUnit);
         return this;
     }
-    public VespaHttpClientBuilder setConnectTimeout(Timeout connectTimeout) {
+    public VespaHttpClientBuilder connectTimeout(Timeout connectTimeout) {
         connectionConfigBuilder.setConnectTimeout(connectTimeout);
         return this;
     }
-    public VespaHttpClientBuilder setSocketTimeout(long connectTimeout, TimeUnit timeUnit) {
+    public VespaHttpClientBuilder socketTimeout(long connectTimeout, TimeUnit timeUnit) {
         connectionConfigBuilder.setConnectTimeout(connectTimeout, timeUnit);
         return this;
     }
-    public VespaHttpClientBuilder setValidateAfterInactivity(TimeValue validateAfterInactivity) {
+    public VespaHttpClientBuilder validateAfterInactivity(TimeValue validateAfterInactivity) {
         connectionConfigBuilder.setValidateAfterInactivity(validateAfterInactivity);
         return this;
     }
-    public VespaHttpClientBuilder setSocketTimeout(Timeout connectTimeout) {
+    public VespaHttpClientBuilder socketTimeout(Timeout connectTimeout) {
         connectionConfigBuilder.setConnectTimeout(connectTimeout);
         return this;
     }
 
-    public HttpClientBuilder build() {
+    public HttpClientBuilder apacheBuilder() {
         HttpClientBuilder builder = HttpClientBuilder.create();
         addSslSocketFactory(builder, new HttpClientConnectionManagerFactoryProxy(), hostnameVerifier);
         if (rewriteHttpToHttps)
@@ -94,6 +94,9 @@ public class VespaHttpClientBuilder {
 
         return builder;
     }
+    public CloseableHttpClient buildClient() {
+        return apacheBuilder().build();
+    }
 
     private class HttpClientConnectionManagerFactoryProxy implements HttpClientConnectionManagerFactory {
         @Override
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
index d0cabef12b4..75853ec9eda 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/HttpMetricFetcher.java
@@ -81,9 +81,9 @@ public abstract class HttpMetricFetcher {
 
     private static CloseableHttpClient createHttpClient() {
         return VespaHttpClientBuilder.custom()
-                .setConnectTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
-                .setSocketTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
-                .build()
+                .connectTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
+                .socketTimeout(Timeout.ofMilliseconds(CONNECTION_TIMEOUT))
+                .apacheBuilder()
                 .setUserAgent("metrics-proxy-http-client")
                 .setDefaultRequestConfig(RequestConfig.custom()
                         .setConnectionRequestTimeout(Timeout.ofMilliseconds(SOCKET_TIMEOUT))
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
index 5bd4e03642e..1546da7d9a8 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
@@ -28,8 +28,8 @@ public class RetryingClusterControllerClientFactory extends AbstractComponent im
     public RetryingClusterControllerClientFactory() {
         this(AbstractHttpClient.wrapping(VespaHttpClientBuilder
                 .custom()
-                .setConnectTimeout(Timeout.ofSeconds(5))
-                .build()
+                .connectTimeout(Timeout.ofSeconds(5))
+                .apacheBuilder()
                 .setUserAgent("orchestrator-cluster-controller-client")
                 .setDefaultHeaders(List.of(new BasicHeader("Accept", "application/json")))
                 .build()));
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
index 6ab3394b2e6..bb532589750 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespa/filedistribution/status/FileDistributionStatusClient.java
@@ -78,7 +78,7 @@ public class FileDistributionStatusClient {
                 .setConnectionRequestTimeout(timeoutInMillis)
                 .setResponseTimeout(timeoutInMillis)
                 .build();
-        try (CloseableHttpClient httpClient =  VespaHttpClientBuilder.custom().setConnectTimeout(timeoutInMillis).build().build()) {
+        try (CloseableHttpClient httpClient =  VespaHttpClientBuilder.custom().connectTimeout(timeoutInMillis).buildClient()) {
             URI statusUri = createStatusApiUri();
             if (debug)
                 System.out.println("URI:" + statusUri);