Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Configure ResponseTimeout for a Request, move off deprecated API by always configuring a PoolingHttpClientConnectionManager.

See gh-861
Original pull request: gh-866
This commit is contained in:
Mark Paluch
2024-05-16 15:59:24 +02:00
parent 579b8d63d7
commit 3cf4e01f84
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpRequestFactoryFactory.java
View File

@@ -47,11 +47,11 @@ import okhttp3.ConnectionSpec;
import okhttp3.OkHttpClient.Builder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.config.ConnectionConfig;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
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.PoolingHttpClientConnectionManager;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
import org.apache.hc.client5.http.ssl.HttpsSupport;
@@ -298,6 +298,28 @@ public class ClientHttpRequestFactoryFactory {
httpClientBuilder.setRoutePlanner(
new SystemDefaultRoutePlanner(DefaultSchemePortResolver.INSTANCE, ProxySelector.getDefault()));
Timeout readTimeout = Timeout.ofMilliseconds(options.getReadTimeout().toMillis());
Timeout connectTimeout = Timeout.ofMilliseconds(options.getConnectionTimeout().toMillis());
ConnectionConfig connectionConfig = ConnectionConfig.custom()
.setConnectTimeout(connectTimeout) //
.setSocketTimeout(readTimeout) //
.build();
RequestConfig requestConfig = RequestConfig.custom()
.setConnectionRequestTimeout(connectTimeout)
.setResponseTimeout(readTimeout)
.setAuthenticationEnabled(true) //
.setRedirectsEnabled(true)
.build();
PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder //
.create()
.setDefaultConnectionConfig(connectionConfig) //
.setDefaultSocketConfig(SocketConfig.custom() //
.setSoTimeout(readTimeout)
.build());
if (hasSslConfiguration(sslConfiguration)) {
SSLContext sslContext = getSSLContext(sslConfiguration);
@@ -316,24 +338,12 @@ public class ClientHttpRequestFactoryFactory {
SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext,
enabledProtocols, enabledCipherSuites, HttpsSupport.getDefaultHostnameVerifier());
PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder //
.create()
.setSSLSocketFactory(sslSocketFactory) //
.setDefaultSocketConfig(SocketConfig.custom() //
.setSoTimeout(Timeout.ofMilliseconds(options.getReadTimeout().toMillis()))
.build()) //
.build(); //
httpClientBuilder.setConnectionManager(connectionManager);
connectionManagerBuilder.setSSLSocketFactory(sslSocketFactory);
}
RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(Timeout.ofMilliseconds(options.getConnectionTimeout().toMillis()))
.setConnectionRequestTimeout(Timeout.ofMilliseconds(options.getReadTimeout().toMillis()))
.setAuthenticationEnabled(true) //
.setRedirectsEnabled(true)
.build();
httpClientBuilder.setDefaultRequestConfig(requestConfig);
httpClientBuilder.setConnectionManager(connectionManagerBuilder.build());
return httpClientBuilder;
}