Improve the efficiency of type management in annotation processing (#1349)

Author: nakamura-to

build.gradle.kts

@@ -213,10 +213,6 @@ configure(modularProjects) {
             useJUnitPlatform()
         }
 
-        build {
-            dependsOn("publishToMavenLocal")
-        }
-
         withType<Sign>().configureEach {
             onlyIf { isReleaseVersion }
         }
@@ -250,6 +246,13 @@ configure(integrationTestProjects) {
             options.encoding = encoding
         }
 
+        compileJava {
+            val ap: String by project
+            ap.split(",").map { it.trim() }.filter { it.isNotEmpty() }.map { "-A$it" }.forEach {
+                options.compilerArgs.add(it)
+            }
+        }
+
         compileTestJava {
             options.compilerArgs.addAll(listOf("-proc:none"))
         }
@@ -297,7 +300,7 @@ configure(integrationTestProjects) {
         }
 
         register("testAll") {
-            dependsOn(h2, mysql, oracle, postgresql, sqlserver)
+            dependsOn(h2, mysql, oracle, postgresql, sqlite, sqlserver)
         }
     }
 }

doma-core/src/main/java/org/seasar/doma/message/Message.java

@@ -472,8 +472,8 @@ public enum Message implements MessageResource {
   DOMA4089(
       "When you annotate the field with @Id or @Version, "
           + "you must not annotate the field with @Column(updatable=false) to the same field."),
-  DOMA4090("The annotation processor \"{0}\" starts processing for the element \"{1}\"."),
-  DOMA4091("The annotation processor \"{0}\" ends processing for the element \"{1}\"."),
+  DOMA4090("Starting processing of annotation \"{0}\" on element \"{1}\"."),
+  DOMA4091("Finished processing of annotation \"{0}\" on element \"{1}\"."),
   DOMA4092(
       "Failed to verify the SQL template \"{0}\" on line {2} at column {3}. The cause is as follows: {4} SQL=[{1}]."),
   DOMA4093("The field annotated with @Version must be numeric."),

doma-processor/src/main/java/org/seasar/doma/internal/apt/DomaProcessor.java

@@ -109,7 +109,7 @@ public SourceVersion getSupportedSourceVersion() {
 
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-    if (roundEnv.processingOver()) {
+    if (roundEnv.processingOver() || annotations.isEmpty()) {
       return true;
     }
 

doma-processor/src/main/java/org/seasar/doma/internal/apt/MoreElements.java

@@ -28,17 +28,21 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+import javax.lang.model.AnnotatedConstruct;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementVisitor;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
+import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.Name;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.Parameterizable;
+import javax.lang.model.element.RecordComponentElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.element.VariableElement;
@@ -54,13 +58,15 @@
 
 public class MoreElements implements Elements {
 
-  private final ProcessingContext ctx;
+  private static final Object NOT_FOUND = new Object();
+
+  private final RoundContext ctx;
 
   private final Elements elementUtils;
 
-  private final Map<String, TypeElement> typeElementCache = new HashMap<>(64);
+  private final Map<String, Object> typeElementCache = new HashMap<>(256);
 
-  public MoreElements(ProcessingContext ctx, Elements elementUtils) {
+  public MoreElements(RoundContext ctx, Elements elementUtils) {
     assertNotNull(ctx, elementUtils);
     this.ctx = ctx;
     this.elementUtils = elementUtils;
@@ -72,7 +78,6 @@ public PackageElement getPackageElement(CharSequence name) {
     return elementUtils.getPackageElement(name);
   }
 
-  // delegate to elementUtils
   @Override
   public TypeElement getTypeElement(CharSequence canonicalName) {
     assertNotNull(canonicalName);
@@ -85,7 +90,14 @@ public TypeElement getTypeElement(Class<?> clazz) {
   }
 
   private TypeElement getTypeElementInternal(String canonicalName) {
-    return typeElementCache.computeIfAbsent(canonicalName, elementUtils::getTypeElement);
+    var typeElement =
+        typeElementCache.computeIfAbsent(
+            canonicalName,
+            it -> {
+              var result = elementUtils.getTypeElement(it);
+              return result == null ? NOT_FOUND : result;
+            });
+    return typeElement == NOT_FOUND ? null : (TypeElement) typeElement;
   }
 
   // delegate to elementUtils
@@ -168,6 +180,84 @@ public boolean isFunctionalInterface(TypeElement type) {
     return elementUtils.isFunctionalInterface(type);
   }
 
+  // delegate to elementUtils
+  @Override
+  public PackageElement getPackageElement(ModuleElement module, CharSequence name) {
+    return elementUtils.getPackageElement(module, name);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Set<? extends PackageElement> getAllPackageElements(CharSequence name) {
+    return elementUtils.getAllPackageElements(name);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public TypeElement getTypeElement(ModuleElement module, CharSequence name) {
+    return elementUtils.getTypeElement(module, name);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Set<? extends TypeElement> getAllTypeElements(CharSequence name) {
+    return elementUtils.getAllTypeElements(name);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public ModuleElement getModuleElement(CharSequence name) {
+    return elementUtils.getModuleElement(name);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Set<? extends ModuleElement> getAllModuleElements() {
+    return elementUtils.getAllModuleElements();
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Origin getOrigin(Element e) {
+    return elementUtils.getOrigin(e);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Origin getOrigin(AnnotatedConstruct c, AnnotationMirror a) {
+    return elementUtils.getOrigin(c, a);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public Origin getOrigin(ModuleElement m, ModuleElement.Directive directive) {
+    return elementUtils.getOrigin(m, directive);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public boolean isBridge(ExecutableElement e) {
+    return elementUtils.isBridge(e);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public ModuleElement getModuleOf(Element e) {
+    return elementUtils.getModuleOf(e);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public boolean isAutomaticModule(ModuleElement module) {
+    return elementUtils.isAutomaticModule(module);
+  }
+
+  // delegate to elementUtils
+  @Override
+  public RecordComponentElement recordComponentFor(ExecutableElement accessor) {
+    return elementUtils.recordComponentFor(accessor);
+  }
+
   public String getParameterName(VariableElement variableElement) {
     assertNotNull(variableElement);
     ParameterName parameterName = variableElement.getAnnotation(ParameterName.class);

doma-processor/src/main/java/org/seasar/doma/internal/apt/MoreTypes.java

@@ -43,11 +43,11 @@
 
 public class MoreTypes implements Types {
 
-  private final ProcessingContext ctx;
+  private final RoundContext ctx;
 
   private final Types typeUtils;
 
-  public MoreTypes(ProcessingContext ctx, Types typeUtils) {
+  public MoreTypes(RoundContext ctx, Types typeUtils) {
     assertNotNull(ctx, typeUtils);
     this.ctx = ctx;
     this.typeUtils = typeUtils;

doma-processor/src/main/java/org/seasar/doma/internal/apt/ProcessingContext.java

@@ -18,14 +18,14 @@
 import java.util.Objects;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.util.Elements;
+import javax.lang.model.util.Types;
 
 public class ProcessingContext {
 
   private final ProcessingEnvironment env;
 
   private boolean initialized;
-  private MoreElements moreElements;
-  private MoreTypes moreTypes;
   private Options options;
   private Reporter reporter;
   private Resources resources;
@@ -38,8 +38,6 @@ private void init() {
     if (initialized) {
       throw new AptIllegalStateException("already initialized");
     }
-    moreElements = new MoreElements(this, env.getElementUtils());
-    moreTypes = new MoreTypes(this, env.getTypeUtils());
     reporter = new Reporter(env.getMessager());
     resources =
         new Resources(
@@ -73,16 +71,6 @@ public RoundContext createRoundContext(RoundEnvironment roundEnvironment) {
     return roundContext;
   }
 
-  public MoreElements getMoreElements() {
-    assertInitialized();
-    return moreElements;
-  }
-
-  public MoreTypes getMoreTypes() {
-    assertInitialized();
-    return moreTypes;
-  }
-
   public Options getOptions() {
     assertInitialized();
     return options;
@@ -98,6 +86,16 @@ public Resources getResources() {
     return resources;
   }
 
+  public Elements getElements() {
+    assertInitialized();
+    return env.getElementUtils();
+  }
+
+  public Types getTypes() {
+    assertInitialized();
+    return env.getTypeUtils();
+  }
+
   private void assertInitialized() {
     if (!initialized) {
       throw new AptIllegalStateException("not yet initialized");

doma-processor/src/main/java/org/seasar/doma/internal/apt/RoundContext.java

@@ -33,6 +33,8 @@ public class RoundContext {
   private final RoundEnvironment roundEnvironment;
   private final List<ExternalDomainMeta> externalDomainMetaList = new ArrayList<>();
   private boolean initialized;
+  private MoreElements moreElements;
+  private MoreTypes moreTypes;
   private Annotations annotations;
   private Declarations declarations;
   private CtTypes ctTypes;
@@ -47,6 +49,8 @@ void init() {
     if (initialized) {
       throw new AptIllegalStateException("already initialized");
     }
+    moreElements = new MoreElements(this, processingContext.getElements());
+    moreTypes = new MoreTypes(this, processingContext.getTypes());
     annotations = new Annotations(this);
     declarations = new Declarations(this);
     ctTypes = new CtTypes(this);
@@ -61,12 +65,12 @@ public RoundEnvironment getRoundEnvironment() {
 
   public MoreElements getMoreElements() {
     assertInitialized();
-    return processingContext.getMoreElements();
+    return moreElements;
   }
 
   public MoreTypes getMoreTypes() {
     assertInitialized();
-    return processingContext.getMoreTypes();
+    return moreTypes;
   }
 
   public Options getOptions() {

doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BasicCtType.java

@@ -23,7 +23,6 @@
 import org.seasar.doma.internal.apt.generator.Code;
 import org.seasar.doma.internal.jdbc.scalar.BasicScalarSuppliers;
 import org.seasar.doma.internal.jdbc.scalar.OptionalBasicScalarSuppliers;
-import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.internal.wrapper.WrapperSuppliers;
 
 public class BasicCtType extends AbstractCtType {
@@ -32,12 +31,11 @@ public class BasicCtType extends AbstractCtType {
 
   private final TypeElement wrapperTypeElement;
 
-  BasicCtType(
-      RoundContext ctx, TypeMirror type, Pair<TypeElement, TypeMirror> wrapperElementAndType) {
+  BasicCtType(RoundContext ctx, TypeMirror type, TypeElement wrapperTypeElement) {
     super(ctx, type);
-    assertNotNull(wrapperElementAndType);
+    assertNotNull(wrapperTypeElement);
     this.boxedType = ctx.getMoreTypes().boxIfPrimitive(type);
-    this.wrapperTypeElement = wrapperElementAndType.fst;
+    this.wrapperTypeElement = wrapperTypeElement;
   }
 
   public TypeMirror getBoxedType() {