diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 09:20:12 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-26 09:24:36 +0100 |
| commit | dec5fd736f9d3b02f4885407ae8def2360846014 (patch) | |
| tree | a5237dc3fbf991b41b7313e96d53d1ccc41f0361 /container-core | |
| parent | b6e0d375b0f4c3096cd9299e81154451e8387006 (diff) | |
Revert apache 5.1 -> 5.2
Diffstat (limited to 'container-core')
3 files changed, 4 insertions, 5 deletions
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 7c1b0cc3099..b3a2205cc0a 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,9 +62,10 @@ public class MetricsV2Handler extends HttpHandlerBase { } private static CloseableHttpClient createHttpClient() { - return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder() + return VespaHttpClientBuilder.create() .setUserAgent("application-metrics-retriever") .setDefaultRequestConfig(RequestConfig.custom() + .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS) .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS) .build()) .build(); 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 960cb795ad6..3333b3e3090 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,9 +63,10 @@ public class PrometheusV1Handler extends HttpHandlerBase { } private static CloseableHttpClient createHttpClient() { - return VespaHttpClientBuilder.custom().connectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS).apacheBuilder() + return VespaHttpClientBuilder.create() .setUserAgent("application-prometheus-receiver") .setDefaultRequestConfig(RequestConfig.custom() + .setConnectTimeout(HTTP_CONNECT_TIMEOUT, MILLISECONDS) .setResponseTimeout(HTTP_SOCKET_TIMEOUT, MILLISECONDS) .build()) .build(); diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java index a91a200f9cc..298f0feb9e6 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SimpleHttpClient.java @@ -5,7 +5,6 @@ import org.apache.hc.client5.http.SystemDefaultDnsResolver; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.classic.methods.HttpUriRequest; -import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.entity.GzipCompressingEntity; import org.apache.hc.client5.http.entity.mime.FormBodyPart; import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder; @@ -72,7 +71,6 @@ public class SimpleHttpClient implements AutoCloseable { new DefaultHostnameVerifier()); PoolingHttpClientConnectionManager connManager = PoolingHttpClientConnectionManagerBuilder.create() .setSSLSocketFactory(sslConnectionFactory) - .setDefaultConnectionConfig(ConnectionConfig.custom().build()) .setDnsResolver(new SystemDefaultDnsResolver() { @Override public InetAddress[] resolve(String host) throws UnknownHostException { @@ -160,7 +158,6 @@ public class SimpleHttpClient implements AutoCloseable { return this; } - @SuppressWarnings("deprecation") public ResponseValidator execute() throws IOException { if (entity != null) { request.setEntity(entity); |