注釈処理のプロセッサが処理するアノテーションを明示的にチェック

kaptが `@SupportedAnnotationTypes` に指定されたアノテーションを無視して無関係のプロセッサを実行することへの対応である。

Author: nakamura-to

src/main/java/org/seasar/doma/internal/apt/AbstractGeneratingProcessor.java

@@ -16,6 +16,7 @@
 package org.seasar.doma.internal.apt;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.util.Set;
 
 import javax.annotation.processing.RoundEnvironment;
@@ -34,7 +35,9 @@
 public abstract class AbstractGeneratingProcessor<M extends TypeElementMeta>
         extends AbstractProcessor {
 
-    protected AbstractGeneratingProcessor() {
+    protected AbstractGeneratingProcessor(
+            Class<? extends Annotation> supportedAnnotationType) {
+        super(supportedAnnotationType);
     }
 
     @Override

src/main/java/org/seasar/doma/internal/apt/AbstractProcessor.java

@@ -15,6 +15,7 @@
  */
 package org.seasar.doma.internal.apt;
 
+import java.lang.annotation.Annotation;
 import java.util.function.Consumer;
 
 import javax.lang.model.SourceVersion;
@@ -30,7 +31,11 @@
 public abstract class AbstractProcessor extends
         javax.annotation.processing.AbstractProcessor {
 
-    protected AbstractProcessor() {
+    protected Class<? extends Annotation> supportedAnnotationType;
+
+    protected AbstractProcessor(
+            Class<? extends Annotation> supportedAnnotationType) {
+        this.supportedAnnotationType = supportedAnnotationType;
     }
 
     @Override
@@ -40,6 +45,11 @@ public SourceVersion getSupportedSourceVersion() {
 
     protected void handleTypeElement(TypeElement typeElement,
             Consumer<TypeElement> handler) {
+        Annotation annotation = typeElement
+                .getAnnotation(supportedAnnotationType);
+        if (annotation == null) {
+            return;
+        }
         if (Options.isDebugEnabled(processingEnv)) {
             Notifier.debug(processingEnv, Message.DOMA4090, getClass()
                     .getName(), typeElement.getQualifiedName());
@@ -66,5 +76,4 @@ protected void handleTypeElement(TypeElement typeElement,
                     .getName(), typeElement.getQualifiedName());
         }
     }
-
 }

src/main/java/org/seasar/doma/internal/apt/DaoProcessor.java

@@ -25,6 +25,7 @@
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
 
+import org.seasar.doma.Dao;
 import org.seasar.doma.internal.apt.meta.ArrayCreateQueryMetaFactory;
 import org.seasar.doma.internal.apt.meta.AutoBatchModifyQueryMetaFactory;
 import org.seasar.doma.internal.apt.meta.AutoFunctionQueryMetaFactory;
@@ -54,6 +55,10 @@
         Options.SQL_VALIDATION, Options.VERSION_VALIDATION })
 public class DaoProcessor extends AbstractGeneratingProcessor<DaoMeta> {
 
+    public DaoProcessor() {
+        super(Dao.class);
+    }
+
     @Override
     protected TypeElementMetaFactory<DaoMeta> createTypeElementMetaFactory() {
         List<QueryMetaFactory> queryMetaFactories = createQueryMetaFactory();

src/main/java/org/seasar/doma/internal/apt/DomainConvertersProcessor.java

@@ -24,6 +24,7 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 
+import org.seasar.doma.DomainConverters;
 import org.seasar.doma.ExternalDomain;
 import org.seasar.doma.internal.apt.mirror.DomainConvertersMirror;
 import org.seasar.doma.internal.apt.util.TypeMirrorUtil;
@@ -38,6 +39,7 @@
 public class DomainConvertersProcessor extends AbstractProcessor {
 
     public DomainConvertersProcessor() {
+        super(DomainConverters.class);
     }
 
     @Override

src/main/java/org/seasar/doma/internal/apt/DomainProcessor.java

@@ -15,14 +15,15 @@
  */
 package org.seasar.doma.internal.apt;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.io.IOException;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
 
+import org.seasar.doma.Domain;
 import org.seasar.doma.internal.apt.meta.DomainMeta;
 import org.seasar.doma.internal.apt.meta.DomainMetaFactory;
 
@@ -34,6 +35,10 @@
 @SupportedOptions({ Options.VERSION_VALIDATION, Options.TEST, Options.DEBUG })
 public class DomainProcessor extends AbstractGeneratingProcessor<DomainMeta> {
 
+    public DomainProcessor() {
+        super(Domain.class);
+    }
+
     @Override
     protected DomainMetaFactory createTypeElementMetaFactory() {
         return new DomainMetaFactory(processingEnv);

src/main/java/org/seasar/doma/internal/apt/EntityProcessor.java

@@ -15,14 +15,15 @@
  */
 package org.seasar.doma.internal.apt;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.io.IOException;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
 
+import org.seasar.doma.Entity;
 import org.seasar.doma.internal.apt.meta.EntityMeta;
 import org.seasar.doma.internal.apt.meta.EntityMetaFactory;
 import org.seasar.doma.internal.apt.meta.EntityPropertyMetaFactory;
@@ -36,6 +37,10 @@
         Options.VERSION_VALIDATION, Options.TEST, Options.DEBUG })
 public class EntityProcessor extends AbstractGeneratingProcessor<EntityMeta> {
 
+    public EntityProcessor() {
+        super(Entity.class);
+    }
+
     @Override
     protected EntityMetaFactory createTypeElementMetaFactory() {
         EntityPropertyMetaFactory propertyMetaFactory = createEntityPropertyMetaFactory();

src/main/java/org/seasar/doma/internal/apt/ExternalDomainProcessor.java

@@ -15,14 +15,15 @@
  */
 package org.seasar.doma.internal.apt;
 
-import static org.seasar.doma.internal.util.AssertionUtil.*;
+import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.io.IOException;
 
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
 
+import org.seasar.doma.ExternalDomain;
 import org.seasar.doma.internal.apt.meta.ExternalDomainMeta;
 import org.seasar.doma.internal.apt.meta.ExternalDomainMetaFactory;
 
@@ -35,6 +36,10 @@
 public class ExternalDomainProcessor extends
         AbstractGeneratingProcessor<ExternalDomainMeta> {
 
+    public ExternalDomainProcessor() {
+        super(ExternalDomain.class);
+    }
+
     @Override
     protected ExternalDomainMetaFactory createTypeElementMetaFactory() {
         return new ExternalDomainMetaFactory(processingEnv);

src/main/java/org/seasar/doma/internal/apt/SingletonConfigProcessor.java

@@ -27,6 +27,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.ElementFilter;
 
+import org.seasar.doma.SingletonConfig;
 import org.seasar.doma.internal.apt.mirror.SingletonConfigMirror;
 import org.seasar.doma.internal.apt.util.TypeMirrorUtil;
 import org.seasar.doma.jdbc.Config;
@@ -41,6 +42,7 @@
 public class SingletonConfigProcessor extends AbstractProcessor {
 
     public SingletonConfigProcessor() {
+        super(SingletonConfig.class);
     }
 
     @Override