Skip to content

Commit 10f7824

Browse files
refactor HTTP client SSL config
1 parent 2d60a0f commit 10f7824

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/main/java/com/cucumber/tutorial/context/services/api/HttpService.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.apache.hc.client5.http.impl.classic.HttpClients;
2020
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
2121
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
22-
import org.apache.hc.client5.http.ssl.ClientTlsStrategyBuilder;
22+
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
23+
import org.apache.hc.client5.http.ssl.HostnameVerificationPolicy;
2324
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
24-
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
2525
import org.apache.hc.core5.http.HttpRequest;
2626
import org.apache.hc.core5.http.HttpResponse;
2727
import org.apache.hc.core5.http.HttpStatus;
@@ -73,10 +73,8 @@ protected static HttpClientBuilder defaultHttpClientBuilder() {
7373
SSLContext ctx = SSLContext.getInstance("TLS");
7474
ctx.init(new KeyManager[0], new TrustManager[]{new DefaultTrustManager()}, new SecureRandom());
7575
PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
76-
.setTlsSocketStrategy((TlsSocketStrategy) ClientTlsStrategyBuilder.create()
77-
.setSslContext(ctx)
78-
.setHostnameVerifier(new NoopHostnameVerifier())
79-
.build())
76+
.setTlsSocketStrategy(new DefaultClientTlsStrategy(ctx, HostnameVerificationPolicy.CLIENT,
77+
NoopHostnameVerifier.INSTANCE))
8078
.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.ofSeconds(601)).build())
8179
.setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
8280
.setConnPoolPolicy(PoolReusePolicy.FIFO)

0 commit comments

Comments
 (0)