Tighten the visibility of @Inject constructors.

And remove our self-exemption in `UnnecessarilyVisible`.

PiperOrigin-RevId: 521443783

core/src/main/java/com/google/errorprone/bugpatterns/AlreadyChecked.java

@@ -59,7 +59,7 @@ public final class AlreadyChecked extends BugChecker implements CompilationUnitT
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public AlreadyChecked(ConstantExpressions constantExpressions) {
+  AlreadyChecked(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/AlwaysThrows.java

@@ -137,7 +137,7 @@ void validate(MethodInvocationTree tree, String argument) {
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public AlwaysThrows(ConstantExpressions constantExpressions) {
+  AlwaysThrows(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/BoxedPrimitiveEquality.java

@@ -41,7 +41,7 @@
 public final class BoxedPrimitiveEquality extends AbstractReferenceEquality {
 
   @Inject
-  public BoxedPrimitiveEquality() {}
+  BoxedPrimitiveEquality() {}
 
   @Override
   protected boolean matchArgument(ExpressionTree tree, VisitorState state) {

core/src/main/java/com/google/errorprone/bugpatterns/CheckReturnValue.java

@@ -143,7 +143,7 @@ public MethodKind getMethodKind(MethodSymbol method) {
   private final ResultUsePolicyEvaluator<VisitorState, Symbol, MethodSymbol> evaluator;
 
   @Inject
-  public CheckReturnValue(ErrorProneFlags flags, ConstantExpressions constantExpressions) {
+  CheckReturnValue(ErrorProneFlags flags, ConstantExpressions constantExpressions) {
     super(constantExpressions);
     this.messageTrailerStyle =
         flags

core/src/main/java/com/google/errorprone/bugpatterns/DefaultCharset.java

@@ -202,7 +202,7 @@ String replacement() {
   private final boolean byteArrayOutputStreamToString;
 
   @Inject
-  public DefaultCharset(ErrorProneFlags flags) {
+  DefaultCharset(ErrorProneFlags flags) {
     this.byteArrayOutputStreamToString =
         flags.getBoolean("DefaultCharset:ByteArrayOutputStreamToString").orElse(true);
   }

core/src/main/java/com/google/errorprone/bugpatterns/EqualsIncompatibleType.java

@@ -72,7 +72,7 @@ public class EqualsIncompatibleType extends BugChecker
   private final TypeCompatibilityUtils typeCompatibilityUtils;
 
   @Inject
-  public EqualsIncompatibleType(ErrorProneFlags flags) {
+  EqualsIncompatibleType(ErrorProneFlags flags) {
     this.typeCompatibilityUtils = TypeCompatibilityUtils.fromFlags(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/FieldCanBeStatic.java

@@ -82,7 +82,7 @@ public final class FieldCanBeStatic extends BugChecker implements VariableTreeMa
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public FieldCanBeStatic(
+  FieldCanBeStatic(
       WellKnownMutability wellKnownMutability, ConstantExpressions constantExpressions) {
     this.wellKnownMutability = wellKnownMutability;
     this.constantExpressions = constantExpressions;

core/src/main/java/com/google/errorprone/bugpatterns/IgnoredPureGetter.java

@@ -59,7 +59,7 @@ public final class IgnoredPureGetter extends AbstractReturnValueIgnored {
           state -> state.getTypeFromString("com.google.protobuf.MutableMessageLite"));
 
   @Inject
-  public IgnoredPureGetter(ConstantExpressions constantExpressions) {
+  IgnoredPureGetter(ConstantExpressions constantExpressions) {
     super(constantExpressions);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/ImpossibleNullComparison.java

@@ -147,7 +147,7 @@ private static boolean isNull(ExpressionTree tree) {
   private final boolean matchOptionalAndMultimap;
 
   @Inject
-  public ImpossibleNullComparison(ErrorProneFlags flags) {
+  ImpossibleNullComparison(ErrorProneFlags flags) {
     this.matchTestAssertions =
         flags.getBoolean("ProtoFieldNullComparison:MatchTestAssertions").orElse(true);
     this.matchOptionalAndMultimap =

core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java

@@ -67,7 +67,7 @@ public class MethodCanBeStatic extends BugChecker implements CompilationUnitTree
   private final FindingOutputStyle findingOutputStyle;
 
   @Inject
-  public MethodCanBeStatic(ErrorProneFlags flags) {
+  MethodCanBeStatic(ErrorProneFlags flags) {
     boolean findingPerSite = flags.getBoolean("MethodCanBeStatic:FindingPerSite").orElse(false);
     this.findingOutputStyle =
         findingPerSite ? FindingOutputStyle.FINDING_PER_SITE : FindingOutputStyle.ONE_FINDING;

core/src/main/java/com/google/errorprone/bugpatterns/MissingOverride.java

@@ -44,7 +44,7 @@ public class MissingOverride extends BugChecker implements MethodTreeMatcher {
   private final boolean ignoreInterfaceOverrides;
 
   @Inject
-  public MissingOverride(ErrorProneFlags flags) {
+  MissingOverride(ErrorProneFlags flags) {
     this.ignoreInterfaceOverrides =
         flags.getBoolean("MissingOverride:IgnoreInterfaceOverrides").orElse(false);
   }

core/src/main/java/com/google/errorprone/bugpatterns/OptionalNotPresent.java

@@ -60,7 +60,7 @@ public final class OptionalNotPresent extends BugChecker implements CompilationU
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public OptionalNotPresent(ConstantExpressions constantExpressions) {
+  OptionalNotPresent(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/ParameterName.java

@@ -70,7 +70,7 @@ public class ParameterName extends BugChecker
   private final ImmutableList<String> exemptPackages;
 
   @Inject
-  public ParameterName(ErrorProneFlags errorProneFlags) {
+  ParameterName(ErrorProneFlags errorProneFlags) {
     this.exemptPackages =
         errorProneFlags
             .getList("ParameterName:exemptPackagePrefixes")

core/src/main/java/com/google/errorprone/bugpatterns/ReturnValueIgnored.java

@@ -415,7 +415,7 @@ private static boolean functionalMethod(ExpressionTree tree, VisitorState state)
   private final Matcher<ExpressionTree> matcher;
 
   @Inject
-  public ReturnValueIgnored(ErrorProneFlags flags, ConstantExpressions constantExpressions) {
+  ReturnValueIgnored(ErrorProneFlags flags, ConstantExpressions constantExpressions) {
     super(constantExpressions);
     this.matcher = createMatcher(flags);
   }

core/src/main/java/com/google/errorprone/bugpatterns/StatementSwitchToExpressionSwitch.java

@@ -129,7 +129,7 @@ static enum CaseQualifications {
   private final boolean enableAssignmentSwitchConversion;
 
   @Inject
-  public StatementSwitchToExpressionSwitch(ErrorProneFlags flags) {
+  StatementSwitchToExpressionSwitch(ErrorProneFlags flags) {
     this.enableDirectConversion =
         flags.getBoolean("StatementSwitchToExpressionSwitch:EnableDirectConversion").orElse(false);
     this.enableReturnSwitchConversion =

core/src/main/java/com/google/errorprone/bugpatterns/TooManyParameters.java

@@ -62,7 +62,7 @@ public class TooManyParameters extends BugChecker implements MethodTreeMatcher {
   private final int limit;
 
   @Inject
-  public TooManyParameters(ErrorProneFlags flags) {
+  TooManyParameters(ErrorProneFlags flags) {
     this.limit = flags.getInteger(TOO_MANY_PARAMETERS_FLAG_NAME).orElse(DEFAULT_LIMIT);
     checkArgument(limit > 0, "%s (%s) must be > 0", TOO_MANY_PARAMETERS_FLAG_NAME, limit);
   }

core/src/main/java/com/google/errorprone/bugpatterns/TreeToString.java

@@ -69,7 +69,7 @@ public class TreeToString extends AbstractToString {
   private final boolean transitiveEnclosingBugchecker;
 
   @Inject
-  public TreeToString(ErrorProneFlags errorProneFlags) {
+  TreeToString(ErrorProneFlags errorProneFlags) {
     this.transitiveEnclosingBugchecker =
         errorProneFlags.getBoolean("TreeToString:transitiveEnclosingBugchecker").orElse(true);
   }

core/src/main/java/com/google/errorprone/bugpatterns/UngroupedOverloads.java

@@ -59,7 +59,7 @@ public class UngroupedOverloads extends BugChecker implements ClassTreeMatcher {
   private final Boolean batchFindings;
 
   @Inject
-  public UngroupedOverloads(ErrorProneFlags flags) {
+  UngroupedOverloads(ErrorProneFlags flags) {
     batchFindings = flags.getBoolean("UngroupedOverloads:BatchFindings").orElse(false);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/UnnecessarilyVisible.java

@@ -26,7 +26,6 @@
 import static com.google.errorprone.util.ASTHelpers.findSuperMethod;
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
 import static com.google.errorprone.util.ASTHelpers.hasDirectAnnotationWithSimpleName;
-import static com.google.errorprone.util.ASTHelpers.isSubtype;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.errorprone.BugPattern;
@@ -94,14 +93,6 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
     if (badModifiers.isEmpty()) {
       return NO_MATCH;
     }
-    // TODO(b/263227221): Remove this once migration to guice is complete
-    if (symbol.isConstructor()
-        && isSubtype(
-            symbol.enclClass().asType(),
-            state.getTypeFromString("com.google.errorprone.bugpatterns.BugChecker"),
-            state)) {
-      return NO_MATCH;
-    }
     return buildDescription(tree)
         .addFix(
             removeModifiers(tree.getModifiers(), state, badModifiers)

core/src/main/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronized.java

@@ -56,7 +56,7 @@ public class UnsynchronizedOverridesSynchronized extends BugChecker implements M
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public UnsynchronizedOverridesSynchronized(ConstantExpressions constantExpressions) {
+  UnsynchronizedOverridesSynchronized(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/UnusedMethod.java

@@ -155,7 +155,7 @@ public final class UnusedMethod extends BugChecker implements CompilationUnitTre
   private final ImmutableSet<String> additionalExemptingMethodAnnotations;
 
   @Inject
-  public UnusedMethod(ErrorProneFlags errorProneFlags) {
+  UnusedMethod(ErrorProneFlags errorProneFlags) {
     this.additionalExemptingMethodAnnotations =
         errorProneFlags
             .getList("UnusedMethod:ExemptingMethodAnnotations")

core/src/main/java/com/google/errorprone/bugpatterns/UnusedVariable.java

@@ -171,7 +171,7 @@ public final class UnusedVariable extends BugChecker implements CompilationUnitT
   private final boolean reportInjectedFields;
 
   @Inject
-  public UnusedVariable(ErrorProneFlags flags) {
+  UnusedVariable(ErrorProneFlags flags) {
     ImmutableSet.Builder<String> methodAnnotationsExemptingParameters =
         ImmutableSet.<String>builder().add("org.robolectric.annotation.Implementation");
     flags

core/src/main/java/com/google/errorprone/bugpatterns/WrongOneof.java

@@ -60,7 +60,7 @@ public final class WrongOneof extends BugChecker implements SwitchTreeMatcher {
   private final ConstantExpressions constantExpressions;
 
   @Inject
-  public WrongOneof(ConstantExpressions constantExpressions) {
+  WrongOneof(ConstantExpressions constantExpressions) {
     this.constantExpressions = constantExpressions;
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/apidiff/AndroidJdkLibsChecker.java

@@ -65,7 +65,7 @@ private static ApiDiff loadApiDiff(boolean allowJava8) {
   private final boolean allowJava8;
 
   @Inject
-  public AndroidJdkLibsChecker(ErrorProneFlags flags) {
+  AndroidJdkLibsChecker(ErrorProneFlags flags) {
     this(flags.getBoolean("Android:Java8Libs").orElse(false));
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/apidiff/Java8ApiChecker.java

@@ -72,7 +72,7 @@ private static ApiDiff loadApiDiff(ErrorProneFlags errorProneFlags) {
   private static final String CHECKSUM = "java/util/zip/Checksum";
 
   @Inject
-  public Java8ApiChecker(ErrorProneFlags errorProneFlags) {
+  Java8ApiChecker(ErrorProneFlags errorProneFlags) {
     super(loadApiDiff(errorProneFlags));
   }
 }

core/src/main/java/com/google/errorprone/bugpatterns/collectionincompatibletype/CollectionIncompatibleType.java

@@ -75,7 +75,7 @@ private enum FixType {
   private final TypeCompatibilityUtils typeCompatibilityUtils;
 
   @Inject
-  public CollectionIncompatibleType(ErrorProneFlags flags) {
+  CollectionIncompatibleType(ErrorProneFlags flags) {
     this.fixType =
         flags.getEnum("CollectionIncompatibleType:FixType", FixType.class).orElse(FixType.NONE);
     this.typeCompatibilityUtils = TypeCompatibilityUtils.fromFlags(flags);

core/src/main/java/com/google/errorprone/bugpatterns/collectionincompatibletype/IncompatibleArgumentType.java

@@ -61,7 +61,7 @@ public class IncompatibleArgumentType extends BugChecker implements MethodInvoca
   private final TypeCompatibilityUtils typeCompatibilityUtils;
 
   @Inject
-  public IncompatibleArgumentType(ErrorProneFlags flags) {
+  IncompatibleArgumentType(ErrorProneFlags flags) {
     this.typeCompatibilityUtils = TypeCompatibilityUtils.fromFlags(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/collectionincompatibletype/TruthIncompatibleType.java

@@ -147,7 +147,7 @@ public class TruthIncompatibleType extends BugChecker implements MethodInvocatio
   private final TypeCompatibilityUtils typeCompatibilityUtils;
 
   @Inject
-  public TruthIncompatibleType(ErrorProneFlags flags) {
+  TruthIncompatibleType(ErrorProneFlags flags) {
     this.typeCompatibilityUtils = TypeCompatibilityUtils.fromFlags(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRequiredModifiers.java

@@ -142,7 +142,7 @@ public final class FloggerRequiredModifiers extends BugChecker
    * fine grained adjustments.
    */
   @Inject
-  public FloggerRequiredModifiers(ErrorProneFlags flags) {
+  FloggerRequiredModifiers(ErrorProneFlags flags) {
     this(flags.getEnum("FloggerRequiredModifiers:Goal", Goal.class).orElse(Goal.DEFAULT_ALL_GOALS));
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Inliner.java

@@ -90,7 +90,7 @@ public final class Inliner extends BugChecker
   private final boolean checkFixCompiles;
 
   @Inject
-  public Inliner(ErrorProneFlags flags) {
+  Inliner(ErrorProneFlags flags) {
     this.apiPrefixes =
         ImmutableSet.copyOf(flags.getSet(PREFIX_FLAG).orElse(ImmutableSet.<String>of()));
     this.skipCallsitesWithComments = flags.getBoolean(SKIP_COMMENTS_FLAG).orElse(true);

core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Suggester.java

@@ -49,7 +49,7 @@ public final class Suggester extends BugChecker implements MethodTreeMatcher {
   private final String inlineMe;
 
   @Inject
-  public Suggester(ErrorProneFlags errorProneFlags) {
+  Suggester(ErrorProneFlags errorProneFlags) {
     inlineMe =
         errorProneFlags
             .get("InlineMe:annotation")

core/src/main/java/com/google/errorprone/bugpatterns/inlineme/Validator.java

@@ -59,7 +59,7 @@ public final class Validator extends BugChecker implements MethodTreeMatcher {
   private final boolean cleanupInlineMes;
 
   @Inject
-  public Validator(ErrorProneFlags flags) {
+  Validator(ErrorProneFlags flags) {
     this.cleanupInlineMes = flags.getBoolean(CLEANUP_INLINE_ME_FLAG).orElse(false);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/EqualsMissingNullable.java

@@ -46,7 +46,7 @@ public class EqualsMissingNullable extends BugChecker implements MethodTreeMatch
   private final boolean beingConservative;
 
   @Inject
-  public EqualsMissingNullable(ErrorProneFlags flags) {
+  EqualsMissingNullable(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/FieldMissingNullable.java

@@ -58,7 +58,7 @@ public class FieldMissingNullable extends BugChecker
   private final boolean beingConservative;
 
   @Inject
-  public FieldMissingNullable(ErrorProneFlags flags) {
+  FieldMissingNullable(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/NullArgumentForNonNullParameter.java

@@ -83,7 +83,7 @@ public final class NullArgumentForNonNullParameter extends BugChecker
   private final boolean beingConservative;
 
   @Inject
-  public NullArgumentForNonNullParameter(ErrorProneFlags flags) {
+  NullArgumentForNonNullParameter(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/ParameterMissingNullable.java

@@ -68,7 +68,7 @@ public final class ParameterMissingNullable extends BugChecker
   private final boolean beingConservative;
 
   @Inject
-  public ParameterMissingNullable(ErrorProneFlags flags) {
+  ParameterMissingNullable(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/ReturnMissingNullable.java

@@ -188,7 +188,7 @@ public class ReturnMissingNullable extends BugChecker implements CompilationUnit
   private final boolean beingConservative;
 
   @Inject
-  public ReturnMissingNullable(ErrorProneFlags flags) {
+  ReturnMissingNullable(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

core/src/main/java/com/google/errorprone/bugpatterns/nullness/VoidMissingNullable.java

@@ -64,7 +64,7 @@ public class VoidMissingNullable extends BugChecker
   private final boolean beingConservative;
 
   @Inject
-  public VoidMissingNullable(ErrorProneFlags flags) {
+  VoidMissingNullable(ErrorProneFlags flags) {
     this.beingConservative = nullnessChecksShouldBeConservative(flags);
   }
 

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

@@ -60,7 +60,7 @@ public class ImmutableAnnotationChecker extends BugChecker implements ClassTreeM
   private final WellKnownMutability wellKnownMutability;
 
   @Inject
-  public ImmutableAnnotationChecker(WellKnownMutability wellKnownMutability) {
+  ImmutableAnnotationChecker(WellKnownMutability wellKnownMutability) {
     this.wellKnownMutability = wellKnownMutability;
   }
 

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

@@ -103,7 +103,7 @@ public class ImmutableChecker extends BugChecker
   private final ImmutableSet<String> immutableAnnotations;
 
   @Inject
-  public ImmutableChecker(WellKnownMutability wellKnownMutability) {
+  ImmutableChecker(WellKnownMutability wellKnownMutability) {
     this(wellKnownMutability, ImmutableSet.of(Immutable.class.getName()));
   }
 

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

@@ -56,7 +56,7 @@ public class ImmutableEnumChecker extends BugChecker implements ClassTreeMatcher
   private final WellKnownMutability wellKnownMutability;
 
   @Inject
-  public ImmutableEnumChecker(WellKnownMutability wellKnownMutability) {
+  ImmutableEnumChecker(WellKnownMutability wellKnownMutability) {
     this.wellKnownMutability = wellKnownMutability;
   }
 

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

@@ -52,7 +52,7 @@ public final class WellKnownMutability implements ThreadSafety.KnownTypes {
   private final ImmutableSet<String> knownMutableClasses;
 
   @Inject
-  public WellKnownMutability(ErrorProneFlags flags) {
+  WellKnownMutability(ErrorProneFlags flags) {
     List<String> immutable = flags.getList("Immutable:KnownImmutable").orElse(ImmutableList.of());
     ImmutableList<String> mutable =
         // Please use "KnownMutable", as it's a bit clearer what we mean. "KnownUnsafe" is kept