Add changes

Author: kelvinou01

gradle-suppressible-error-prone/src/main/java/com/palantir/gradle/suppressibleerrorprone/modes/Modes.java

@@ -30,7 +30,6 @@
 import com.palantir.gradle.suppressibleerrorprone.modes.interferences.DisableModeInterference;
 import com.palantir.gradle.suppressibleerrorprone.modes.interferences.RemoveRolloutAndSuppressingInterference;
 import com.palantir.gradle.suppressibleerrorprone.modes.interferences.RemoveUnusedAndApplyingInterference;
-import com.palantir.gradle.suppressibleerrorprone.modes.interferences.RemoveUnusedAndSuppressInterference;
 import com.palantir.gradle.suppressibleerrorprone.modes.interferences.SuppressingAndApplyingInterference;
 import com.palantir.gradle.suppressibleerrorprone.modes.modes.ApplyMode;
 import com.palantir.gradle.suppressibleerrorprone.modes.modes.DisableMode;
@@ -71,8 +70,7 @@ ModeName.SUPPRESS, new SuppressMode(),
             new DisableModeInterference(),
             new RemoveRolloutAndSuppressingInterference(),
             new SuppressingAndApplyingInterference(),
-            new RemoveUnusedAndApplyingInterference(),
-            new RemoveUnusedAndSuppressInterference());
+            new RemoveUnusedAndApplyingInterference());
 
     public final CombinedValue modifyCheckApi() {
         return ModifyCheckApiOption.combine(

gradle-suppressible-error-prone/src/main/java/com/palantir/gradle/suppressibleerrorprone/modes/interferences/RemoveUnusedAndSuppressInterference.java

@@ -26,17 +26,24 @@
 import one.util.streamex.StreamEx;
 
 public final class AllErrorprones {
+    private static Set<String> cachedAllBugcheckerNames;
+
     public static Set<String> allBugcheckerNames() {
-        Stream<BugChecker> pluginChecks =
-                ServiceLoader.load(BugChecker.class).stream().map(ServiceLoader.Provider::get);
-        Stream<String> pluginCheckNames =
-                StreamEx.of(pluginChecks).flatMap(bugchecker -> bugchecker.allNames().stream());
+        if (cachedAllBugcheckerNames == null) {
+            Stream<BugChecker> pluginChecks =
+                    ServiceLoader.load(BugChecker.class).stream().map(ServiceLoader.Provider::get);
+            Stream<String> pluginCheckNames =
+                    StreamEx.of(pluginChecks).flatMap(bugchecker -> bugchecker.allNames().stream());
+
+            Stream<BugCheckerInfo> builtInChecks = BuiltInCheckerSuppliers.allChecks().getAllChecks().values().stream();
+            Stream<String> builtInCheckNames =
+                    StreamEx.of(builtInChecks).flatMap(bugchecker -> bugchecker.allNames().stream());
 
-        Stream<BugCheckerInfo> builtInChecks = BuiltInCheckerSuppliers.allChecks().getAllChecks().values().stream();
-        Stream<String> builtInCheckNames =
-                StreamEx.of(builtInChecks).flatMap(bugchecker -> bugchecker.allNames().stream());
+            cachedAllBugcheckerNames =
+                    Stream.concat(pluginCheckNames, builtInCheckNames).collect(Collectors.toSet());
+        }
 
-        return Stream.concat(pluginCheckNames, builtInCheckNames).collect(Collectors.toSet());
+        return cachedAllBugcheckerNames;
     }
 
     private AllErrorprones() {}

suppressible-error-prone/src/main/java/com/palantir/suppressibleerrorprone/AllErrorprones.java

@@ -67,7 +67,6 @@ public LazySuppressionFix reportNew(
         return cache.put(declaration.getLeaf(), createAndReportFix(declaration, visitorState, filterExisting));
     }
 
-    @SuppressWarnings("RestrictedApi")
     private LazySuppressionFix createAndReportFix(
             TreePath declaration, VisitorState state, Predicate<String> filterExisting) {
         if (!SuppressWarningsUtils.suppressibleTreePath(declaration)) {
@@ -91,6 +90,7 @@ private LazySuppressionFix createAndReportFix(
                 suppressWarnings,
                 declaration.getLeaf(),
                 filteredExistingSuppressions);
+        @SuppressWarnings("RestrictedApi")
         Description description = Description.builder(
                         (DiagnosticPosition) declaration.getLeaf(),
                         "SuppressibleErrorProne",

suppressible-error-prone/src/main/java/com/palantir/suppressibleerrorprone/ReportedFixCache.java

@@ -21,6 +21,11 @@
 import com.google.errorprone.BugPattern.SeverityLevel;
 import com.google.errorprone.bugpatterns.BugChecker;
 
+/**
+ * Used by {@link ReportedFixCache} to register {@link LazySuppressionFix}es.
+ * We need this "default" bugchecker type, as using the name of any individual suppression being removed/added is
+ * inappropriate — a {@link LazySuppressionFix} may remove or add multiple suppressions.
+ */
 @AutoService(BugChecker.class)
 @BugPattern(
         link = "https://github.com/palantir/suppressible-error-prone",