Don't claim annotations in AutoAnnotationProcessor and AutoServiceProcessor.

Annotation claiming is a misfeature and we already stopped doing it years ago in AutoValueProcessor. It's an oversight that we didn't do it for these processors at the same time.

Also apply some automated code-fix suggestions.

RELNOTES=AutoAnnotationProcessor and AutoServiceProcessor no longer claim their annotations.
PiperOrigin-RevId: 337750292

Author: eamonnmcmanus

service/processor/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java

@@ -17,8 +17,10 @@
 
 import static com.google.auto.common.AnnotationMirrors.getAnnotationValue;
 import static com.google.auto.common.MoreElements.getAnnotationMirror;
+import static com.google.common.base.Throwables.getStackTraceAsString;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 
+import com.google.auto.common.MoreElements;
 import com.google.auto.common.MoreTypes;
 import com.google.auto.service.AutoService;
 import com.google.common.annotations.VisibleForTesting;
@@ -28,8 +30,6 @@
 import com.google.common.collect.Sets;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -74,7 +74,7 @@ public class AutoServiceProcessor extends AbstractProcessor {
    *   {@code "com.google.apphosting.LocalRpcService" ->
    *   "com.google.apphosting.datastore.LocalDatastoreService"}
    */
-  private Multimap<String, String> providers = HashMultimap.create();
+  private final Multimap<String, String> providers = HashMultimap.create();
 
   @Override
   public ImmutableSet<String> getSupportedAnnotationTypes() {
@@ -104,24 +104,20 @@ public SourceVersion getSupportedSourceVersion() {
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     try {
-      return processImpl(annotations, roundEnv);
-    } catch (Exception e) {
+      processImpl(annotations, roundEnv);
+    } catch (RuntimeException e) {
       // We don't allow exceptions of any kind to propagate to the compiler
-      StringWriter writer = new StringWriter();
-      e.printStackTrace(new PrintWriter(writer));
-      fatalError(writer.toString());
-      return true;
+      fatalError(getStackTraceAsString(e));
     }
+    return false;
   }
 
-  private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+  private void processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     if (roundEnv.processingOver()) {
       generateConfigFiles();
     } else {
       processAnnotations(annotations, roundEnv);
     }
-
-    return true;
   }
 
   private void processAnnotations(Set<? extends TypeElement> annotations,
@@ -134,7 +130,7 @@ private void processAnnotations(Set<? extends TypeElement> annotations,
 
     for (Element e : elements) {
       // TODO(gak): check for error trees?
-      TypeElement providerImplementer = (TypeElement) e;
+      TypeElement providerImplementer = MoreElements.asType(e);
       AnnotationMirror annotationMirror = getAnnotationMirror(e, AutoService.class).get();
       Set<DeclaredType> providerInterfaces = getValueFieldOfClasses(annotationMirror);
       if (providerInterfaces.isEmpty()) {
@@ -187,7 +183,7 @@ private void generateConfigFiles() {
           log("Resource file did not already exist.");
         }
 
-        Set<String> newServices = new HashSet<String>(providers.get(providerInterface));
+        Set<String> newServices = new HashSet<>(providers.get(providerInterface));
         if (allServices.containsAll(newServices)) {
           log("No new service entries being added.");
           return;
@@ -197,9 +193,9 @@ private void generateConfigFiles() {
         log("New service file contents: " + allServices);
         FileObject fileObject = filer.createResource(StandardLocation.CLASS_OUTPUT, "",
             resourceFile);
-        OutputStream out = fileObject.openOutputStream();
-        ServicesFiles.writeServiceFile(allServices, out);
-        out.close();
+        try (OutputStream out = fileObject.openOutputStream()) {
+          ServicesFiles.writeServiceFile(allServices, out);
+        }
         log("Wrote to: " + fileObject.toUri());
       } catch (IOException e) {
         fatalError("Unable to create " + resourceFile + ", " + e);
@@ -216,7 +212,7 @@ private void generateConfigFiles() {
   private boolean checkImplementer(TypeElement providerImplementer, TypeElement providerType) {
 
     String verify = processingEnv.getOptions().get("verify");
-    if (verify == null || !Boolean.valueOf(verify)) {
+    if (verify == null || !Boolean.parseBoolean(verify)) {
       return true;
     }
 
@@ -241,28 +237,29 @@ private String getBinaryNameImpl(TypeElement element, String className) {
     Element enclosingElement = element.getEnclosingElement();
 
     if (enclosingElement instanceof PackageElement) {
-      PackageElement pkg = (PackageElement) enclosingElement;
+      PackageElement pkg = MoreElements.asPackage(enclosingElement);
       if (pkg.isUnnamed()) {
         return className;
       }
       return pkg.getQualifiedName() + "." + className;
     }
 
-    TypeElement typeElement = (TypeElement) enclosingElement;
+    TypeElement typeElement = MoreElements.asType(enclosingElement);
     return getBinaryNameImpl(typeElement, typeElement.getSimpleName() + "$" + className);
   }
 
   /**
-   * Returns the contents of a {@code Class[]}-typed "value" field in a given {@code annotationMirror}.
+   * Returns the contents of a {@code Class[]}-typed "value" field in a given {@code
+   * annotationMirror}.
    */
   private ImmutableSet<DeclaredType> getValueFieldOfClasses(AnnotationMirror annotationMirror) {
     return getAnnotationValue(annotationMirror, "value")
         .accept(
             new SimpleAnnotationValueVisitor8<ImmutableSet<DeclaredType>, Void>() {
               @Override
               public ImmutableSet<DeclaredType> visitType(TypeMirror typeMirror, Void v) {
-                // TODO(ronshapiro): class literals may not always be declared types, i.e. int.class,
-                // int[].class
+                // TODO(ronshapiro): class literals may not always be declared types, i.e.
+                // int.class, int[].class
                 return ImmutableSet.of(MoreTypes.asDeclared(typeMirror));
               }
 

value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java

@@ -22,6 +22,7 @@
 import static java.util.stream.Collectors.joining;
 
 import com.google.auto.common.MoreElements;
+import com.google.auto.common.MoreTypes;
 import com.google.auto.common.SuperficialValidation;
 import com.google.auto.service.AutoService;
 import com.google.common.base.Preconditions;
@@ -110,19 +111,18 @@ private AbortProcessingException abortWithError(Element e, String msg, Object...
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     elementUtils = processingEnv.getElementUtils();
     typeUtils = processingEnv.getTypeUtils();
-    boolean claimed =
+    // This should always be true: we shouldn't be called with any other annotation.
+    boolean ours =
         (annotations.size() == 1
             && annotations
                 .iterator()
                 .next()
                 .getQualifiedName()
                 .contentEquals(AUTO_ANNOTATION_NAME));
-    if (claimed) {
+    if (ours) {
       process(roundEnv);
-      return true;
-    } else {
-      return false;
     }
+    return false;
   }
 
   private void process(RoundEnvironment roundEnv) {
@@ -156,7 +156,7 @@ private void processMethod(ExecutableElement method) {
     Set<Class<?>> wrapperTypesUsedInCollections = wrapperTypesUsedInCollections(method);
 
     ImmutableMap<String, ExecutableElement> memberMethods = getMemberMethods(annotationElement);
-    TypeElement methodClass = (TypeElement) method.getEnclosingElement();
+    TypeElement methodClass = MoreElements.asType(method.getEnclosingElement());
     String pkg = TypeSimplifier.packageNameOf(methodClass);
 
     ImmutableMap<String, AnnotationValue> defaultValues = getDefaultValues(annotationElement);
@@ -251,7 +251,7 @@ private static ImmutableMap<String, Integer> invariableHashes(
 
   private boolean methodsAreOverloaded(List<ExecutableElement> methods) {
     boolean overloaded = false;
-    Set<String> classNames = new HashSet<String>();
+    Set<String> classNames = new HashSet<>();
     for (ExecutableElement method : methods) {
       String qualifiedClassName =
           fullyQualifiedName(
@@ -266,10 +266,10 @@ private boolean methodsAreOverloaded(List<ExecutableElement> methods) {
   }
 
   private String generatedClassName(ExecutableElement method) {
-    TypeElement type = (TypeElement) method.getEnclosingElement();
+    TypeElement type = MoreElements.asType(method.getEnclosingElement());
     String name = type.getSimpleName().toString();
     while (type.getEnclosingElement() instanceof TypeElement) {
-      type = (TypeElement) type.getEnclosingElement();
+      type = MoreElements.asType(type.getEnclosingElement());
       name = type.getSimpleName() + "_" + name;
     }
     return "AutoAnnotation_" + name + "_" + method.getSimpleName();
@@ -280,7 +280,7 @@ private TypeElement getAnnotationReturnType(ExecutableElement method) {
     if (returnTypeMirror.getKind() == TypeKind.DECLARED) {
       Element returnTypeElement = typeUtils.asElement(method.getReturnType());
       if (returnTypeElement.getKind() == ElementKind.ANNOTATION_TYPE) {
-        return (TypeElement) returnTypeElement;
+        return MoreElements.asType(returnTypeElement);
       }
     }
     throw abortWithError(
@@ -404,7 +404,7 @@ private boolean compatibleTypes(TypeMirror parameterType, TypeMirror memberType)
     if (memberType.getKind() != TypeKind.ARRAY) {
       return false;
     }
-    TypeMirror arrayElementType = ((ArrayType) memberType).getComponentType();
+    TypeMirror arrayElementType = MoreTypes.asArray(memberType).getComponentType();
     TypeMirror wrappedArrayElementType =
         arrayElementType.getKind().isPrimitive()
             ? typeUtils.boxedClass((PrimitiveType) arrayElementType).asType()
@@ -421,7 +421,7 @@ private boolean compatibleTypes(TypeMirror parameterType, TypeMirror memberType)
    * like {@code List<Integer>}. This is needed because we will emit a helper method for each such
    * type, for example to convert {@code Collection<Integer>} into {@code int[]}.
    */
-  private Set<Class<?>> wrapperTypesUsedInCollections(ExecutableElement method) {
+  private ImmutableSet<Class<?>> wrapperTypesUsedInCollections(ExecutableElement method) {
     TypeElement javaUtilCollection = elementUtils.getTypeElement(Collection.class.getName());
     ImmutableSet.Builder<Class<?>> usedInCollections = ImmutableSet.builder();
     for (Class<?> wrapper : Primitives.allWrapperTypes()) {
@@ -533,7 +533,7 @@ public String getType() {
 
     public String getComponentType() {
       Preconditions.checkState(getTypeMirror().getKind() == TypeKind.ARRAY);
-      ArrayType arrayType = (ArrayType) getTypeMirror();
+      ArrayType arrayType = MoreTypes.asArray(getTypeMirror());
       return TypeEncoder.encode(arrayType.getComponentType());
     }
 
@@ -555,12 +555,12 @@ public boolean isArrayOfClassWithBounds() {
       if (getTypeMirror().getKind() != TypeKind.ARRAY) {
         return false;
       }
-      TypeMirror componentType = ((ArrayType) getTypeMirror()).getComponentType();
+      TypeMirror componentType = MoreTypes.asArray(getTypeMirror()).getComponentType();
       if (componentType.getKind() != TypeKind.DECLARED) {
         return false;
       }
-      DeclaredType declared = (DeclaredType) componentType;
-      if (!((TypeElement) processingEnv.getTypeUtils().asElement(componentType))
+      DeclaredType declared = MoreTypes.asDeclared(componentType);
+      if (!MoreElements.asType(processingEnv.getTypeUtils().asElement(componentType))
           .getQualifiedName()
           .contentEquals("java.lang.Class")) {
         return false;
@@ -572,7 +572,7 @@ public boolean isArrayOfClassWithBounds() {
       if (parameter.getKind() != TypeKind.WILDCARD) {
         return true; // for Class<Foo>
       }
-      WildcardType wildcard = (WildcardType) parameter;
+      WildcardType wildcard = MoreTypes.asWildcard(parameter);
       // In theory, we should check if getExtendsBound() != Object, since '?' is equivalent to
       // '? extends Object', but, experimentally, neither javac or ecj will sets getExtendsBound()
       // to 'Object', so there isn't a point in checking.