Add attemptNo & delayMs to RetryOn interface, re #55

Author: safris

src/main/java/org/libj/util/retry/RetryOn.java

@@ -25,7 +25,9 @@ public interface RetryOn {
    * Specifies the conditions under which a retry should occur given the provided {@link Exception}.
    *
    * @param e The non-null exception that occurred during execution of a {@link Retryable} object.
+   * @param attemptNo The attempt number on which the exception was thrown.
+   * @param delayMs The delay (in milliseconds) from the previous invocation attempt.
    * @return {@code true} if a retry should occur, otherwise {@code false}.
    */
-  boolean retryOn(Exception e);
+  boolean retryOn(Exception e, int attemptNo, long delayMs);
 }

src/main/java/org/libj/util/retry/RetryPolicy.java

@@ -438,6 +438,7 @@ private final <T> T run0(final Retryable<T,E> retryable, final long timeout) thr
     final long startTime = System.currentTimeMillis();
     long runTime = 0;
     Exception previousException = null;
+    long delayMs = 0;
     for (int attemptNo = 1;; ++attemptNo) { // [N]
       if (onRetry != null)
         onRetry.accept(attemptNo);
@@ -449,10 +450,10 @@ private final <T> T run0(final Retryable<T,E> retryable, final long timeout) thr
         if (previousException == null || e.getClass() != previousException.getClass() || !Objects.equals(e.getMessage(), previousException.getMessage()))
           exceptions.add(previousException = e);
 
-        if (attemptNo > maxRetries || !retryOn.retryOn(e))
-          retryFailed(exceptions, attemptNo, getDelayMs(attemptNo - 1));
+        if (attemptNo > maxRetries || !retryOn.retryOn(e, attemptNo, delayMs))
+          retryFailed(exceptions, attemptNo, delayMs);
 
-        long delayMs = getDelayMs(attemptNo);
+        delayMs = getDelayMs(attemptNo);
         if (jitter > 0)
           delayMs *= jitter * Math.random() + 1;
 

src/test/java/org/libj/util/retry/RetryPolicyTest.java

@@ -28,7 +28,7 @@ public class RetryPolicyTest {
   @Test
   public void testNonNullOnRetryFailure() throws RetryFailureRuntimeException, Exception {
     try {
-      new RetryPolicy<>(e -> true, null, (e, se, a, d) -> null, 100, 100).run((p, a) -> null);
+      new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> null, 100, 100).run((p, a) -> null);
       fail("Expected NullPointerException");
     }
     catch (final NullPointerException e) {
@@ -50,7 +50,7 @@ public void testLinearBackoff() {
     for (int i = 0; i < attempts - 1; ++i) // [N]
       timings[i + 1] = timings[i] + delays[i];
 
-    assertEquals("PASS", new RetryPolicy<>(e -> true, null, (e, se, a, d) -> new RuntimeException(), attempts, delayMs).run((p, a) -> {
+    assertEquals("PASS", new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> new RuntimeException(), attempts, delayMs).run((p, a) -> {
       if (index[0] < attempts) {
         final long delayMs1 = p.getDelayMs(a);
         assertEquals(delays[index[0]++], delayMs1);
@@ -83,7 +83,7 @@ public void testExponentialBackoff() throws RetryFailureException {
     for (int i = 0; i < attempts - 1; ++i) // [N]
       timings[i + 1] = timings[i] + delays[i];
 
-    assertEquals("PASS", new RetryPolicy<>(e -> true, null, (e, se, a, d) -> new RetryFailureException(a, d), attempts, startDelay, 0, false, factor, maxDelay).run((p, a) -> {
+    assertEquals("PASS", new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> new RetryFailureException(a, d), attempts, startDelay, 0, false, factor, maxDelay).run((p, a) -> {
       if (index[0] < attempts) {
         final long delayMs = p.getDelayMs(a);
         assertEquals(delays[index[0]++], delayMs);