Merge pull request #605 from google/sync-master-2018/03/08

Moe Sync

Author: eamonnmcmanus

value/src/main/java/com/google/auto/value/extension/memoized/MemoizedValidator.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.auto.value.extension.memoized.processor;
+
+/** Names of classes that are referenced in the processor/extension. */
+final class ClassNames {
+  static final String MEMOIZED_NAME = "com.google.auto.value.extension.memoized.Memoized";
+}

value/src/main/java/com/google/auto/value/extension/memoized/processor/ClassNames.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.auto.value.extension.memoized;
+package com.google.auto.value.extension.memoized.processor;
 
 import static com.google.auto.common.GeneratedAnnotationSpecs.generatedAnnotationSpec;
-import static com.google.auto.common.MoreElements.isAnnotationPresent;
+import static com.google.auto.value.extension.memoized.processor.ClassNames.MEMOIZED_NAME;
+import static com.google.auto.value.extension.memoized.processor.MemoizedValidator.getAnnotationMirror;
 import static com.google.common.base.Predicates.equalTo;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.Iterables.filter;
@@ -67,7 +68,7 @@
 @AutoService(AutoValueExtension.class)
 public final class MemoizeExtension extends AutoValueExtension {
   private static final ImmutableSet<String> DO_NOT_PULL_DOWN_ANNOTATIONS =
-      ImmutableSet.of(Override.class.getCanonicalName(), Memoized.class.getCanonicalName());
+      ImmutableSet.of(Override.class.getCanonicalName(), MEMOIZED_NAME);
 
   private static final ClassName LAZY_INIT =
       ClassName.get("com.google.errorprone.annotations.concurrent", "LazyInit");
@@ -89,7 +90,7 @@ public String generateClass(
   private static ImmutableSet<ExecutableElement> memoizedMethods(Context context) {
     ImmutableSet.Builder<ExecutableElement> memoizedMethods = ImmutableSet.builder();
     for (ExecutableElement method : methodsIn(context.autoValueClass().getEnclosedElements())) {
-      if (isAnnotationPresent(method, Memoized.class)) {
+      if (getAnnotationMirror(method, MEMOIZED_NAME).isPresent()) {
         memoizedMethods.add(method);
       }
     }

value/src/main/java/com/google/auto/value/extension/memoized/MemoizeExtension.java renamed to value/src/main/java/com/google/auto/value/extension/memoized/processor/MemoizeExtension.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.auto.value.extension.memoized.processor;
+
+import static com.google.auto.value.extension.memoized.processor.ClassNames.MEMOIZED_NAME;
+import static javax.lang.model.util.ElementFilter.methodsIn;
+import static javax.tools.Diagnostic.Kind.ERROR;
+
+import com.google.auto.common.MoreTypes;
+import com.google.auto.service.AutoService;
+import java.util.Optional;
+import java.util.Set;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.Messager;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+
+/**
+ * An annotation {@link Processor} that reports errors for {@link Memoized @Memoized} methods that
+ * are not inside {@code AutoValue}-annotated classes.
+ */
+@AutoService(Processor.class)
+@SupportedAnnotationTypes(MEMOIZED_NAME)
+public final class MemoizedValidator extends AbstractProcessor {
+  @Override
+  public final boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+    Messager messager = processingEnv.getMessager();
+    TypeElement memoized = processingEnv.getElementUtils().getTypeElement(MEMOIZED_NAME);
+    for (ExecutableElement method : methodsIn(roundEnv.getElementsAnnotatedWith(memoized))) {
+      if (!isAutoValue(method.getEnclosingElement())) {
+        messager.printMessage(
+            ERROR,
+            "@Memoized methods must be declared only in @AutoValue classes",
+            method,
+            getAnnotationMirror(method, MEMOIZED_NAME).get());
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public SourceVersion getSupportedSourceVersion() {
+    return SourceVersion.latestSupported();
+  }
+
+  private static boolean isAutoValue(Element element) {
+    return element
+        .getAnnotationMirrors()
+        .stream()
+        .map(annotation -> MoreTypes.asTypeElement(annotation.getAnnotationType()))
+        .anyMatch(type -> type.getQualifiedName().contentEquals("com.google.auto.value.AutoValue"));
+  }
+
+  static Optional<AnnotationMirror> getAnnotationMirror(Element element, String annotationName) {
+    for (AnnotationMirror annotation : element.getAnnotationMirrors()) {
+      TypeElement annotationElement = MoreTypes.asTypeElement(annotation.getAnnotationType());
+      if (annotationElement.getQualifiedName().contentEquals(annotationName)) {
+        return Optional.of(annotation);
+      }
+    }
+    return Optional.empty();
+  }
+}

value/src/main/java/com/google/auto/value/extension/memoized/processor/MemoizedValidator.java

@@ -725,6 +725,7 @@ static String wildcardTypeParametersString(TypeElement type) {
     }
   }
 
+  // TODO(emcmanus,ronshapiro): move to auto-common
   static Optional<AnnotationMirror> getAnnotationMirror(Element element, String annotationName) {
     for (AnnotationMirror annotation : element.getAnnotationMirrors()) {
       TypeElement annotationElement = MoreTypes.asTypeElement(annotation.getAnnotationType());

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

@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertAbout;
 import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;
 
+import com.google.auto.value.extension.memoized.processor.MemoizeExtension;
 import com.google.auto.value.processor.AutoValueProcessor;
 import com.google.common.collect.ImmutableList;
 import com.google.common.truth.FailureMetadata;
@@ -51,4 +52,4 @@ void hasError(String error) {
         .in(file)
         .onLine(6);
   }
-}
+}

value/src/test/java/com/google/auto/value/extension/memoized/MemoizedMethodSubject.java

@@ -19,6 +19,7 @@
 import static com.google.testing.compile.CompilationSubject.assertThat;
 import static com.google.testing.compile.Compiler.javac;
 
+import com.google.auto.value.extension.memoized.processor.MemoizedValidator;
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
 import javax.tools.JavaFileObject;