Rip out GuardedBy flag.

PiperOrigin-RevId: 716286798

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

@@ -22,7 +22,6 @@
 
 import com.google.common.base.Joiner;
 import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.BugChecker.LambdaExpressionTreeMatcher;
@@ -64,8 +63,8 @@ public class GuardedByChecker extends BugChecker
   private final GuardedByFlags flags;
 
   @Inject
-  GuardedByChecker(ErrorProneFlags flags) {
-    this.flags = GuardedByFlags.fromFlags(flags);
+  GuardedByChecker() {
+    this.flags = GuardedByFlags.allOn();
   }
 
   @Override

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

@@ -15,25 +15,17 @@
 package com.google.errorprone.bugpatterns.threadsafety;
 
 import com.google.auto.value.AutoValue;
-import com.google.errorprone.ErrorProneFlags;
 
 /**
  * Flags that control the behavior of threadsafety utils to facilitate rolling out new
  * functionality.
  *
- * <p>This has no flags for now, but is still plumbed through to make it easier to flag guard
- * changes to {@link GuardedByChecker} in the future. Otherwise, it's rather difficult.
+ * <p>This may have no flags, but is still plumbed through to make it easier to flag guard changes
+ * to {@link GuardedByChecker} in the future. Otherwise, it's rather difficult.
  */
 @AutoValue
 public abstract class GuardedByFlags {
-  public abstract boolean restrictToErrorProneGuardedBy();
-
   public static GuardedByFlags allOn() {
-    return new AutoValue_GuardedByFlags(true);
-  }
-
-  public static GuardedByFlags fromFlags(ErrorProneFlags flags) {
-    return new AutoValue_GuardedByFlags(
-        flags.getBoolean("GuardedBy:RestrictToErrorProneGuardedBy").orElse(true));
+    return new AutoValue_GuardedByFlags();
   }
 }

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

@@ -43,17 +43,13 @@
  * @author [email protected] (Liam Miller-Cushon)
  */
 public final class GuardedByUtils {
-  public static ImmutableSet<String> getGuardValues(Symbol sym, GuardedByFlags flags) {
+  public static ImmutableSet<String> getGuardValues(Symbol sym) {
     List<Attribute.Compound> rawAttributes = sym.getRawAttributes();
     if (rawAttributes.isEmpty()) {
       return ImmutableSet.of();
     }
     return rawAttributes.stream()
-        .filter(
-            a ->
-                flags.restrictToErrorProneGuardedBy()
-                    ? a.type.tsym.flatName().contentEquals(GUARDED_BY)
-                    : a.getAnnotationType().asElement().getSimpleName().contentEquals("GuardedBy"))
+        .filter(a -> a.type.tsym.flatName().contentEquals(GUARDED_BY))
         .flatMap(
             a ->
                 MoreAnnotations.getValue(a, "value")
@@ -62,9 +58,9 @@ public static ImmutableSet<String> getGuardValues(Symbol sym, GuardedByFlags fla
         .collect(toImmutableSet());
   }
 
-  static ImmutableSet<String> getGuardValues(Tree tree, GuardedByFlags flags) {
+  static ImmutableSet<String> getGuardValues(Tree tree) {
     Symbol sym = getSymbol(tree);
-    return sym == null ? ImmutableSet.of() : getGuardValues(sym, flags);
+    return sym == null ? ImmutableSet.of() : getGuardValues(sym);
   }
 
   private static final String GUARDED_BY = "com.google.errorprone.annotations.concurrent.GuardedBy";
@@ -107,7 +103,7 @@ static GuardedByValidationResult ok() {
 
   public static GuardedByValidationResult isGuardedByValid(
       Tree tree, VisitorState state, GuardedByFlags flags) {
-    ImmutableSet<String> guards = GuardedByUtils.getGuardValues(tree, flags);
+    ImmutableSet<String> guards = GuardedByUtils.getGuardValues(tree);
     if (guards.isEmpty()) {
       return GuardedByValidationResult.ok();
     }

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

@@ -178,7 +178,7 @@ public Void visitMethod(MethodTree tree, HeldLockSet locks) {
 
       // @GuardedBy annotations on methods are trusted for declarations, and checked
       // for invocations.
-      for (String guard : GuardedByUtils.getGuardValues(tree, flags)) {
+      for (String guard : GuardedByUtils.getGuardValues(tree)) {
         Optional<GuardedByExpression> bound =
             GuardedByBinder.bindString(
                 guard, GuardedBySymbolResolver.from(tree, visitorState), flags);
@@ -270,7 +270,7 @@ public Void visitClass(ClassTree node, HeldLockSet locks) {
     }
 
     private void checkMatch(ExpressionTree tree, HeldLockSet locks) {
-      for (String guardString : GuardedByUtils.getGuardValues(tree, flags)) {
+      for (String guardString : GuardedByUtils.getGuardValues(tree)) {
         Optional<GuardedByExpression> guard =
             GuardedByBinder.bindString(
                 guardString,

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

@@ -51,17 +51,12 @@ public class ThreadSafeAnalysis {
   private final VisitorState state;
   private final WellKnownThreadSafety wellKnownThreadSafety;
   private final ThreadSafety threadSafety;
-  private final GuardedByFlags flags;
 
   public ThreadSafeAnalysis(
-      BugChecker bugChecker,
-      VisitorState state,
-      WellKnownThreadSafety wellKnownThreadSafety,
-      GuardedByFlags flags) {
+      BugChecker bugChecker, VisitorState state, WellKnownThreadSafety wellKnownThreadSafety) {
     this.bugChecker = bugChecker;
     this.state = state;
     this.wellKnownThreadSafety = wellKnownThreadSafety;
-    this.flags = flags;
 
     this.threadSafety = ThreadSafety.threadSafeBuilder(wellKnownThreadSafety).build(state);
   }
@@ -227,7 +222,7 @@ private Violation isFieldThreadSafe(
     if (var.getModifiers().contains(Modifier.STATIC)) {
       return Violation.absent();
     }
-    if (!GuardedByUtils.getGuardValues(var, flags).isEmpty()) {
+    if (!GuardedByUtils.getGuardValues(var).isEmpty()) {
       return Violation.absent();
     }
 

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

@@ -29,7 +29,6 @@
 import com.google.common.collect.Sets;
 import com.google.common.collect.Sets.SetView;
 import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.BugChecker.ClassTreeMatcher;
@@ -77,12 +76,10 @@ public class ThreadSafeChecker extends BugChecker
         MemberReferenceTreeMatcher {
 
   private final WellKnownThreadSafety wellKnownThreadSafety;
-  private final GuardedByFlags flags;
 
   @Inject
-  ThreadSafeChecker(WellKnownThreadSafety wellKnownThreadSafety, ErrorProneFlags flags) {
+  ThreadSafeChecker(WellKnownThreadSafety wellKnownThreadSafety) {
     this.wellKnownThreadSafety = wellKnownThreadSafety;
-    this.flags = GuardedByFlags.fromFlags(flags);
   }
 
   // check instantiations of `@ThreadSafe`s in method references
@@ -105,7 +102,7 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
     checkInvocation(
         tree, ((JCNewClass) tree).constructorType, state, ((JCNewClass) tree).constructor);
     // check instantiations of `@ThreadSafeTypeParameter`s in class constructor invocations
-    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety, flags);
+    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety);
     Violation info =
         analysis.checkInstantiation(
             getSymbol(tree.getIdentifier()).getTypeParameters(), getType(tree).getTypeArguments());
@@ -116,7 +113,7 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
   }
 
   private void checkInvocation(Tree tree, Type methodType, VisitorState state, Symbol symbol) {
-    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety, flags);
+    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety);
     Violation info = analysis.checkInvocation(methodType, symbol);
     if (info.isPresent()) {
       state.reportMatch(buildDescription(tree).setMessage(info.message()).build());
@@ -135,7 +132,7 @@ public Description matchTypeParameter(TypeParameterTree tree, VisitorState state
       }
       default -> {}
     }
-    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety, flags);
+    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety);
     if (analysis.hasThreadSafeTypeParameterAnnotation((TypeVariableSymbol) sym)) {
       if (analysis.getThreadSafeAnnotation(sym.owner, state) == null) {
         return buildDescription(tree)
@@ -155,7 +152,7 @@ public Description matchTypeParameter(TypeParameterTree tree, VisitorState state
 
   @Override
   public Description matchClass(ClassTree tree, VisitorState state) {
-    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety, flags);
+    ThreadSafeAnalysis analysis = new ThreadSafeAnalysis(this, state, wellKnownThreadSafety);
     if (tree.getSimpleName().length() == 0) {
       // anonymous classes have empty names
       // TODO(cushon): once Java 8 happens, require @ThreadSafe on anonymous classes

core/src/test/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzerTest.java

@@ -20,7 +20,6 @@
 
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.CompilationTestHelper;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.matchers.Description;
 import com.sun.source.tree.Tree;
@@ -256,9 +255,7 @@ void m() {
   @BugPattern(name = "GuardedByLockSet", summary = "", explanation = "", severity = ERROR)
   public static class GuardedByLockSetAnalyzer extends GuardedByChecker {
     @Inject
-    GuardedByLockSetAnalyzer(ErrorProneFlags flags) {
-      super(flags);
-    }
+    GuardedByLockSetAnalyzer() {}
 
     @Override
     protected Description checkGuardedAccess(