Also check cancel calls on ClosingFuture.

PiperOrigin-RevId: 448301248
google · May 12, 2022 · 9dee02f · 9dee02f
1 parent b603cff
commit 9dee02f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/Interruption.java b/core/src/main/java/com/google/errorprone/bugpatterns/Interruption.java
@@ -54,7 +54,8 @@ public class Interruption extends BugChecker implements MethodInvocationTreeMatc
 
   private static final Matcher<ExpressionTree> CANCEL =
       instanceMethod()
-          .onDescendantOf("java.util.concurrent.Future")
+          .onDescendantOfAny(
+              "java.util.concurrent.Future", "com.google.common.util.concurrent.ClosingFuture")
           .named("cancel")
           .withParameters("boolean");
 

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/InterruptionTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/InterruptionTest.java
@@ -45,6 +45,21 @@ public void positive() {
         .doTest();
   }
 
+  @Test
+  public void positiveClosingFuture() {
+    compilationHelper
+        .addSourceLines(
+            "Test.java",
+            "import com.google.common.util.concurrent.ClosingFuture;",
+            "class Test {",
+            "  void f(ClosingFuture<?> f) {",
+            "    // BUG: Diagnostic contains: f.cancel(false)",
+            "    f.cancel(true);",
+            "  }",
+            "}")
+        .doTest();
+  }
+
   @Test
   public void positiveInterrupt() {
     compilationHelper