Write the correct @generated annotation within auto-value.

RELNOTES=Use `@javax.annotation.processing.Generated` for Java 9. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=179187847
google · Dec 15, 2017 · f04406c · f04406c
1 parent e7748be
commit f04406c
Show file tree

Hide file tree

Showing 10 changed files with 999 additions and 918 deletions.
diff --git a/value/src/it/functional/src/test/java/com/google/auto/value/gwt/GwtCompilationTest.java b/value/src/it/functional/src/test/java/com/google/auto/value/gwt/GwtCompilationTest.java
diff --git a/value/src/main/java/com/google/auto/value/extension/memoized/MemoizeExtension.java b/value/src/main/java/com/google/auto/value/extension/memoized/MemoizeExtension.java
@@ -15,6 +15,7 @@
  */
 package com.google.auto.value.extension.memoized;
 
+import static com.google.auto.common.GeneratedAnnotationSpecs.generatedAnnotationSpec;
 import static com.google.auto.common.MoreElements.isAnnotationPresent;
 import static com.google.common.base.Predicates.equalTo;
 import static com.google.common.base.Predicates.not;
@@ -121,7 +122,7 @@ String generate() {
               .addTypeVariables(typeVariableNames())
               .addModifiers(isFinal ? FINAL : ABSTRACT)
               .addMethod(constructor());
-      generatedAnnotation().ifPresent(generated::addAnnotation);
+      generatedAnnotationSpec(elements, MemoizeExtension.class).ifPresent(generated::addAnnotation);
       for (ExecutableElement method : memoizedMethods(context)) {
         MethodOverrider methodOverrider = new MethodOverrider(method);
         generated.addFields(methodOverrider.fields());
@@ -133,19 +134,6 @@ String generate() {
       return JavaFile.builder(context.packageName(), generated.build()).build().toString();
     }
 
-    private Optional<AnnotationSpec> generatedAnnotation() {
-      TypeElement generatedAnnotationElement =
-          elements.getTypeElement("javax.annotation.Generated");
-      if (generatedAnnotationElement == null) {
-        return Optional.empty();
-      }
-      ClassName generatedName = ClassName.get(generatedAnnotationElement);
-      return Optional.of(
-          AnnotationSpec.builder(generatedName)
-              .addMember("value", "$S", MemoizeExtension.class.getCanonicalName())
-              .build());
-    }
-
     private TypeName superType() {
       ClassName superType = ClassName.get(context.packageName(), classToExtend);
       ImmutableList<TypeVariableName> typeVariableNames = typeVariableNames();

diff --git a/value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java b/value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java
@@ -15,6 +15,8 @@
  */
 package com.google.auto.value.processor;
 
+import static com.google.auto.common.GeneratedAnnotations.generatedAnnotation;
+
 import com.google.auto.common.MoreElements;
 import com.google.auto.common.SuperficialValidation;
 import com.google.auto.service.AutoService;
@@ -177,12 +179,9 @@ private void processMethod(ExecutableElement method) {
   }
 
   private String getGeneratedTypeName() {
-    TypeElement generatedTypeElement =
-        processingEnv.getElementUtils().getTypeElement("javax.annotation.Generated");
-    if (generatedTypeElement == null) {
-      return "";
-    }
-    return TypeEncoder.encode(generatedTypeElement.asType());
+    return generatedAnnotation(processingEnv.getElementUtils())
+        .map(generatedAnnotation -> TypeEncoder.encode(generatedAnnotation.asType()))
+        .orElse(null);
   }
 
   /**

diff --git a/value/src/main/java/com/google/auto/value/processor/AutoValueProcessor.java b/value/src/main/java/com/google/auto/value/processor/AutoValueProcessor.java
@@ -16,6 +16,7 @@
 package com.google.auto.value.processor;
 
 import static com.google.auto.common.AnnotationMirrors.getAnnotationValue;
+import static com.google.auto.common.GeneratedAnnotations.generatedAnnotation;
 import static com.google.auto.common.MoreElements.getAnnotationMirror;
 import static com.google.auto.common.MoreElements.getLocalAndInheritedMethods;
 import static com.google.auto.common.MoreElements.getPackage;
@@ -819,14 +820,13 @@ private void defineVarsForType(
       ImmutableSet<ExecutableElement> toBuilderMethods,
       ImmutableSet<ExecutableElement> propertyMethods,
       Optional<BuilderSpec.Builder> builder) {
-    TypeElement generatedTypeElement =
-        processingEnv.getElementUtils().getTypeElement("javax.annotation.Generated");
     // We can't use ImmutableList.toImmutableList() for obscure Google-internal reasons.
     vars.toBuilderMethods =
         ImmutableList.copyOf(toBuilderMethods.stream().map(SimpleMethod::new).collect(toList()));
-    vars.generated = generatedTypeElement == null
-        ? ""
-        : TypeEncoder.encode(generatedTypeElement.asType());
+    vars.generated =
+        generatedAnnotation(processingEnv.getElementUtils())
+            .map(annotation -> TypeEncoder.encode(annotation.asType()))
+            .orElse("");
     ImmutableBiMap<ExecutableElement, String> methodToPropertyName =
         propertyNameToMethodMap(propertyMethods).inverse();
     vars.props = propertySet(type, propertyMethods);