Remove the ThreadSafety:CheckImmutableTypeParameter flag.

PiperOrigin-RevId: 831375341

Author: graememorgan

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

@@ -21,7 +21,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.threadsafety.ThreadSafety.Violation;
@@ -52,16 +51,14 @@ public final class ThreadSafeAnalysis {
   /** Factory for {@link ThreadSafeAnalysis}. */
   public static final class Factory {
     private final WellKnownThreadSafety wellKnownThreadSafety;
-    private final ErrorProneFlags errorProneFlags;
 
     @Inject
-    Factory(WellKnownThreadSafety wellKnownThreadSafety, ErrorProneFlags errorProneFlags) {
+    Factory(WellKnownThreadSafety wellKnownThreadSafety) {
       this.wellKnownThreadSafety = wellKnownThreadSafety;
-      this.errorProneFlags = errorProneFlags;
     }
 
     public ThreadSafeAnalysis create(BugChecker bugChecker, VisitorState state) {
-      return new ThreadSafeAnalysis(bugChecker, state, wellKnownThreadSafety, errorProneFlags);
+      return new ThreadSafeAnalysis(bugChecker, state, wellKnownThreadSafety);
     }
   }
 
@@ -71,16 +68,12 @@ public ThreadSafeAnalysis create(BugChecker bugChecker, VisitorState state) {
   private final ThreadSafety threadSafety;
 
   private ThreadSafeAnalysis(
-      BugChecker bugChecker,
-      VisitorState state,
-      WellKnownThreadSafety wellKnownThreadSafety,
-      ErrorProneFlags errorProneFlags) {
+      BugChecker bugChecker, VisitorState state, WellKnownThreadSafety wellKnownThreadSafety) {
     this.bugChecker = bugChecker;
     this.state = state;
     this.wellKnownThreadSafety = wellKnownThreadSafety;
 
-    this.threadSafety =
-        ThreadSafety.threadSafeBuilder(wellKnownThreadSafety, errorProneFlags).build(state);
+    this.threadSafety = ThreadSafety.threadSafeBuilder(wellKnownThreadSafety).build(state);
   }
 
   boolean hasThreadSafeTypeParameterAnnotation(TypeVariableSymbol sym) {

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

@@ -29,7 +29,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.annotations.Immutable;
 import com.google.errorprone.annotations.ImmutableTypeParameter;
@@ -90,8 +89,7 @@ public static Builder builder() {
         .acceptedTypeParameterAnnotation(ImmutableSet.of());
   }
 
-  public static Builder threadSafeBuilder(
-      WellKnownThreadSafety wellKnownThreadSafety, ErrorProneFlags flags) {
+  public static Builder threadSafeBuilder(WellKnownThreadSafety wellKnownThreadSafety) {
     Builder builder =
         ThreadSafety.builder()
             .purpose(Purpose.FOR_THREAD_SAFE_CHECKER)
@@ -101,9 +99,7 @@ public static Builder threadSafeBuilder(
             .acceptedAnnotations(ImmutableSet.of(Immutable.class.getName()))
             .typeParameterAnnotation(ImmutableSet.of(ThreadSafeTypeParameter.class.getName()))
             .acceptedTypeParameterAnnotation(
-                flags.getBoolean("ThreadSafety:CheckImmutableTypeParameter").orElse(true)
-                    ? ImmutableSet.of(ImmutableTypeParameter.class.getName())
-                    : ImmutableSet.of());
+                ImmutableSet.of(ImmutableTypeParameter.class.getName()));
     return builder;
   }