Propagate async call future cancellation to FailsafeCall

Author: jhalterman

modules/okhttp/src/main/java/dev/failsafe/okhttp/FailsafeCall.java

@@ -164,7 +164,10 @@ private okhttp3.Call prepareCall(ExecutionContext<Response> ctx) {
     }
 
     // Propagate cancellation to the call
-    ctx.onCancel(call::cancel);
+    ctx.onCancel(() -> {
+      cancelled.set(true);
+      call.cancel();
+    });
     return call;
   }
 }

modules/okhttp/src/test/java/dev/failsafe/okhttp/FailsafeCallTest.java

@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.Future;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.testng.Assert.assertEquals;
@@ -189,6 +190,23 @@ public void testCancel() {
     assertCalled("/test", 2);
   }
 
+  public void testCancelViaFuture() {
+    // Given
+    mockDelayedResponse(200, "foo", 1000);
+    FailsafeExecutor<Response> failsafe = Failsafe.none();
+    Call call = callFor("/test");
+
+    // When / Then Async
+    FailsafeCall failsafeCall = FailsafeCall.of(call, failsafe);
+    Future<Response> future = failsafeCall.executeAsync();
+    sleep(150);
+    future.cancel(false);
+    assertThrows(future::get, CancellationException.class);
+    assertTrue(call.isCanceled());
+    assertTrue(failsafeCall.isCancelled());
+    assertCalled("/test", 1);
+  }
+
   private Call callFor(String path) {
     return client.newCall(new Request.Builder().url(URL + path).build());
   }

modules/retrofit/src/main/java/dev/failsafe/retrofit/FailsafeCall.java

@@ -156,7 +156,10 @@ private retrofit2.Call<T> prepareCall(ExecutionContext<Response<T>> ctx) {
     retrofit2.Call<T> call = ctx.isFirstAttempt() ? initialCall : initialCall.clone();
 
     // Propagate cancellation to the call
-    ctx.onCancel(call::cancel);
+    ctx.onCancel(() -> {
+      cancelled.set(true);
+      call.cancel();
+    });
     return call;
   }
 }

modules/retrofit/src/test/java/dev/retrofit/FailsafeCallTest.java

@@ -33,6 +33,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.Future;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.testng.Assert.assertEquals;
@@ -204,6 +205,23 @@ public void testCancel() {
     assertCalled("/test", 2);
   }
 
+  public void testCancelViaFuture() {
+    // Given
+    mockDelayedResponse(200, "foo", 1000);
+    FailsafeExecutor<Response<User>> failsafe = Failsafe.none();
+    Call<User> call = service.testUser();
+    FailsafeCall<User> failsafeCall = FailsafeCall.of(call, failsafe);
+
+    // When / Then Async
+    Future<Response<User>> future = failsafeCall.executeAsync();
+    sleep(150);
+    future.cancel(false);
+    assertThrows(future::get, CancellationException.class);
+    assertTrue(call.isCanceled());
+    assertTrue(failsafeCall.isCancelled());
+    assertCalled("/test", 1);
+  }
+
   private void mockResponse(int responseCode, User body) {
     stubFor(get(urlPathEqualTo("/test")).willReturn(
       aResponse().withStatus(responseCode).withHeader("Content-Type", "application/json").withBody(gson.toJson(body))));