[java] Fixing RetryRequestTest

diemol · diemol · commit 4def8fe22fd1 · 2022-03-25T00:33:52.000+01:00
Also, removing backoff policy.
diff --git a/java/src/org/openqa/selenium/remote/http/RetryRequest.java b/java/src/org/openqa/selenium/remote/http/RetryRequest.java
@@ -17,20 +17,19 @@
 
 package org.openqa.selenium.remote.http;
 
-import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
-import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
-import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
-import static org.openqa.selenium.internal.Debug.getDebugLogLevel;
+import org.openqa.selenium.TimeoutException;
 
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 
-import org.openqa.selenium.TimeoutException;
-
 import java.net.ConnectException;
-import java.time.temporal.ChronoUnit;
 import java.util.logging.Logger;
 
+import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
+import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
+import static java.net.HttpURLConnection.HTTP_UNAVAILABLE;
+import static org.openqa.selenium.internal.Debug.getDebugLogLevel;
+
 public class RetryRequest implements Filter {
 
   private static final Logger LOG = Logger.getLogger(RetryRequest.class.getName());
@@ -39,7 +38,6 @@ public class RetryRequest implements Filter {
   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(),
@@ -51,7 +49,6 @@ public class RetryRequest implements Filter {
   private static final RetryPolicy<Object> readTimeoutPolicy =
     RetryPolicy.builder()
       .handle(TimeoutException.class)
-      .withBackoff(1, 4, ChronoUnit.SECONDS)
       .withMaxRetries(3)
       .onRetry(e -> LOG.log(
         getDebugLogLevel(),
@@ -65,7 +62,6 @@ public class RetryRequest implements Filter {
       .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(),
diff --git a/java/test/org/openqa/selenium/remote/http/RetryRequestTest.java b/java/test/org/openqa/selenium/remote/http/RetryRequestTest.java
@@ -18,6 +18,7 @@
 package org.openqa.selenium.remote.http;
 
 import com.google.common.collect.ImmutableMap;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.environment.webserver.AppServer;
@@ -45,6 +46,7 @@ public class RetryRequestTest {
   public void setUp() throws MalformedURLException {
     ClientConfig config = ClientConfig.defaultConfig()
       .baseUrl(URI.create("http://localhost:2345").toURL())
+      .withRetries()
       .readTimeout(Duration.ofSeconds(1));
     client = new NettyClient.Factory().createClient(config);
   }
