diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-24 17:50:50 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-25 10:48:48 +0100 |
commit | 0f01464aacb1396f53ab55cfeff7ad5240b8f161 (patch) | |
tree | f9ae8425a5247de5fce4f8258721e428fcdc845d /http-utils | |
parent | d8a3a7bf6d9685db965833064876d8ed02ed0699 (diff) |
More consistent naming of set/build methods
Diffstat (limited to 'http-utils')
-rw-r--r-- | http-utils/src/main/java/ai/vespa/util/http/hc5/VespaHttpClientBuilder.java | 25 |
1 files changed, 14 insertions, 11 deletions
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 |