Permit classes that have @Inject on one constructor and @autofactory …

…on other constructors.

These cases are more explicit about which methods should get called under each context.

RELNOTES:n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=156268076

core/src/main/java/com/google/errorprone/bugpatterns/inject/AutoFactoryAtInject.java

@@ -23,6 +23,7 @@
 import static com.google.errorprone.matchers.Matchers.methodIsConstructor;
 import static com.google.errorprone.util.ASTHelpers.findEnclosingNode;
 import static com.google.errorprone.util.ASTHelpers.getConstructors;
+import static com.sun.source.tree.Tree.Kind.CLASS;
 import static com.sun.source.tree.Tree.Kind.METHOD;
 
 import com.google.common.collect.ImmutableList;
@@ -73,7 +74,9 @@ public final Description matchAnnotation(AnnotationTree annotationTree, VisitorS
     ImmutableList<Tree> potentiallyAnnotatedTrees =
         new ImmutableList.Builder<Tree>().add(classTree).addAll(getConstructors(classTree)).build();
     for (Tree potentiallyAnnotatedTree : potentiallyAnnotatedTrees) {
-      if (HAS_AUTO_FACTORY_ANNOTATION.matches(potentiallyAnnotatedTree, state)) {
+      if (HAS_AUTO_FACTORY_ANNOTATION.matches(potentiallyAnnotatedTree, state)
+          && (potentiallyAnnotatedTree.getKind().equals(CLASS)
+              || potentiallyAnnotatedTree.equals(annotatedTree))) {
         return describeMatch(annotationTree, SuggestedFix.delete(annotationTree));
       }
     }

core/src/test/java/com/google/errorprone/bugpatterns/inject/testdata/AutoFactoryAtInjectNegativeCases.java

@@ -36,4 +36,12 @@ static class AutoFactoryOnInnerType {
     @AutoFactory
     static class InnerType {}
   }
+
+  static class OnDifferentConstructors {
+    @Inject
+    OnDifferentConstructors(String string) {}
+
+    @AutoFactory
+    OnDifferentConstructors(Object object) {}
+  }
 }

core/src/test/java/com/google/errorprone/bugpatterns/inject/testdata/AutoFactoryAtInjectPositiveCases.java

@@ -41,13 +41,4 @@ static class HasAutoFactoryOnConstructor {
     @AutoFactory
     HasAutoFactoryOnConstructor() {}
   }
-
-  static class HasAutoFactoryOnOtherConstructor {
-    // BUG: Diagnostic contains: remove
-    @Inject
-    HasAutoFactoryOnOtherConstructor() {}
-
-    @AutoFactory
-    HasAutoFactoryOnOtherConstructor(String string) {}
-  }
 }