summaryrefslogtreecommitdiff
path: root/eaaf_core_utils/src
diff options
context:
space:
mode:
Diffstat (limited to 'eaaf_core_utils/src')
-rw-r--r--eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java132
1 files changed, 69 insertions, 63 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java
index ceffe26c..9b51ccd1 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java
@@ -22,14 +22,13 @@ import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
import org.apache.hc.client5.http.io.HttpClientConnectionManager;
import org.apache.hc.client5.http.protocol.RedirectStrategy;
-import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
@@ -40,6 +39,7 @@ import org.apache.hc.core5.http.config.RegistryBuilder;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.pool.PoolConcurrencyPolicy;
+import org.apache.hc.core5.pool.PoolReusePolicy;
import org.apache.hc.core5.util.TimeValue;
import org.springframework.beans.factory.annotation.Autowired;
@@ -185,7 +185,7 @@ public class HttpClientFactory implements IHttpClientFactory {
injectBasicAuthenticationIfRequired(builder, config);
// inject authentication if required
- final LayeredConnectionSocketFactory sslConnectionFactory = getSslContext(config);
+ final DefaultClientTlsStrategy sslConnectionFactory = getSslContext(config);
// set pool connection if required
final HttpClientConnectionManager connectionManager = injectConnectionManager(builder,
@@ -252,7 +252,7 @@ public class HttpClientFactory implements IHttpClientFactory {
injectBasicAuthenticationIfRequired(defaultHttpClientBuilder, defaultHttpClientConfig);
// inject authentication if required
- final LayeredConnectionSocketFactory sslConnectionFactory =
+ final DefaultClientTlsStrategy sslConnectionFactory =
getSslContext(defaultHttpClientConfig);
// set pool connection if required
@@ -379,7 +379,7 @@ public class HttpClientFactory implements IHttpClientFactory {
}
@Nonnull
- private LayeredConnectionSocketFactory getSslContext(final HttpClientConfiguration httpClientConfig)
+ private DefaultClientTlsStrategy getSslContext(final HttpClientConfiguration httpClientConfig)
throws EaafException {
SSLContext sslContext = null;
if (httpClientConfig.getAuthMode().equals(HttpClientConfiguration.ClientAuthMode.SSL)) {
@@ -410,10 +410,9 @@ public class HttpClientFactory implements IHttpClientFactory {
}
- final LayeredConnectionSocketFactory sslSocketFactory =
- new SSLConnectionSocketFactory(sslContext, hostnameVerifier);
+ DefaultClientTlsStrategy tslStrategy = new DefaultClientTlsStrategy(sslContext, hostnameVerifier);
log.debug("HTTP client-builder successfuly initialized");
- return sslSocketFactory;
+ return tslStrategy;
}
@@ -431,7 +430,7 @@ public class HttpClientFactory implements IHttpClientFactory {
@Nonnull
private HttpClientConnectionManager injectConnectionManager(
- HttpClientBuilder builder, final LayeredConnectionSocketFactory sslConnectionFactory)
+ HttpClientBuilder builder, final DefaultClientTlsStrategy sslConnectionFactory)
throws EaafConfigurationException {
if (basicConfig.getBasicConfigurationBoolean(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_USE,
true)) {
@@ -441,34 +440,39 @@ public class HttpClientFactory implements IHttpClientFactory {
TimeUnit.SECONDS);
log.debug("Set {} seconds as time-to-life for pooled http connections");
- final PoolingHttpClientConnectionManager connectionPool = new PoolingHttpClientConnectionManager(
- getDefaultRegistry(sslConnectionFactory),
- PoolConcurrencyPolicy.STRICT, timeToLife, null);
- connectionPool.setDefaultMaxPerRoute(Integer.parseInt(
- basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE)));
- connectionPool.setMaxTotal(Integer.parseInt(
- basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL)));
- connectionPool.setDefaultSocketConfig(SocketConfig.custom()
- .setSoTimeout(
- Integer.parseInt(
- basicConfig.getBasicConfiguration(
- PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS)
- .build());
- connectionPool.setDefaultConnectionConfig(ConnectionConfig.custom()
- .setConnectTimeout(Long.parseLong(
- basicConfig.getBasicConfiguration(
- PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS)
- .setValidateAfterInactivity(Integer.parseInt(
- basicConfig.getBasicConfiguration(
- PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY)), TimeUnit.SECONDS)
- .build());
-
-
+ final PoolingHttpClientConnectionManager connectionPool = PoolingHttpClientConnectionManagerBuilder
+ .create()
+ .setTlsSocketStrategy(sslConnectionFactory)
+ .setDefaultSocketConfig(
+ SocketConfig.custom()
+ .setSoTimeout(
+ Integer.parseInt(
+ basicConfig.getBasicConfiguration(
+ PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS)
+ .build())
+ .setDefaultConnectionConfig(
+ ConnectionConfig.custom()
+ .setTimeToLive(timeToLife)
+ .setConnectTimeout(Long.parseLong(
+ basicConfig.getBasicConfiguration(
+ PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS)
+ .setValidateAfterInactivity(Integer.parseInt(
+ basicConfig.getBasicConfiguration(
+ PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY)),
+ TimeUnit.SECONDS)
+ .build())
+ .setMaxConnPerRoute(Integer.parseInt(
+ basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE)))
+ .setMaxConnTotal(Integer.parseInt(
+ basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL)))
+ .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
+ .setConnPoolPolicy(PoolReusePolicy.FIFO)
+ .build();
builder.setConnectionManager(connectionPool);
log.debug("Initalize http-client pool with, maxTotal: {} maxPerRoute: {}",
connectionPool.getMaxTotal(), connectionPool.getDefaultMaxPerRoute());
@@ -476,25 +480,25 @@ public class HttpClientFactory implements IHttpClientFactory {
} else {
log.debug("Building http-client without Connection-Pool ... ");
- final BasicHttpClientConnectionManager basicPool = new BasicHttpClientConnectionManager(
- getDefaultRegistry(sslConnectionFactory));
-
- basicPool.setSocketConfig(SocketConfig.custom()
- .setSoTimeout(
- Integer.parseInt(
- basicConfig.getBasicConfiguration(
- PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS)
- .build());
- basicPool.setConnectionConfig(ConnectionConfig.custom()
- .setConnectTimeout(
- Long.parseLong(basicConfig.getBasicConfiguration(
- PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION,
- DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS)
- .build());
-
-
+ BasicHttpClientConnectionManager basicPool = BasicHttpClientConnectionManager
+ .create(getDefaultRegistry(sslConnectionFactory));
+ basicPool.setSocketConfig(
+ SocketConfig.custom()
+ .setSoTimeout(
+ Integer.parseInt(
+ basicConfig.getBasicConfiguration(
+ PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS)
+ .build());
+ basicPool.setConnectionConfig(
+ ConnectionConfig.custom()
+ .setConnectTimeout(
+ Long.parseLong(basicConfig.getBasicConfiguration(
+ PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION,
+ DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS)
+ .build());
+
builder.setConnectionManager(basicPool);
return basicPool;
@@ -502,6 +506,7 @@ public class HttpClientFactory implements IHttpClientFactory {
}
+
private RequestConfig buildDefaultRequestConfig(HttpClientConfiguration config) {
final RequestConfig requestConfig =
RequestConfig.custom()
@@ -541,11 +546,12 @@ public class HttpClientFactory implements IHttpClientFactory {
}
- private static Registry<ConnectionSocketFactory> getDefaultRegistry(
- final LayeredConnectionSocketFactory sslConnectionFactory) {
- final RegistryBuilder<ConnectionSocketFactory> builder =
- RegistryBuilder.<ConnectionSocketFactory>create()
- .register("http", PlainConnectionSocketFactory.getSocketFactory());
+ private static Registry<TlsSocketStrategy> getDefaultRegistry(
+ final DefaultClientTlsStrategy sslConnectionFactory) {
+
+ final RegistryBuilder<TlsSocketStrategy> builder =
+ RegistryBuilder.<TlsSocketStrategy>create()
+ .register("http", DefaultClientTlsStrategy.createDefault());
if (sslConnectionFactory != null) {
log.trace("Inject own SSLSocketFactory into pooled connection");
@@ -553,7 +559,7 @@ public class HttpClientFactory implements IHttpClientFactory {
} else {
log.trace("Inject default SSLSocketFactory into pooled connection");
- builder.register("https", SSLConnectionSocketFactory.getSocketFactory());
+ builder.register("https", DefaultClientTlsStrategy.createDefault());
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-24 21:18:32 +0000