From 174bee62bbc6cbc800d4992da6ecf32af6a6594b Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Mon, 2 Nov 2026 20:13:09 +0100 Subject: [PATCH] ConfigDefaults: Use one shared class for all config defaults --- .../testing/sync/TestConnectionReuse.java | 4 +- .../client/WebSocketClientBuilder.java | 7 ++- .../WebSocketServerConnectionFactory.java | 3 +- .../hc/client5/http/ConfigDefaults.java | 63 +++++++++++++++++++ .../http/impl/async/H2AsyncClientBuilder.java | 7 ++- .../async/H2AsyncClientProtocolStarter.java | 5 +- .../impl/async/HttpAsyncClientBuilder.java | 9 +-- ...AsyncClientProtocolNegotiationStarter.java | 7 ++- .../http/impl/async/HttpAsyncClients.java | 22 +++---- .../http/impl/async/InternalH2ConnPool.java | 3 +- .../http/impl/classic/HttpClientBuilder.java | 3 +- .../http/impl/classic/ProxyClient.java | 3 +- .../io/BasicHttpClientConnectionManager.java | 13 ++-- .../DefaultHttpClientConnectionOperator.java | 6 +- .../io/DefaultHttpResponseParserFactory.java | 3 +- .../ManagedHttpClientConnectionFactory.java | 5 +- .../PoolingHttpClientConnectionManager.java | 11 ++-- .../DefaultAsyncClientConnectionOperator.java | 3 +- .../PoolingAsyncClientConnectionManager.java | 7 ++- .../http/protocol/HttpClientContext.java | 3 +- .../http/ssl/AbstractClientTlsStrategy.java | 3 +- .../http/ssl/SSLConnectionSocketFactory.java | 3 +- .../examples/AsyncClientConnectionConfig.java | 3 +- .../AsyncClientEarlyHintsEndToEnd.java | 4 +- .../http/examples/ClientConnectionConfig.java | 3 +- ...ernalHttpAsyncExecRuntimeQueueCapTest.java | 10 +-- .../http/impl/classic/TestProxyClient.java | 5 +- 27 files changed, 151 insertions(+), 67 deletions(-) create mode 100644 httpclient5/src/main/java/org/apache/hc/client5/http/ConfigDefaults.java diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java index 02b6aaeb0c..47bc3b254d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java @@ -35,9 +35,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; import org.apache.hc.client5.testing.classic.RandomHandler; @@ -386,7 +386,7 @@ void testMixedTcpAndUdsConnectionPooling() throws Exception { final URI requestUri = new URI("/random/2000"); final HttpGet udsRequest = new HttpGet(requestUri); final HttpGet tcpRequest = new HttpGet(requestUri); - tcpRequest.setConfig(RequestConfig.DEFAULT); + tcpRequest.setConfig(ConfigDefaults.REQUEST); final HttpClientResponseHandler consumer = response -> { EntityUtils.consume(response.getEntity()); diff --git a/httpclient5-websocket/src/main/java/org/apache/hc/client5/http/websocket/client/WebSocketClientBuilder.java b/httpclient5-websocket/src/main/java/org/apache/hc/client5/http/websocket/client/WebSocketClientBuilder.java index 7d9c7d86a6..d5c07693a3 100644 --- a/httpclient5-websocket/src/main/java/org/apache/hc/client5/http/websocket/client/WebSocketClientBuilder.java +++ b/httpclient5-websocket/src/main/java/org/apache/hc/client5/http/websocket/client/WebSocketClientBuilder.java @@ -28,6 +28,7 @@ import java.util.concurrent.ThreadFactory; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.impl.DefaultClientConnectionReuseStrategy; import org.apache.hc.client5.http.websocket.api.WebSocketClientConfig; import org.apache.hc.client5.http.websocket.client.impl.DefaultWebSocketClient; @@ -432,7 +433,7 @@ public CloseableWebSocketClient build() { final HttpProcessor proc = httpProcessor != null ? httpProcessor : HttpProcessors.client(); final Http1Config h1 = http1Config != null ? http1Config : Http1Config.DEFAULT; - final CharCodingConfig coding = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT; + final CharCodingConfig coding = charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING; final ConnectionReuseStrategy reuseStrategyCopy = connStrategy != null ? connStrategy : new DefaultClientConnectionReuseStrategy(); final TlsStrategy tls = tlsStrategy != null ? tlsStrategy : new BasicClientTlsStrategy(); @@ -440,7 +441,7 @@ public CloseableWebSocketClient build() { final IOReactorMetricsListener metricsListener = reactorMetricsListener != null ? reactorMetricsListener : null; final HttpAsyncRequester requester = AsyncRequesterBootstrap.bootstrap() - .setIOReactorConfig(ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT) + .setIOReactorConfig(ioReactorConfig != null ? ioReactorConfig : ConfigDefaults.IO_REACTOR) .setHttpProcessor(proc) .setHttp1Config(h1) .setCharCodingConfig(coding) @@ -462,7 +463,7 @@ public CloseableWebSocketClient build() { .create(); final H2MultiplexingRequester h2Requester = H2MultiplexingRequesterBootstrap.bootstrap() - .setIOReactorConfig(ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT) + .setIOReactorConfig(ioReactorConfig != null ? ioReactorConfig : ConfigDefaults.IO_REACTOR) .setHttpProcessor(h2HttpProcessor != null ? h2HttpProcessor : H2Processors.client()) .setH2Config(h2Config != null ? h2Config : H2Config.DEFAULT) .setTlsStrategy(tls) diff --git a/httpclient5-websocket/src/main/java/org/apache/hc/core5/websocket/server/WebSocketServerConnectionFactory.java b/httpclient5-websocket/src/main/java/org/apache/hc/core5/websocket/server/WebSocketServerConnectionFactory.java index 51e466b6ed..ccab31c6e7 100644 --- a/httpclient5-websocket/src/main/java/org/apache/hc/core5/websocket/server/WebSocketServerConnectionFactory.java +++ b/httpclient5-websocket/src/main/java/org/apache/hc/core5/websocket/server/WebSocketServerConnectionFactory.java @@ -31,6 +31,7 @@ import javax.net.ssl.SSLSocket; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentLengthStrategy; @@ -64,7 +65,7 @@ class WebSocketServerConnectionFactory implements HttpConnectionFactory responseWriterFactory) { this.scheme = scheme; this.http1Config = http1Config != null ? http1Config : Http1Config.DEFAULT; - this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT; + this.charCodingConfig = charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING; this.incomingContentStrategy = incomingContentStrategy; this.outgoingContentStrategy = outgoingContentStrategy; this.requestParserFactory = requestParserFactory != null ? requestParserFactory : diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ConfigDefaults.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ConfigDefaults.java new file mode 100644 index 0000000000..b36790def3 --- /dev/null +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ConfigDefaults.java @@ -0,0 +1,63 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ +package org.apache.hc.client5.http; + +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.config.TlsConfig; +import org.apache.hc.core5.annotation.Internal; +import org.apache.hc.core5.http.config.CharCodingConfig; +import org.apache.hc.core5.http.config.Http1Config; +import org.apache.hc.core5.http.io.SocketConfig; +import org.apache.hc.core5.http2.config.H2Config; +import org.apache.hc.core5.reactor.IOReactorConfig; +import org.apache.hc.core5.util.Timeout; + +/** + * @since 5.7 + */ +@Internal +final public class ConfigDefaults { + + private static final Timeout DEFAULT_SOCKET_TIMEOUT = Timeout.ofMinutes(3); + + public static final IOReactorConfig IO_REACTOR = IOReactorConfig.custom() + .setSoTimeout(DEFAULT_SOCKET_TIMEOUT) + .build(); + + public static final SocketConfig SOCKET = SocketConfig.custom() + .setSoTimeout(DEFAULT_SOCKET_TIMEOUT) + .build(); + + public static final CharCodingConfig CHAR_CODING = CharCodingConfig.DEFAULT; + public static final H2Config H2 = H2Config.DEFAULT; + public static final Http1Config HTTP1 = Http1Config.DEFAULT; + public static final ConnectionConfig CONNECTION = ConnectionConfig.DEFAULT; + public static final TlsConfig TLS = TlsConfig.DEFAULT; + public static final RequestConfig REQUEST = RequestConfig.DEFAULT; + +} diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java index 6965a05873..9ea31c1817 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java @@ -39,6 +39,7 @@ import java.util.concurrent.ThreadFactory; import org.apache.hc.client5.http.AuthenticationStrategy; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.HttpRequestRetryStrategy; import org.apache.hc.client5.http.SchemePortResolver; @@ -922,12 +923,12 @@ public CloseableHttpAsyncClient build() { final IOEventHandlerFactory ioEventHandlerFactory = new H2AsyncClientProtocolStarter( HttpProcessorBuilder.create().build(), (request, context) -> pushConsumerRegistry.get(request), - h2Config != null ? h2Config : H2Config.DEFAULT, - charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT, + h2Config != null ? h2Config : ConfigDefaults.H2, + charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING, ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE); final DefaultConnectingIOReactor ioReactor = new DefaultConnectingIOReactor( ioEventHandlerFactory, - ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT, + ioReactorConfig != null ? ioReactorConfig : ConfigDefaults.IO_REACTOR, threadFactory != null ? threadFactory : new DefaultThreadFactory("httpclient-dispatch", true), ioSessionDecorator != null ? ioSessionDecorator : LoggingIOSessionDecorator.INSTANCE, ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE, diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientProtocolStarter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientProtocolStarter.java index 555c3b1c38..036b9a47e8 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientProtocolStarter.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientProtocolStarter.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.util.List; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.core5.function.Callback; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpConnection; @@ -71,8 +72,8 @@ class H2AsyncClientProtocolStarter implements IOEventHandlerFactory { final Callback exceptionCallback) { this.httpProcessor = Args.notNull(httpProcessor, "HTTP processor"); this.exchangeHandlerFactory = exchangeHandlerFactory; - this.h2Config = h2Config != null ? h2Config : H2Config.DEFAULT; - this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT; + this.h2Config = h2Config != null ? h2Config : ConfigDefaults.H2; + this.charCodingConfig = charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING; this.exceptionCallback = exceptionCallback; } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java index 82b38fa864..3c2b051ff9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientBuilder.java @@ -41,6 +41,7 @@ import java.util.function.UnaryOperator; import org.apache.hc.client5.http.AuthenticationStrategy; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.EarlyHintsListener; import org.apache.hc.client5.http.HttpRequestRetryStrategy; @@ -1209,14 +1210,14 @@ public CloseableHttpAsyncClient build() { final IOEventHandlerFactory ioEventHandlerFactory = new HttpAsyncClientProtocolNegotiationStarter( HttpProcessorBuilder.create().build(), (request, context) -> pushConsumerRegistry.get(request), - h2Config != null ? h2Config : H2Config.DEFAULT, - h1Config != null ? h1Config : Http1Config.DEFAULT, - charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT, + h2Config != null ? h2Config : ConfigDefaults.H2, + h1Config != null ? h1Config : ConfigDefaults.HTTP1, + charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING, reuseStrategyCopy, ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE); final DefaultConnectingIOReactor ioReactor = new DefaultConnectingIOReactor( ioEventHandlerFactory, - ioReactorConfig != null ? ioReactorConfig : IOReactorConfig.DEFAULT, + ioReactorConfig != null ? ioReactorConfig : ConfigDefaults.IO_REACTOR, threadFactory != null ? threadFactory : new DefaultThreadFactory("httpclient-dispatch", true), ioSessionDecorator != null ? ioSessionDecorator : LoggingIOSessionDecorator.INSTANCE, ioReactorExceptionCallback != null ? ioReactorExceptionCallback : LoggingExceptionCallback.INSTANCE, diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientProtocolNegotiationStarter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientProtocolNegotiationStarter.java index 72beaaa286..0c257f4bd9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientProtocolNegotiationStarter.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientProtocolNegotiationStarter.java @@ -31,6 +31,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.impl.DefaultClientConnectionReuseStrategy; import org.apache.hc.core5.function.Callback; import org.apache.hc.core5.http.ConnectionReuseStrategy; @@ -98,9 +99,9 @@ class HttpAsyncClientProtocolNegotiationStarter implements IOEventHandlerFactory final Callback exceptionCallback) { this.httpProcessor = Args.notNull(httpProcessor, "HTTP processor"); this.exchangeHandlerFactory = exchangeHandlerFactory; - this.h2Config = h2Config != null ? h2Config : H2Config.DEFAULT; - this.h1Config = h1Config != null ? h1Config : Http1Config.DEFAULT; - this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT; + this.h2Config = h2Config != null ? h2Config : ConfigDefaults.H2; + this.h1Config = h1Config != null ? h1Config : ConfigDefaults.HTTP1; + this.charCodingConfig = charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING; this.http1ConnectionReuseStrategy = connectionReuseStrategy != null ? connectionReuseStrategy : DefaultClientConnectionReuseStrategy.INSTANCE; this.http1ResponseParserFactory = new DefaultHttpResponseParserFactory(h1Config); this.http1RequestWriterFactory = DefaultHttpRequestWriterFactory.INSTANCE; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java index 7afd03ccf0..f2fa19b36e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java @@ -27,6 +27,7 @@ package org.apache.hc.client5.http.impl.async; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.SchemePortResolver; import org.apache.hc.client5.http.SystemDefaultDnsResolver; @@ -41,7 +42,6 @@ import org.apache.hc.core5.annotation.Experimental; import org.apache.hc.core5.concurrent.DefaultThreadFactory; import org.apache.hc.core5.function.Supplier; -import org.apache.hc.core5.http.config.CharCodingConfig; import org.apache.hc.core5.http.config.Http1Config; import org.apache.hc.core5.http.impl.routing.RequestRouter; import org.apache.hc.core5.http.nio.AsyncPushConsumer; @@ -172,7 +172,7 @@ public static MinimalHttpAsyncClient createMinimal( (request, context) -> pushConsumerRegistry.get(request), h2Config, h1Config, - CharCodingConfig.DEFAULT, + ConfigDefaults.CHAR_CODING, DefaultClientConnectionReuseStrategy.INSTANCE, LoggingExceptionCallback.INSTANCE), pushConsumerRegistry, @@ -201,7 +201,7 @@ public static MinimalHttpAsyncClient createMinimal( (request, context) -> pushConsumerRegistry.get(request), h2Config, h1Config, - CharCodingConfig.DEFAULT, + ConfigDefaults.CHAR_CODING, DefaultClientConnectionReuseStrategy.INSTANCE, LoggingExceptionCallback.INSTANCE), pushConsumerRegistry, @@ -247,7 +247,7 @@ public static MinimalHttpAsyncClient createMinimal( * functionality. */ public static MinimalHttpAsyncClient createMinimal(final H2Config h2Config, final Http1Config h1Config) { - return createMinimal(HttpVersionPolicy.NEGOTIATE, h2Config, h1Config, IOReactorConfig.DEFAULT); + return createMinimal(HttpVersionPolicy.NEGOTIATE, h2Config, h1Config, ConfigDefaults.IO_REACTOR); } /** @@ -256,7 +256,7 @@ public static MinimalHttpAsyncClient createMinimal(final H2Config h2Config, fina * functionality. */ public static MinimalHttpAsyncClient createMinimal() { - return createMinimal(H2Config.DEFAULT, Http1Config.DEFAULT); + return createMinimal(ConfigDefaults.H2, ConfigDefaults.HTTP1); } /** @@ -267,9 +267,9 @@ public static MinimalHttpAsyncClient createMinimal() { public static MinimalHttpAsyncClient createMinimal(final AsyncClientConnectionManager connManager) { return createMinimal( HttpVersionPolicy.NEGOTIATE, - H2Config.DEFAULT, - Http1Config.DEFAULT, - IOReactorConfig.DEFAULT, + ConfigDefaults.H2, + ConfigDefaults.HTTP1, + ConfigDefaults.IO_REACTOR, connManager); } @@ -304,7 +304,7 @@ public static MinimalH2AsyncClient createHttp2Minimal( createMinimalProtocolProcessor(), (request, context) -> pushConsumerRegistry.get(request), h2Config, - CharCodingConfig.DEFAULT, + ConfigDefaults.CHAR_CODING, LoggingExceptionCallback.INSTANCE), pushConsumerRegistry, ioReactorConfig, @@ -338,7 +338,7 @@ public static MinimalH2AsyncClient createHttp2Minimal( * transport without advanced HTTP protocol functionality. */ public static MinimalH2AsyncClient createHttp2Minimal(final H2Config h2Config) { - return createHttp2Minimal(h2Config, IOReactorConfig.DEFAULT); + return createHttp2Minimal(h2Config, ConfigDefaults.IO_REACTOR); } /** @@ -346,7 +346,7 @@ public static MinimalH2AsyncClient createHttp2Minimal(final H2Config h2Config) { * transport without advanced HTTP protocol functionality. */ public static MinimalH2AsyncClient createHttp2Minimal() { - return createHttp2Minimal(H2Config.DEFAULT); + return createHttp2Minimal(ConfigDefaults.H2); } /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2ConnPool.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2ConnPool.java index 125f4482ff..b5ccfe3b5c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2ConnPool.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2ConnPool.java @@ -30,6 +30,7 @@ import java.time.Clock; import java.util.concurrent.Future; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.core5.concurrent.CallbackContribution; @@ -198,7 +199,7 @@ ConnectionConfig resolveConnectionConfig(final HttpRoute route) { final HttpHost target = route.getTargetHost(); final Resolver localResolver = connectionConfigResolver; final ConnectionConfig connectionConfig = localResolver != null ? localResolver.resolve(target) : null; - return connectionConfig != null ? connectionConfig : ConnectionConfig.DEFAULT; + return connectionConfig != null ? connectionConfig : ConfigDefaults.CONNECTION; } @Override diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java index d2d70ed7d4..20f360e009 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java @@ -39,6 +39,7 @@ import java.util.function.UnaryOperator; import org.apache.hc.client5.http.AuthenticationStrategy; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.ConnectionKeepAliveStrategy; import org.apache.hc.client5.http.HttpRequestRetryStrategy; import org.apache.hc.client5.http.SchemePortResolver; @@ -1132,7 +1133,7 @@ public CloseableHttpClient build() { defaultCookieStore, defaultCredentialsProvider, contextAdaptor(), - defaultRequestConfig != null ? defaultRequestConfig : RequestConfig.DEFAULT, + defaultRequestConfig != null ? defaultRequestConfig : ConfigDefaults.REQUEST, closeablesCopy); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java index 651f352bb0..09a0a96534 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProxyClient.java @@ -31,6 +31,7 @@ import java.net.Socket; import org.apache.hc.client5.http.AuthenticationStrategy; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteInfo.LayerType; import org.apache.hc.client5.http.RouteInfo.TunnelType; @@ -105,7 +106,7 @@ public ProxyClient( .http1Config(h1Config) .charCodingConfig(charCodingConfig) .build(); - this.requestConfig = requestConfig != null ? requestConfig : RequestConfig.DEFAULT; + this.requestConfig = requestConfig != null ? requestConfig : ConfigDefaults.REQUEST; this.httpProcessor = new DefaultHttpProcessor( new RequestTargetHost(), new RequestClientConnControl(), new RequestUserAgent()); this.requestExec = new HttpRequestExecutor(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java index 49cef36be2..3980fee4c9 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.EndpointInfo; import org.apache.hc.client5.http.HttpRoute; @@ -132,9 +133,9 @@ public BasicHttpClientConnectionManager( this.connFactory = connFactory != null ? connFactory : ManagedHttpClientConnectionFactory.INSTANCE; this.id = INCREMENTING_ID.getNextId(); this.expiry = Long.MAX_VALUE; - this.socketConfig = SocketConfig.DEFAULT; - this.connectionConfig = ConnectionConfig.DEFAULT; - this.tlsConfig = TlsConfig.DEFAULT; + this.socketConfig = ConfigDefaults.SOCKET; + this.connectionConfig = ConfigDefaults.CONNECTION; + this.tlsConfig = ConfigDefaults.TLS; this.closed = new AtomicBoolean(false); this.lock = new ReentrantLock(); } @@ -243,7 +244,7 @@ public SocketConfig getSocketConfig() { public void setSocketConfig(final SocketConfig socketConfig) { lock.lock(); try { - this.socketConfig = socketConfig != null ? socketConfig : SocketConfig.DEFAULT; + this.socketConfig = socketConfig != null ? socketConfig : ConfigDefaults.SOCKET; } finally { lock.unlock(); } @@ -268,7 +269,7 @@ public ConnectionConfig getConnectionConfig() { public void setConnectionConfig(final ConnectionConfig connectionConfig) { lock.lock(); try { - this.connectionConfig = connectionConfig != null ? connectionConfig : ConnectionConfig.DEFAULT; + this.connectionConfig = connectionConfig != null ? connectionConfig : ConfigDefaults.CONNECTION; } finally { lock.unlock(); } @@ -292,7 +293,7 @@ public TlsConfig getTlsConfig() { public void setTlsConfig(final TlsConfig tlsConfig) { lock.lock(); try { - this.tlsConfig = tlsConfig != null ? tlsConfig : TlsConfig.DEFAULT; + this.tlsConfig = tlsConfig != null ? tlsConfig : ConfigDefaults.TLS; } finally { lock.unlock(); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java index a5f616865f..a4796b6d1b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java @@ -38,6 +38,8 @@ import javax.net.ssl.SSLSocket; +import jdk.net.ExtendedSocketOptions; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.ConnectExceptionSupport; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.SchemePortResolver; @@ -68,8 +70,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jdk.net.ExtendedSocketOptions; - /** * Default implementation of {@link HttpClientConnectionOperator} used as default in Http client, * when no instance provided by user to {@link BasicHttpClientConnectionManager} or {@link @@ -253,7 +253,7 @@ private void upgradeToTls(final ManagedHttpClientConnection conn, final HttpHost if (LOG.isDebugEnabled()) { LOG.debug("{} {} upgrading to TLS", ConnPoolSupport.getId(conn), tlsName); } - final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : TlsConfig.DEFAULT; + final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : ConfigDefaults.TLS; final int soTimeout = socket.getSoTimeout(); final Timeout handshakeTimeout = tlsConfig.getHandshakeTimeout() != null ? tlsConfig.getHandshakeTimeout() : connectTimeout; if (handshakeTimeout != null) { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java index 1407debd93..0b67e124ab 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpResponseParserFactory.java @@ -27,6 +27,7 @@ package org.apache.hc.client5.http.impl.io; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.ClassicHttpResponse; @@ -63,7 +64,7 @@ public DefaultHttpResponseParserFactory( final LineParser lineParser, final HttpResponseFactory responseFactory) { super(); - this.h1Config = h1Config != null ? h1Config : Http1Config.DEFAULT; + this.h1Config = h1Config != null ? h1Config : ConfigDefaults.HTTP1; this.lineParser = lineParser != null ? lineParser : BasicLineParser.INSTANCE; this.responseFactory = responseFactory != null ? responseFactory : DefaultClassicHttpResponseFactory.INSTANCE; } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java index 7239fa9332..28baec5df4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java @@ -35,6 +35,7 @@ import java.nio.charset.CodingErrorAction; import java.util.concurrent.atomic.AtomicLong; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.io.ManagedHttpClientConnection; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; @@ -81,8 +82,8 @@ private ManagedHttpClientConnectionFactory( final ContentLengthStrategy incomingContentStrategy, final ContentLengthStrategy outgoingContentStrategy, final ResponseOutOfOrderStrategy responseOutOfOrderStrategy) { - this.h1Config = h1Config != null ? h1Config : Http1Config.DEFAULT; - this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT; + this.h1Config = h1Config != null ? h1Config : ConfigDefaults.HTTP1; + this.charCodingConfig = charCodingConfig != null ? charCodingConfig : ConfigDefaults.CHAR_CODING; this.requestWriterFactory = requestWriterFactory != null ? requestWriterFactory : new DefaultHttpRequestWriterFactory(this.h1Config); this.responseParserFactory = responseParserFactory != null ? responseParserFactory : diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java index 6d670bf3e6..953ae838c5 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.ReentrantLock; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.EndpointInfo; import org.apache.hc.client5.http.HttpRoute; @@ -337,19 +338,19 @@ private InternalConnectionEndpoint cast(final ConnectionEndpoint endpoint) { private SocketConfig resolveSocketConfig(final HttpRoute route) { final Resolver resolver = this.socketConfigResolver; final SocketConfig socketConfig = resolver != null ? resolver.resolve(route) : null; - return socketConfig != null ? socketConfig : SocketConfig.DEFAULT; + return socketConfig != null ? socketConfig : ConfigDefaults.SOCKET; } private ConnectionConfig resolveConnectionConfig(final HttpRoute route) { final Resolver resolver = this.connectionConfigResolver; final ConnectionConfig connectionConfig = resolver != null ? resolver.resolve(route) : null; - return connectionConfig != null ? connectionConfig : ConnectionConfig.DEFAULT; + return connectionConfig != null ? connectionConfig : ConfigDefaults.CONNECTION; } private TlsConfig resolveTlsConfig(final HttpHost host) { final Resolver resolver = this.tlsConfigResolver; final TlsConfig tlsConfig = resolver != null ? resolver.resolve(host) : null; - return tlsConfig != null ? tlsConfig : TlsConfig.DEFAULT; + return tlsConfig != null ? tlsConfig : ConfigDefaults.TLS; } private TimeValue resolveValidateAfterInactivity(final ConnectionConfig connectionConfig) { @@ -736,7 +737,7 @@ void closeIfExpired(final PoolEntry entr */ @Deprecated public SocketConfig getDefaultSocketConfig() { - return SocketConfig.DEFAULT; + return ConfigDefaults.SOCKET; } /** @@ -746,7 +747,7 @@ public SocketConfig getDefaultSocketConfig() { */ @Deprecated public TimeValue getValidateAfterInactivity() { - return ConnectionConfig.DEFAULT.getValidateAfterInactivity(); + return ConfigDefaults.CONNECTION.getValidateAfterInactivity(); } /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java index e0f0d5050d..c3b5c1a48a 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java @@ -34,6 +34,7 @@ import java.nio.file.Path; import java.util.concurrent.Future; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.SchemePortResolver; import org.apache.hc.client5.http.UnsupportedSchemeException; @@ -137,7 +138,7 @@ public Future connect( } else { remoteAddress = createUnixSocketAddress(unixDomainSocket); } - final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : TlsConfig.DEFAULT; + final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : ConfigDefaults.TLS; onBeforeSocketConnect(context, endpointHost); if (LOG.isDebugEnabled()) { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java index d030b9b3f3..e0b2944e07 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.EndpointInfo; import org.apache.hc.client5.http.HttpRoute; @@ -266,14 +267,14 @@ private InternalConnectionEndpoint cast(final AsyncConnectionEndpoint endpoint) private ConnectionConfig resolveConnectionConfig(final HttpRoute route) { final Resolver resolver = this.connectionConfigResolver; final ConnectionConfig connectionConfig = resolver != null ? resolver.resolve(route) : null; - return connectionConfig != null ? connectionConfig : ConnectionConfig.DEFAULT; + return connectionConfig != null ? connectionConfig : ConfigDefaults.CONNECTION; } private TlsConfig resolveTlsConfig(final HttpHost host) { final Resolver resolver = this.tlsConfigResolver; TlsConfig tlsConfig = resolver != null ? resolver.resolve(host) : null; if (tlsConfig == null) { - tlsConfig = TlsConfig.DEFAULT; + tlsConfig = ConfigDefaults.TLS; } if (URIScheme.HTTP.same(host.getSchemeName()) && tlsConfig.getHttpVersionPolicy() == HttpVersionPolicy.NEGOTIATE) { @@ -727,7 +728,7 @@ void closeIfExpired(final PoolEntry ent */ @Deprecated public TimeValue getValidateAfterInactivity() { - return ConnectionConfig.DEFAULT.getValidateAfterInactivity(); + return ConfigDefaults.CONNECTION.getValidateAfterInactivity(); } /** diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java index 7ba111d4a7..c5c80605b2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/HttpClientContext.java @@ -32,6 +32,7 @@ import javax.net.ssl.SSLSession; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.RouteInfo; import org.apache.hc.client5.http.auth.AuthCache; @@ -443,7 +444,7 @@ public RequestConfig getRequestConfig() { */ public final RequestConfig getRequestConfigOrDefault() { final RequestConfig requestConfig = getRequestConfig(); - return requestConfig != null ? requestConfig : RequestConfig.DEFAULT; + return requestConfig != null ? requestConfig : ConfigDefaults.REQUEST; } public void setRequestConfig(final RequestConfig requestConfig) { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/AbstractClientTlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/AbstractClientTlsStrategy.java index 0aba6a75ae..cc0dbb3f28 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/AbstractClientTlsStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/AbstractClientTlsStrategy.java @@ -49,6 +49,7 @@ import javax.net.ssl.SSLSocket; import javax.security.auth.x500.X500Principal; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.Internal; @@ -131,7 +132,7 @@ public void upgrade( final FutureCallback callback) { tlsSession.startTls(sslContext, endpoint, sslBufferManagement, (e, sslEngine) -> { - final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : TlsConfig.DEFAULT; + final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : ConfigDefaults.TLS; final HttpVersionPolicy versionPolicy = tlsConfig.getHttpVersionPolicy(); final SSLParameters sslParameters = sslEngine.getSSLParameters(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java index c06127cb4b..8aad4e55b6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java @@ -52,6 +52,7 @@ import javax.net.ssl.SSLSocket; import javax.security.auth.x500.X500Principal; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; @@ -303,7 +304,7 @@ private void executeHandshake( final String target, final Object attachment, final HttpContext context) throws IOException { - final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : TlsConfig.DEFAULT; + final TlsConfig tlsConfig = attachment instanceof TlsConfig ? (TlsConfig) attachment : ConfigDefaults.TLS; if (supportedProtocols != null) { sslsock.setEnabledProtocols(supportedProtocols); } else { diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionConfig.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionConfig.java index 2dd160cb82..b259165c0c 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionConfig.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientConnectionConfig.java @@ -28,6 +28,7 @@ import java.util.concurrent.Future; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; @@ -81,7 +82,7 @@ public static void main(final String[] args) throws Exception { .setHandshakeTimeout(Timeout.ofSeconds(10)) .build(); } - return TlsConfig.DEFAULT; + return ConfigDefaults.TLS; }) .build(); try (final CloseableHttpAsyncClient client = HttpAsyncClients.custom() diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientEarlyHintsEndToEnd.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientEarlyHintsEndToEnd.java index 8a32b57769..f3600ed1d3 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientEarlyHintsEndToEnd.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientEarlyHintsEndToEnd.java @@ -35,11 +35,11 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.EarlyHintsListener; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.client5.http.async.methods.SimpleRequestBuilder; -import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; @@ -158,7 +158,7 @@ public void releaseResources() { /* no-op for demo */ } try (final CloseableHttpAsyncClient client = HttpAsyncClients.custom() .setConnectionManager( PoolingAsyncClientConnectionManagerBuilder.create() - .setDefaultTlsConfig(TlsConfig.DEFAULT) // plain HTTP here; keep TLS config for real targets + .setDefaultTlsConfig(ConfigDefaults.TLS) // plain HTTP here; keep TLS config for real targets .build()) .setEarlyHintsListener(hintsListener) .build()) { diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionConfig.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionConfig.java index 0f9dcd35b1..4c2501ddf4 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionConfig.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConnectionConfig.java @@ -26,6 +26,7 @@ */ package org.apache.hc.client5.http.examples; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; @@ -75,7 +76,7 @@ public final static void main(final String[] args) throws Exception { .setHandshakeTimeout(Timeout.ofSeconds(10)) .build(); } - return TlsConfig.DEFAULT; + return ConfigDefaults.TLS; }) .build(); try (CloseableHttpClient httpclient = HttpClients.custom() diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntimeQueueCapTest.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntimeQueueCapTest.java index 0a00c17fbf..faf6759bf6 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntimeQueueCapTest.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntimeQueueCapTest.java @@ -46,11 +46,11 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.EndpointInfo; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.async.AsyncExecRuntime; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.config.TlsConfig; import org.apache.hc.client5.http.nio.AsyncClientConnectionManager; import org.apache.hc.client5.http.nio.AsyncConnectionEndpoint; import org.apache.hc.client5.http.protocol.HttpClientContext; @@ -88,7 +88,7 @@ void testRequestsQueuedWhenOverCap() throws Exception { manager, new NoopInitiator(), new NoopPushFactory(), - TlsConfig.DEFAULT, + ConfigDefaults.TLS, new SharedRequestExecutionQueue(2)); final HttpClientContext ctx = HttpClientContext.create(); @@ -128,7 +128,7 @@ void testSlotReleasedOnTerminalSignalAllowsNext() throws Exception { manager, new NoopInitiator(), new NoopPushFactory(), - TlsConfig.DEFAULT, + ConfigDefaults.TLS, new SharedRequestExecutionQueue(1)); final HttpClientContext ctx = HttpClientContext.create(); @@ -164,7 +164,7 @@ void testRecursiveReentryCausesSOEWithoutCap() { manager, new NoopInitiator(), new NoopPushFactory(), - TlsConfig.DEFAULT, + ConfigDefaults.TLS, null); final HttpClientContext ctx = HttpClientContext.create(); @@ -188,7 +188,7 @@ void testCapBreaksRecursiveReentry() throws Exception { manager, new NoopInitiator(), new NoopPushFactory(), - TlsConfig.DEFAULT, + ConfigDefaults.TLS, new SharedRequestExecutionQueue(1)); final HttpClientContext ctx = HttpClientContext.create(); diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProxyClient.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProxyClient.java index 4c14e2c5eb..1c726d18d6 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProxyClient.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestProxyClient.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.net.Socket; +import org.apache.hc.client5.http.ConfigDefaults; import org.apache.hc.client5.http.auth.Credentials; import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.config.RequestConfig; @@ -67,7 +68,7 @@ void testTunnelWithInvalidPort() throws IOException { fail("Shouldn't fail"); } - final RequestConfig requestConfig = RequestConfig.DEFAULT; + final RequestConfig requestConfig = ConfigDefaults.REQUEST; final ProxyClient client = new ProxyClient(connFactory, null, null, requestConfig); @@ -97,7 +98,7 @@ void testSuccessfulTunnel() throws IOException, HttpException { final Socket mockSocket = mock(Socket.class); when(managedConnection.getSocket()).thenReturn(mockSocket); - final RequestConfig requestConfig = RequestConfig.DEFAULT; + final RequestConfig requestConfig = ConfigDefaults.REQUEST; final ProxyClient client = new ProxyClient(connFactory, null, null, requestConfig);