Rip out the ThreadSafeChecker:CheckElementUsage flag.

Which is now enabled. PiperOrigin-RevId: 584840705
google · Nov 23, 2023 · f64d5ac · f64d5ac
1 parent 88a224c
commit f64d5ac
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ThreadSafeChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ThreadSafeChecker.java
@@ -25,7 +25,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.annotations.Immutable;
 import com.google.errorprone.annotations.ThreadSafe;
@@ -76,12 +75,10 @@ public class ThreadSafeChecker extends BugChecker
         MemberReferenceTreeMatcher {
 
   private final WellKnownThreadSafety wellKnownThreadSafety;
-  private final boolean checkElementUsage;
 
   @Inject
-  ThreadSafeChecker(WellKnownThreadSafety wellKnownThreadSafety, ErrorProneFlags flags) {
+  ThreadSafeChecker(WellKnownThreadSafety wellKnownThreadSafety) {
     this.wellKnownThreadSafety = wellKnownThreadSafety;
-    this.checkElementUsage = flags.getBoolean("ThreadSafeChecker:CheckElementUsage").orElse(true);
   }
 
   // check instantiations of `@ThreadSafe`s in method references
@@ -145,7 +142,7 @@ public Description matchTypeParameter(TypeParameterTree tree, VisitorState state
             .build();
       }
     }
-    if (checkElementUsage && analysis.hasThreadSafeElementAnnotation((TypeVariableSymbol) sym)) {
+    if (analysis.hasThreadSafeElementAnnotation((TypeVariableSymbol) sym)) {
       if (analysis.getThreadSafeAnnotation(sym.owner, state) == null) {
         return buildDescription(tree)
             .setMessage("@ThreadSafe.Element is only supported on threadsafe classes")