update deps

Author: fslevoaca-ionos

pom.xml

@@ -23,11 +23,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cucumber.jutils.version>9.24</cucumber.jutils.version>
         <cucumber.bom.version>7.21.1</cucumber.bom.version>
-        <junit.bom.version>5.12.0</junit.bom.version>
+        <junit.bom.version>5.12.1</junit.bom.version>
         <jackson.bom.version>2.18.3</jackson.bom.version>
         <guice.version>7.0.0</guice.version>
         <surefire.version>3.5.2</surefire.version>
-        <http.client.version>5.3.1</http.client.version>
+        <http.client.version>5.4.2</http.client.version>
         <awaitility.version>4.3.0</awaitility.version>
         <allure.cucumber.version>2.27.0</allure.cucumber.version>
         <tags>@notebook</tags>

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

@@ -11,17 +11,31 @@
 import me.tongfei.progressbar.DelegatingProgressBarConsumer;
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarBuilder;
+import org.apache.hc.client5.http.HttpRequestRetryStrategy;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 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.ssl.ClientTlsStrategyBuilder;
 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.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.SocketConfig;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.ssl.TLS;
 import org.apache.hc.core5.net.URIBuilder;
+import org.apache.hc.core5.pool.PoolConcurrencyPolicy;
+import org.apache.hc.core5.pool.PoolReusePolicy;
+import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
 import org.awaitility.core.ConditionTimeoutException;
 import org.awaitility.pollinterval.FixedPollInterval;
 import org.awaitility.pollinterval.PollInterval;
@@ -59,9 +73,26 @@ protected static HttpClientBuilder defaultHttpClientBuilder() {
         try {
             SSLContext ctx = SSLContext.getInstance("TLS");
             ctx.init(new KeyManager[0], new TrustManager[]{new DefaultTrustManager()}, new SecureRandom());
+            PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
+                    .setTlsSocketStrategy((TlsSocketStrategy) ClientTlsStrategyBuilder.create()
+                            .setSslContext(ctx)
+                            .setHostnameVerifier(new NoopHostnameVerifier())
+                            .setTlsVersions(TLS.V_1_3)
+                            .build())
+                    .setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.ofSeconds(601)).build())
+                    .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT)
+                    .setConnPoolPolicy(PoolReusePolicy.FIFO)
+                    .setDefaultConnectionConfig(ConnectionConfig.custom()
+                            .setSocketTimeout(Timeout.ofSeconds(601))
+                            .setConnectTimeout(Timeout.ofSeconds(601))
+                            .setTimeToLive(TimeValue.ofSeconds(601))
+                            .build())
+                    .setMaxConnPerRoute(10)
+                    .build();
+
             return HttpClients.custom()
-                    .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
-                            .setSSLSocketFactory(new SSLConnectionSocketFactory(ctx, new NoopHostnameVerifier())).build());
+                    .setConnectionManager(connectionManager)
+                    .setRetryStrategy(new CustomRequestRetryStrategy());
         } catch (NoSuchAlgorithmException | KeyManagementException e) {
             throw new RuntimeException(e);
         }
@@ -232,6 +263,39 @@ private static String prettyPrint(String content) {
         }
     }
 
+    protected static class CustomRequestRetryStrategy implements HttpRequestRetryStrategy {
+        private static final int MAX_RETRIES = 5;
+
+        @Override
+        public boolean retryRequest(HttpRequest httpRequest, IOException e, int count, HttpContext httpContext) {
+            if (count < MAX_RETRIES) {
+                LOG.error("Got request error {}. Retry {}...", e.getMessage(), count);
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean retryRequest(HttpResponse response, int count, HttpContext httpContext) {
+            if (count <= MAX_RETRIES && (response.getCode() == HttpStatus.SC_GATEWAY_TIMEOUT
+                    || response.getCode() == HttpStatus.SC_SERVICE_UNAVAILABLE)) {
+                LOG.warn("Got {} {}. Retry {}...", response.getCode(), response.getReasonPhrase(), count);
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public TimeValue getRetryInterval(HttpResponse response, int count, HttpContext context) {
+            return TimeValue.ofSeconds(10);
+        }
+
+        @Override
+        public TimeValue getRetryInterval(HttpRequest request, IOException e, int count, HttpContext context) {
+            return TimeValue.ofSeconds(5);
+        }
+    }
+
     private static class DefaultTrustManager implements X509TrustManager {
 
         @Override