Merge pull request #337 from domaframework/issue-332-4

Support ApplicationScoped and Dependent annotations for Quarkus.

Author: nakamura-to

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

@@ -46,6 +46,10 @@ public final class Options {
 
   public static final String LOMBOK_VALUE = "doma.lombok.Value";
 
+  public static final String CDI_APPLICATION_SCOPED = "doma.cdi.ApplicationScoped";
+
+  public static final String CDI_DEPENDENT = "doma.cdi.Dependent";
+
   private final Context ctx;
 
   private final Map<String, String> options;
@@ -134,6 +138,16 @@ public String getLombokValue() {
     return name != null ? name : Constants.DEFAULT_LOMBOK_VALUE;
   }
 
+  public String getCdiApplicationScoped() {
+    String name = getOption(CDI_APPLICATION_SCOPED);
+    return name != null ? name : Constants.DEFAULT_CDI_APPLICATION_SCOPED;
+  }
+
+  public String getCdiDependent() {
+    String name = getOption(CDI_DEPENDENT);
+    return name != null ? name : Constants.DEFAULT_CDI_DEPENDENT;
+  }
+
   private String getOption(String key) {
     String v = options.get(key);
     if (v != null) {
@@ -190,5 +204,10 @@ public static class Constants {
     public static final String DEFAULT_LOMBOK_ALL_ARGS_CONSTRUCTOR = "lombok.AllArgsConstructor";
 
     public static final String DEFAULT_LOMBOK_VALUE = "lombok.Value";
+
+    public static final String DEFAULT_CDI_APPLICATION_SCOPED =
+        "javax.enterprise.context.ApplicationScoped";
+
+    public static final String DEFAULT_CDI_DEPENDENT = "javax.enterprise.context.Dependent";
   }
 }

src/main/java/org/seasar/doma/internal/apt/generator/DaoImplGenerator.java

@@ -5,6 +5,7 @@
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.util.function.Function;
+import javax.lang.model.element.Name;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 import javax.sql.DataSource;
@@ -121,6 +122,9 @@ private void printConstructors() {
         printAnnotatedConstructor();
       }
     } else {
+      if (isNoArgConstructorRequired()) {
+        printNoArgConstructor();
+      }
       printAnnotatedConstructor();
     }
   }
@@ -130,6 +134,21 @@ private boolean areJdbcConstructorsRequired() {
     return parentDaoMeta == null || parentDaoMeta.hasUserDefinedConfig();
   }
 
+  private boolean isNoArgConstructorRequired() {
+    String applicationScoped = ctx.getOptions().getCdiApplicationScoped();
+    String dependent = ctx.getOptions().getCdiDependent();
+    for (AnnotationAnnot annotation : daoMeta.getAnnotationMirrors(AnnotationTarget.CLASS)) {
+      TypeElement typeElement = ctx.getMoreTypes().toTypeElement(annotation.getTypeValue());
+      if (typeElement != null) {
+        Name name = typeElement.getQualifiedName();
+        if (name.contentEquals(applicationScoped) || name.contentEquals(dependent)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   private Code createConfigCode() {
     TypeMirror type = daoMeta.getConfigType();
     String method = daoMeta.getSingletonMethodName();
@@ -148,6 +167,13 @@ private Code createConfigCode() {
         });
   }
 
+  private void printNoArgConstructor() {
+    iprint("/** */%n");
+    iprint("%1$s() {%n", simpleName);
+    iprint("}%n");
+    print("%n");
+  }
+
   private void printNoArgConstructor(Code configCode) {
     iprint("/** */%n");
     iprint("public %1$s() {%n", simpleName);

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

@@ -32,7 +32,9 @@
   Options.SQL_VALIDATION,
   Options.VERSION_VALIDATION,
   Options.RESOURCES_DIR,
-  Options.CONFIG_PATH
+  Options.CONFIG_PATH,
+  Options.CDI_APPLICATION_SCOPED,
+  Options.CDI_DEPENDENT
 })
 public class DaoProcessor extends AbstractGeneratingProcessor<DaoMeta> {
 

src/main/java/org/seasar/doma/internal/jdbc/dao/AbstractDao.java

@@ -17,7 +17,7 @@
 
 public abstract class AbstractDao implements ConfigProvider {
 
-  protected final Config __config;
+  protected Config __config;
 
   protected AbstractDao() {
     __config = null;

src/test/java/org/seasar/doma/internal/apt/cdi/ApplicationScoped.java

@@ -0,0 +1,8 @@
+package org.seasar.doma.internal.apt.cdi;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Target;
+
+@Target(value = {TYPE})
+public @interface ApplicationScoped {}

src/test/java/org/seasar/doma/internal/apt/cdi/Dependent.java

@@ -0,0 +1,8 @@
+package org.seasar.doma.internal.apt.cdi;
+
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Target;
+
+@Target(value = {TYPE})
+public @interface Dependent {}

src/test/java/org/seasar/doma/internal/apt/processor/dao/ApplicationScopedDao.java

@@ -0,0 +1,12 @@
+package org.seasar.doma.internal.apt.processor.dao;
+
+import org.seasar.doma.AnnotateWith;
+import org.seasar.doma.Annotation;
+import org.seasar.doma.AnnotationTarget;
+import org.seasar.doma.Dao;
+import org.seasar.doma.internal.apt.cdi.ApplicationScoped;
+
+@Dao
+@AnnotateWith(
+    annotations = {@Annotation(target = AnnotationTarget.CLASS, type = ApplicationScoped.class)})
+public interface ApplicationScopedDao {}

src/test/java/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest.java

@@ -18,6 +18,8 @@
 import org.seasar.doma.internal.apt.GeneratedClassNameParameterResolver;
 import org.seasar.doma.internal.apt.ResourceParameterResolver;
 import org.seasar.doma.internal.apt.SimpleParameterResolver;
+import org.seasar.doma.internal.apt.cdi.ApplicationScoped;
+import org.seasar.doma.internal.apt.cdi.Dependent;
 import org.seasar.doma.internal.apt.processor.DaoProcessor;
 import org.seasar.doma.message.Message;
 
@@ -124,7 +126,12 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
           invocationContext(ResultStreamDao.class),
           invocationContext(PlainSingletonConfigDao.class),
           invocationContext(SqlProcessorDao.class),
-          invocationContext(OnlyDefaultMethodsExtendsDao.class));
+          invocationContext(OnlyDefaultMethodsExtendsDao.class),
+          invocationContext(
+              ApplicationScopedDao.class,
+              "-Adoma.cdi.ApplicationScoped=" + ApplicationScoped.class.getCanonicalName()),
+          invocationContext(
+              DependentDao.class, "-Adoma.cdi.Dependent=" + Dependent.class.getName()));
     }
 
     private TestTemplateInvocationContext invocationContext(Class<?> clazz, String... options) {

src/test/java/org/seasar/doma/internal/apt/processor/dao/DependentDao.java

@@ -0,0 +1,11 @@
+package org.seasar.doma.internal.apt.processor.dao;
+
+import org.seasar.doma.AnnotateWith;
+import org.seasar.doma.Annotation;
+import org.seasar.doma.AnnotationTarget;
+import org.seasar.doma.Dao;
+import org.seasar.doma.internal.apt.cdi.Dependent;
+
+@Dao
+@AnnotateWith(annotations = {@Annotation(target = AnnotationTarget.CLASS, type = Dependent.class)})
+public interface DependentDao {}

src/test/resources/org/seasar/doma/internal/apt/processor/dao/DaoProcessorTest_ApplicationScopedDao.txt

@@ -0,0 +1,23 @@
+package org.seasar.doma.internal.apt.processor.dao;
+
+/** */
+@org.seasar.doma.internal.apt.cdi.ApplicationScoped()
+@javax.annotation.Generated(value = { "Doma", "@VERSION@" }, date = "1970-01-01T09:00:00.000+0900")
+public class ApplicationScopedDaoImpl extends org.seasar.doma.internal.jdbc.dao.AbstractDao implements org.seasar.doma.internal.apt.processor.dao.ApplicationScopedDao {
+
+    static {
+        org.seasar.doma.internal.Artifact.validateVersion("@VERSION@");
+    }
+
+    /** */
+    ApplicationScopedDaoImpl() {
+    }
+
+    /**
+     * @param config the config
+     */
+    public ApplicationScopedDaoImpl(org.seasar.doma.jdbc.Config config) {
+        super(config);
+    }
+
+}