Allow to blacklist annotations in annotation processing.

imeszaros · imeszaros · commit 6be2dea354cd · 2020-07-21T02:19:53.000+02:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java b/modules/jooby-apt/src/main/java/io/jooby/apt/JoobyProcessor.java
@@ -9,6 +9,7 @@
 import io.jooby.SneakyThrows;
 import io.jooby.internal.apt.HandlerCompiler;
 import io.jooby.internal.apt.ModuleCompiler;
+import io.jooby.internal.apt.Opts;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
@@ -47,15 +48,12 @@
  * @since 2.1.0
  */
 @SupportedOptions({
-    JoobyProcessor.OPT_DEBUG,
-    JoobyProcessor.OPT_INCREMENTAL,
-    JoobyProcessor.OPT_SERVICES })
+    Opts.OPT_DEBUG,
+    Opts.OPT_INCREMENTAL,
+    Opts.OPT_SERVICES,
+    Opts.OPT_SKIP_ATTRIBUTE_ANNOTATIONS })
 public class JoobyProcessor extends AbstractProcessor {
 
-  protected static final String OPT_DEBUG = "jooby.debug";
-  protected static final String OPT_INCREMENTAL = "jooby.incremental";
-  protected static final String OPT_SERVICES = "jooby.services";
-
   private ProcessingEnvironment processingEnv;
 
   /**
@@ -101,9 +99,9 @@ public class JoobyProcessor extends AbstractProcessor {
   @Override public void init(ProcessingEnvironment processingEnvironment) {
     this.processingEnv = processingEnvironment;
 
-    debug = boolOpt(processingEnv, OPT_DEBUG, false);
-    incremental = boolOpt(processingEnv, OPT_INCREMENTAL, true);
-    services = boolOpt(processingEnv, OPT_SERVICES, true);
+    debug = Opts.boolOpt(processingEnv, Opts.OPT_DEBUG, false);
+    incremental = Opts.boolOpt(processingEnv, Opts.OPT_INCREMENTAL, true);
+    services = Opts.boolOpt(processingEnv, Opts.OPT_SERVICES, true);
 
     debug("Incremental annotation processing is turned %s.", incremental ? "ON" : "OFF");
     debug("Generation of service provider configuration is turned %s.", services ? "ON" : "OFF");
@@ -330,9 +328,4 @@ private List<String> path(String method, List<? extends AnnotationMirror> annota
         .distinct()
         .collect(Collectors.toList());
   }
-
-  private boolean boolOpt(ProcessingEnvironment processingEnvironment, String option, boolean defaultValue) {
-    return Boolean.parseBoolean(processingEnvironment
-        .getOptions().getOrDefault(option, String.valueOf(defaultValue)));
-  }
 }
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/ModuleCompiler.java
@@ -158,8 +158,10 @@ private void install(ClassWriter writer, List<HandlerCompiler> handlers) throws
     visitor.visitParameter("provider", 0);
     visitor.visitCode();
 
+    String[] userAttrFilter = Opts.stringListOpt(processingEnv, Opts.OPT_SKIP_ATTRIBUTE_ANNOTATIONS, "");
+
     RouteAttributesWriter routeAttributes = new RouteAttributesWriter(processingEnv.getElementUtils(),
-        processingEnv.getTypeUtils(), writer, moduleInternalName, visitor);
+        processingEnv.getTypeUtils(), writer, moduleInternalName, visitor, userAttrFilter);
 
     Map<String, Integer> nameRegistry = new HashMap<>();
     for (HandlerCompiler handler : handlers) {
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/Opts.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/Opts.java
@@ -0,0 +1,26 @@
+/**
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package io.jooby.internal.apt;
+
+import javax.annotation.processing.ProcessingEnvironment;
+
+public interface Opts {
+
+  String OPT_DEBUG = "jooby.debug";
+  String OPT_INCREMENTAL = "jooby.incremental";
+  String OPT_SERVICES = "jooby.services";
+  String OPT_SKIP_ATTRIBUTE_ANNOTATIONS = "jooby.skipAttributeAnnotations";
+
+  static boolean boolOpt(ProcessingEnvironment processingEnvironment, String option, boolean defaultValue) {
+    return Boolean.parseBoolean(processingEnvironment
+        .getOptions().getOrDefault(option, String.valueOf(defaultValue)));
+  }
+
+  static String[] stringListOpt(ProcessingEnvironment processingEnvironment, String option, String defaultValue) {
+    String value = processingEnvironment.getOptions().getOrDefault(option, defaultValue);
+    return value == null || value.isEmpty() ? new String[0] : value.split(",");
+  }
+}
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/asm/RouteAttributesWriter.java
@@ -34,12 +34,10 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import static io.jooby.SneakyThrows.throwingConsumer;
 import static java.util.Collections.singletonList;
-import static java.util.Collections.sort;
 import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
 import static org.objectweb.asm.Opcodes.ACC_STATIC;
 import static org.objectweb.asm.Opcodes.ALOAD;
@@ -84,12 +82,13 @@ public EnumValue(String type, String value) {
 
   private static final Predicate<String> NULL_ANNOTATION = it -> it.endsWith("NonNull")
       || it.endsWith("NotNull")
+      || it.endsWith("Nonnull")
       || it.endsWith("Nullable");
 
   private static final Predicate<String> KOTLIN_ANNOTATION = it -> it.equals("kotlin.Metadata");
 
-  private static final Predicate<String> ATTR_FILTER = HTTP_ANNOTATION.negate()
-      .and(NULL_ANNOTATION.negate()).and(KOTLIN_ANNOTATION.negate());
+  private static final Predicate<String> ATTR_FILTER = HTTP_ANNOTATION
+      .or(NULL_ANNOTATION).or(KOTLIN_ANNOTATION);
 
   private final Elements elements;
 
@@ -101,13 +100,16 @@ public EnumValue(String type, String value) {
 
   private final MethodVisitor visitor;
 
+  private final String[] userAttrFilter;
+
   public RouteAttributesWriter(Elements elements, Types types, ClassWriter writer,
-      String moduleInternalName, MethodVisitor visitor) {
+      String moduleInternalName, MethodVisitor visitor, String[] userAttrFilter) {
     this.elements = elements;
     this.types = types;
     this.writer = writer;
     this.moduleInternalName = moduleInternalName;
     this.visitor = visitor;
+    this.userAttrFilter = userAttrFilter;
   }
 
   public void process(ExecutableElement method, BiConsumer<String, Object[]> log)
@@ -143,7 +145,8 @@ private Map<String, Object> annotationMap(List<? extends AnnotationMirror> annot
       String root) {
     Map<String, Object> result = new HashMap<>();
     for (AnnotationMirror annotation : annotations) {
-      if (!ATTR_FILTER.test(annotation.getAnnotationType().toString())) {
+      String type = annotation.getAnnotationType().toString();
+      if (ATTR_FILTER.test(type) || Arrays.stream(userAttrFilter).anyMatch(type::startsWith)) {
         // Ignore core,jars annotations
         continue;
       }
