Remove the flag Immutable:MarkerAnnotationInherited

PiperOrigin-RevId: 829441461

Author: graememorgan

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

@@ -22,7 +22,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.annotations.CheckReturnValue;
 import com.google.errorprone.annotations.ImmutableTypeParameter;
@@ -59,20 +58,18 @@ public final class ImmutableAnalysis {
   /** Factory for {@link ImmutableAnalysis}. */
   public static final class Factory {
     private final WellKnownMutability wellKnownMutability;
-    private final ErrorProneFlags flags;
 
     @Inject
-    Factory(WellKnownMutability wellKnownMutability, ErrorProneFlags flags) {
+    Factory(WellKnownMutability wellKnownMutability) {
       this.wellKnownMutability = wellKnownMutability;
-      this.flags = flags;
     }
 
     public ImmutableAnalysis create(
         BiPredicate<Symbol, VisitorState> suppressionChecker,
         VisitorState state,
         ImmutableSet<String> immutableAnnotations) {
       return new ImmutableAnalysis(
-          suppressionChecker, state, wellKnownMutability, immutableAnnotations, flags);
+          suppressionChecker, state, wellKnownMutability, immutableAnnotations);
     }
   }
 
@@ -85,16 +82,14 @@ private ImmutableAnalysis(
       BiPredicate<Symbol, VisitorState> suppressionChecker,
       VisitorState state,
       WellKnownMutability wellKnownMutability,
-      ImmutableSet<String> immutableAnnotations,
-      ErrorProneFlags flags) {
+      ImmutableSet<String> immutableAnnotations) {
     this.suppressionChecker = suppressionChecker;
     this.state = state;
     this.wellKnownMutability = wellKnownMutability;
     this.threadSafety =
         ThreadSafety.builder()
             .purpose(Purpose.FOR_IMMUTABLE_CHECKER)
-            .markerAnnotationInherited(
-                flags.getBoolean("Immutable:MarkerAnnotationInherited").orElse(true))
+            .markerAnnotationInherited(true)
             .knownTypes(wellKnownMutability)
             .markerAnnotations(immutableAnnotations)
             .typeParameterAnnotation(ImmutableSet.of(ImmutableTypeParameter.class.getName()))

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

@@ -39,7 +39,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.bugpatterns.BugChecker;
@@ -102,40 +101,20 @@ public class ImmutableChecker extends BugChecker
   private final ImmutableAnalysis.Factory immutableAnalysisFactory;
   private final WellKnownMutability wellKnownMutability;
   private final ImmutableSet<String> immutableAnnotations;
-  private final boolean markerAnnotationInherited;
 
   @Inject
   ImmutableChecker(
-      ImmutableAnalysis.Factory immutableAnalysisFactory,
-      WellKnownMutability wellKnownMutability,
-      ErrorProneFlags flags) {
-    this(
-        immutableAnalysisFactory,
-        wellKnownMutability,
-        ImmutableSet.of(Immutable.class.getName()),
-        flags.getBoolean("Immutable:MarkerAnnotationInherited").orElse(true));
+      ImmutableAnalysis.Factory immutableAnalysisFactory, WellKnownMutability wellKnownMutability) {
+    this(immutableAnalysisFactory, wellKnownMutability, ImmutableSet.of(Immutable.class.getName()));
   }
 
   ImmutableChecker(
       ImmutableAnalysis.Factory immutableAnalysisFactory,
       WellKnownMutability wellKnownMutability,
       ImmutableSet<String> immutableAnnotations) {
-    this(
-        immutableAnalysisFactory,
-        wellKnownMutability,
-        immutableAnnotations,
-        /* markerAnnotationInherited= */ true);
-  }
-
-  ImmutableChecker(
-      ImmutableAnalysis.Factory immutableAnalysisFactory,
-      WellKnownMutability wellKnownMutability,
-      ImmutableSet<String> immutableAnnotations,
-      boolean markerAnnotationInherited) {
     this.immutableAnalysisFactory = immutableAnalysisFactory;
     this.wellKnownMutability = wellKnownMutability;
     this.immutableAnnotations = immutableAnnotations;
-    this.markerAnnotationInherited = markerAnnotationInherited;
   }
 
   @Override
@@ -604,9 +583,6 @@ private boolean hasImmutableAnnotation(TypeSymbol tsym, VisitorState state) {
   }
 
   private boolean typeOrSuperHasImmutableAnnotation(TypeSymbol tsym, VisitorState state) {
-    if (!markerAnnotationInherited) {
-      return hasImmutableAnnotation(tsym, state);
-    }
     return hasImmutableAnnotation(tsym, state) || immutableSupertype(tsym, state) != null;
   }