[java] Update failsafe retry dependency to 3.2.3

Author: pujagani

java/maven_deps.bzl

@@ -67,7 +67,7 @@ def selenium_java_deps():
                 ],
             ),
             "net.bytebuddy:byte-buddy:1.12.7",
-            "net.jodah:failsafe:2.4.4",
+            "dev.failsafe:failsafe:3.2.3",
             "net.sourceforge.htmlunit:htmlunit-core-js:2.57.0",
             "org.apache.commons:commons-exec:1.3",
             "org.assertj:assertj-core:3.22.0",

java/maven_install.json

@@ -17,7 +17,7 @@ java_library(
         "//java/src/org/openqa/selenium/grid/security",
         "//java/src/org/openqa/selenium/json",
         artifact("com.google.guava:guava"),
-        artifact("net.jodah:failsafe"),
+        artifact("dev.failsafe:failsafe"),
         artifact("org.zeromq:jeromq"),
     ],
 )

java/src/org/openqa/selenium/events/zeromq/BUILD.bazel

@@ -21,8 +21,8 @@
 
 import com.google.common.collect.EvictingQueue;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 
 import org.openqa.selenium.events.Event;
 import org.openqa.selenium.events.EventBus;
@@ -110,12 +110,13 @@ class UnboundZmqEventBus implements EventBus {
     String connectionMessage = String.format("Connecting to %s and %s", publishConnection, subscribeConnection);
     LOG.info(connectionMessage);
 
-    RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
+    RetryPolicy<Object> retryPolicy = RetryPolicy.builder()
       .withMaxAttempts(5)
       .withDelay(5, 10, ChronoUnit.SECONDS)
       .onFailedAttempt(e -> LOG.log(Level.WARNING, String.format("%s failed", connectionMessage)))
       .onRetry(e -> LOG.log(Level.WARNING, String.format("Failure #%s. Retrying.", e.getAttemptCount())))
-      .onRetriesExceeded(e -> LOG.log(Level.WARNING, "Connection aborted."));
+      .onRetriesExceeded(e -> LOG.log(Level.WARNING, "Connection aborted."))
+      .build();
 
     // Access to the zmq socket is safe here: no threads.
     Failsafe.with(retryPolicy).run(

java/src/org/openqa/selenium/events/zeromq/UnboundZmqEventBus.java

@@ -30,6 +30,6 @@ java_library(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         artifact("com.google.guava:guava"),
-        artifact("net.jodah:failsafe"),
+        artifact("dev.failsafe:failsafe"),
     ],
 )

java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel

@@ -32,8 +32,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
@@ -339,11 +339,12 @@ private void updateNodeStatus(NodeStatus status, Runnable healthCheck) {
       // Running the health check right after the Node registers itself. We retry the
       // execution because the Node might on a complex network topology. For example,
       // Kubernetes pods with IPs that take a while before they are reachable.
-      RetryPolicy<Object> initialHealthCheckPolicy = new RetryPolicy<>()
+      RetryPolicy<Object> initialHealthCheckPolicy =  RetryPolicy.builder()
         .withMaxAttempts(-1)
         .withMaxDuration(Duration.ofSeconds(90))
         .withDelay(Duration.ofSeconds(15))
-        .abortIf(result -> true);
+        .abortIf(result -> true)
+        .build();
 
       LOG.log(getDebugLogLevel(), "Running health check for Node " + status.getExternalUri());
       Executors.newSingleThreadExecutor().submit(

java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java

@@ -23,6 +23,6 @@ java_library(
         "//java/src/org/openqa/selenium/netty/server",
         "//java/src/org/openqa/selenium/remote",
         artifact("com.google.guava:guava"),
-        artifact("net.jodah:failsafe"),
+        artifact("dev.failsafe:failsafe"),
     ],
 )

java/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel

@@ -21,8 +21,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.MediaType;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.cli.CliCommand;
@@ -192,11 +192,12 @@ public NettyServer start() {
 
         // Unlimited attempts, every X seconds, we assume a Node should not need more than Y minutes to register
         // X defaults to 10s and Y to 120 seconds, but the user can overwrite that.
-        RetryPolicy<Object> registrationPolicy = new RetryPolicy<>()
+        RetryPolicy<Object> registrationPolicy = RetryPolicy.builder()
           .withMaxAttempts(-1)
           .withMaxDuration(nodeOptions.getRegisterPeriod())
           .withDelay(nodeOptions.getRegisterCycle())
-          .handleResultIf(result -> true);
+          .handleResultIf(result -> true)
+          .build();
 
         LOG.info("Starting registration process for Node " + node.getUri());
         Executors.newSingleThreadExecutor().submit(() -> {

java/src/org/openqa/selenium/grid/node/httpd/NodeServer.java

@@ -17,6 +17,6 @@ java_export(
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/json",
         artifact("com.google.guava:guava"),
-        artifact("net.jodah:failsafe")
+        artifact("dev.failsafe:failsafe")
     ],
 )

java/src/org/openqa/selenium/remote/http/BUILD.bazel

@@ -22,8 +22,8 @@
 import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
 import static org.openqa.selenium.internal.Debug.getDebugLogLevel;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 
 import org.openqa.selenium.TimeoutException;
 
@@ -36,39 +36,42 @@ public class RetryRequest implements Filter {
   private static final Logger LOG = Logger.getLogger(RetryRequest.class.getName());
 
   // Retry on connection error.
-  private static final RetryPolicy<HttpResponse> connectionFailurePolicy =
-    new RetryPolicy<HttpResponse>()
+  private static final RetryPolicy<Object> connectionFailurePolicy =
+    RetryPolicy.builder()
       .handleIf(failure -> failure.getCause() instanceof ConnectException)
       .withBackoff(1, 4, ChronoUnit.SECONDS)
       .withMaxRetries(3)
       .onRetry(e -> LOG.log(
         getDebugLogLevel(),
         "Connection failure #{0}. Retrying.",
-        e.getAttemptCount()));
+        e.getAttemptCount()))
+      .build();
 
   // Retry on read timeout.
-  private static final RetryPolicy<HttpResponse> readTimeoutPolicy =
-    new RetryPolicy<HttpResponse>()
+  private static final RetryPolicy<Object> readTimeoutPolicy =
+    RetryPolicy.builder()
       .handle(TimeoutException.class)
       .withBackoff(1, 4, ChronoUnit.SECONDS)
       .withMaxRetries(3)
       .onRetry(e -> LOG.log(
         getDebugLogLevel(),
         "Read timeout #{0}. Retrying.",
-        e.getAttemptCount()));
+        e.getAttemptCount()))
+      .build();
 
   // Retry if server is unavailable or an internal server error occurs without response body.
-  private static final RetryPolicy<HttpResponse> serverErrorPolicy =
-    new RetryPolicy<HttpResponse>()
-      .handleResultIf(response -> response.getStatus() == HTTP_INTERNAL_ERROR &&
-                                  Integer.parseInt(response.getHeader(CONTENT_LENGTH)) == 0)
-      .handleResultIf(response -> response.getStatus() == HTTP_UNAVAILABLE)
+  private static final RetryPolicy<Object> serverErrorPolicy =
+    RetryPolicy.builder()
+      .handleResultIf(response -> ((HttpResponse)response).getStatus() == HTTP_INTERNAL_ERROR &&
+                                  Integer.parseInt(((HttpResponse)response).getHeader(CONTENT_LENGTH)) == 0)
+      .handleResultIf(response -> ((HttpResponse)response).getStatus() == HTTP_UNAVAILABLE)
       .withBackoff(1, 2, ChronoUnit.SECONDS)
       .withMaxRetries(2)
       .onRetry(e -> LOG.log(
         getDebugLogLevel(),
         "Failure due to server error #{0}. Retrying.",
-        e.getAttemptCount()));
+        e.getAttemptCount()))
+      .build();
 
   @Override
   public HttpHandler apply(HttpHandler next) {

java/src/org/openqa/selenium/remote/http/RetryRequest.java

@@ -55,7 +55,7 @@ java_library(
         "//java/src/org/openqa/selenium/remote/http",
         "//java/test/org/openqa/selenium/build",
         artifact("com.google.guava:guava"),
-        artifact("net.jodah:failsafe"),
+        artifact("dev.failsafe:failsafe"),
         artifact("org.assertj:assertj-core"),
     ],
 )

java/test/org/openqa/selenium/environment/BUILD.bazel

@@ -24,8 +24,8 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import net.jodah.failsafe.Failsafe;
-import net.jodah.failsafe.RetryPolicy;
+import dev.failsafe.Failsafe;
+import dev.failsafe.RetryPolicy;
 
 import org.openqa.selenium.grid.config.CompoundConfig;
 import org.openqa.selenium.grid.config.Config;
@@ -61,15 +61,16 @@ public class NettyAppServer implements AppServer {
   private static final Logger LOG = Logger.getLogger(NettyAppServer.class.getName());
   private Server<?> server;
   private Server<?> secure;
-  private final RetryPolicy<Object> retryPolicy = new RetryPolicy<>()
+  private final RetryPolicy<Object> retryPolicy = RetryPolicy.builder()
     .withMaxAttempts(5)
     .withDelay(100, 1000, ChronoUnit.MILLIS)
     .handle(ServerBindException.class)
     .onRetry(e -> {
       LOG.log(Level.WARNING, String.format("NettyAppServer retry #%s. ", e.getAttemptCount()));
       initValues();
     })
-    .onRetriesExceeded(e -> LOG.log(Level.WARNING, "NettyAppServer start aborted."));
+    .onRetriesExceeded(e -> LOG.log(Level.WARNING, "NettyAppServer start aborted."))
+    .build();
 
   public NettyAppServer() {
     initValues();