Delete deprecated isSuppressed methods.

I fear I may have to split this.

PiperOrigin-RevId: 827964348

Author: graememorgan

check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java

@@ -35,7 +35,6 @@
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Suppressible;
 import com.google.errorprone.suppliers.Supplier;
-import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.AnnotatedTypeTree;
 import com.sun.source.tree.AnnotationTree;
 import com.sun.source.tree.ArrayAccessTree;
@@ -107,9 +106,7 @@
 import com.sun.tools.javac.util.Name;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiPredicate;
@@ -260,31 +257,6 @@ public boolean suppressedByAnyOf(Set<Name> annotations, VisitorState s) {
     return checkSuppression.test(annotations, s);
   }
 
-  /**
-   * @deprecated use {@link #isSuppressed(Tree, VisitorState)} instead
-   */
-  @Deprecated
-  public boolean isSuppressed(Tree tree) {
-    return isSuppressed(ASTHelpers.getAnnotation(tree, SuppressWarnings.class));
-  }
-
-  /**
-   * @deprecated use {@link #isSuppressed(Symbol, VisitorState)} instead
-   */
-  @Deprecated
-  public boolean isSuppressed(Symbol symbol) {
-    return isSuppressed(ASTHelpers.getAnnotation(symbol, SuppressWarnings.class));
-  }
-
-  private boolean isSuppressed(SuppressWarnings suppression) {
-    if (suppression == null || !supportsSuppressWarnings()) {
-      return false;
-    }
-
-    List<String> suppressions = Arrays.asList(suppression.value());
-    return suppressions.contains("all") || !Collections.disjoint(suppressions, allNames());
-  }
-
   /**
    * Returns true if the given tree is annotated with a {@code @SuppressWarnings} that disables this
    * bug checker.

core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ThreadSafeAnalysis.java

@@ -235,10 +235,9 @@ private Violation isFieldThreadSafe(
       ClassSymbol classSym,
       ClassType classType,
       VarSymbol var) {
-    if (bugChecker.isSuppressed(var)
+    if (bugChecker.isSuppressed(var, state)
         || bugChecker.customSuppressionAnnotations().stream()
-            .map(a -> hasAnnotation(var, a.getName(), state))
-            .anyMatch(v -> v)) {
+            .anyMatch(a -> hasAnnotation(var, a.getName(), state))) {
       return Violation.absent();
     }
     if (var.getModifiers().contains(Modifier.STATIC)) {

core/src/test/java/com/google/errorprone/bugpatterns/BugCheckerTest.java

@@ -16,11 +16,9 @@
 
 package com.google.errorprone.bugpatterns;
 
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
 import static com.google.errorprone.matchers.Description.NO_MATCH;
 
-import com.google.common.collect.ImmutableList;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.CompilationTestHelper;
 import com.google.errorprone.VisitorState;
@@ -38,45 +36,6 @@
 
 @RunWith(JUnit4.class)
 public class BugCheckerTest {
-  @Test
-  public void isSuppressed_withoutVisitorState() {
-    CompilationTestHelper.newInstance(LegacySuppressionCheck.class, getClass())
-        .addSourceLines(
-            "A.java",
-            """
-            class A {
-              void m() {
-                // BUG: Diagnostic contains: []
-                int unsuppressed;
-                @SuppressWarnings("foo")
-                // BUG: Diagnostic contains: []
-                int unrelatedSuppression;
-                @SuppressWarnings("Suppressible")
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int suppressed;
-                @SuppressWarnings("Alternative")
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int suppressedWithAlternativeName;
-                @SuppressWarnings("all")
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int allSuppressed;
-                @SuppressWarnings({"foo", "Suppressible"})
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int alsoSuppressed;
-                @SuppressWarnings({"all", "foo"})
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int redundantlySuppressed;
-                @SuppressWarnings({"all", "OnlySuppressedInsideDeprecatedCode"})
-                // BUG: Diagnostic contains: [Suppressible, SuppressibleTps, ManualIsSuppressed]
-                int ineffectiveSuppression;
-                // BUG: Diagnostic contains: []
-                @Deprecated int unuspportedSuppression;
-              }
-            }
-            """)
-        .doTest();
-  }
-
   @Test
   public void isSuppressed() {
     CompilationTestHelper.newInstance(SuppressibleCheck.class, getClass())
@@ -255,35 +214,6 @@ void m() {
         .doTest();
   }
 
-  @BugPattern(
-      name = "SuppressionReporter",
-      summary =
-          "Tells whether some other checks are suppressed according to the deprecated method "
-              + "`BugChecker#isSuppressed(Tree)`",
-      severity = ERROR,
-      suppressionAnnotations = {})
-  public static final class LegacySuppressionCheck extends BugChecker
-      implements VariableTreeMatcher {
-    private final ImmutableList<BugChecker> checks =
-        ImmutableList.of(
-            new SuppressibleCheck(),
-            new CustomSuppressibilityCheck(),
-            new SuppressibleTreePathScannerCheck(),
-            new ManuallySuppressibleCheck());
-
-    @Override
-    @SuppressWarnings("deprecation") // testing deprecated method
-    public Description matchVariable(VariableTree tree, VisitorState state) {
-      ImmutableList<String> suppressions =
-          checks.stream()
-              .filter(check -> check.isSuppressed(tree))
-              .map(BugChecker::canonicalName)
-              .collect(toImmutableList());
-
-      return buildDescription(tree).setMessage("Suppressions: " + suppressions).build();
-    }
-  }
-
   @BugPattern(
       name = "Suppressible",
       altNames = "Alternative",