Revoke support for Dependant annotation.

Because the generated class annotated with Dependant doesn't require a no-args constructor.

Author: nakamura-to

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

@@ -143,11 +143,6 @@ public String getCdiApplicationScoped() {
     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) {
@@ -207,7 +202,5 @@ public static class Constants {
 
     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

@@ -136,12 +136,11 @@ private boolean areJdbcConstructorsRequired() {
 
   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)) {
+        if (name.contentEquals(applicationScoped)) {
           return true;
         }
       }

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

@@ -33,8 +33,7 @@
   Options.VERSION_VALIDATION,
   Options.RESOURCES_DIR,
   Options.CONFIG_PATH,
-  Options.CDI_APPLICATION_SCOPED,
-  Options.CDI_DEPENDENT
+  Options.CDI_APPLICATION_SCOPED
 })
 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 Config __config;
+  protected final Config __config;
 
   protected AbstractDao() {
     __config = null;

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

@@ -19,7 +19,6 @@
 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;
 
@@ -129,9 +128,7 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
           invocationContext(OnlyDefaultMethodsExtendsDao.class),
           invocationContext(
               ApplicationScopedDao.class,
-              "-Adoma.cdi.ApplicationScoped=" + ApplicationScoped.class.getCanonicalName()),
-          invocationContext(
-              DependentDao.class, "-Adoma.cdi.Dependent=" + Dependent.class.getName()));
+              "-Adoma.cdi.ApplicationScoped=" + ApplicationScoped.class.getCanonicalName()));
     }
 
     private TestTemplateInvocationContext invocationContext(Class<?> clazz, String... options) {