Support external cancellation of a FailsafeFuture with ExecutionContext.isCancelled

Author: jhalterman

src/main/java/net/jodah/failsafe/FailsafeFuture.java

@@ -29,7 +29,7 @@
  */
 class FailsafeFuture<T> extends CompletableFuture<T> {
   private final FailsafeExecutor<T> executor;
-  private ExecutionContext execution;
+  private AbstractExecution execution;
 
   // Mutable state, guarded by "this"
   private Future<T> delegate;
@@ -95,7 +95,13 @@ synchronized Future<T> getDelegate() {
     return delegate;
   }
 
+  /**
+   * Cancels the delegate passing in the {@code interruptDelegate} flag, cancels all timeout delegates, and marks the
+   * execution as cancelled.
+   */
   synchronized boolean cancelDelegates(boolean interruptDelegate, boolean result) {
+    execution.cancelled = true;
+    execution.interrupted = interruptDelegate;
     if (delegate != null)
       result = delegate.cancel(interruptDelegate);
     if (timeoutDelegates != null)
@@ -119,7 +125,7 @@ synchronized void injectTimeout(Future<T> timeoutDelegate) {
     timeoutDelegates.add(timeoutDelegate);
   }
 
-  void inject(ExecutionContext execution) {
+  void inject(AbstractExecution execution) {
     this.execution = execution;
   }
 }

src/main/java/net/jodah/failsafe/TimeoutExecutor.java

@@ -115,8 +115,6 @@ protected Supplier<CompletableFuture<ExecutionResult>> supplyAsync(
                   boolean canInterrupt = policy.canInterrupt();
                   if (canInterrupt)
                     execution.record(promise.get());
-                  execution.cancelled = true;
-                  execution.interrupted = canInterrupt;
                   future.cancelDelegates(canInterrupt, false);
                 }
                 return null;

src/test/java/net/jodah/failsafe/AsyncFailsafeTest.java

@@ -354,8 +354,14 @@ private void assertCancel(Function<FailsafeExecutor<?>, Future<?>> executorCalla
   }
 
   public void shouldCancelOnGetAsync() throws Throwable {
-    assertCancel(executor -> getAsync(executor, (CheckedSupplier<?>) () -> {
-      Thread.sleep(1000);
+    assertCancel(executor -> getAsync(executor, (ContextualSupplier<?>) ctx -> {
+      try {
+        waiter.assertFalse(ctx.isCancelled());
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        waiter.assertTrue(ctx.isCancelled());
+        throw e;
+      }
       return "test";
     }), retryAlways);
   }