Add the "doma.criteria.enabled" option.

If the option is enabled, annotation processors generate classes for criteria

Author: nakamura-to

doma-criteria/src/main/kotlin/org/seasar/doma/criteria/query/UpdateBuilder.kt

@@ -4,9 +4,7 @@ import org.seasar.doma.criteria.context.Criterion
 import org.seasar.doma.criteria.context.Operand
 import org.seasar.doma.criteria.context.UpdateContext
 import org.seasar.doma.def.EntityDef
-import org.seasar.doma.def.PropertyDef
 import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder
-import org.seasar.doma.jdbc.InParameter
 import org.seasar.doma.jdbc.PreparedSql
 import org.seasar.doma.jdbc.SqlKind
 import org.seasar.doma.jdbc.SqlLogType

doma-criteria/src/main/kotlin/org/seasar/doma/criteria/statement/SqlUpdateStatement.kt

@@ -2,8 +2,8 @@ package org.seasar.doma.criteria.statement
 
 import org.seasar.doma.criteria.context.UpdateContext
 import org.seasar.doma.criteria.declaration.UpdateDeclaration
-import org.seasar.doma.criteria.query.UpdateQuery
 import org.seasar.doma.criteria.query.UpdateBuilder
+import org.seasar.doma.criteria.query.UpdateQuery
 import org.seasar.doma.def.EntityDef
 import org.seasar.doma.jdbc.Config
 import org.seasar.doma.jdbc.SqlLogType

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

@@ -20,6 +20,8 @@ public final class Options {
 
   public static final String TEST = "doma.test";
 
+  public static final String CRITERIA_ENABLED = "doma.criteria.enabled";
+
   public static final String DEBUG = "doma.debug";
 
   public static final String DAO_PACKAGE = "doma.dao.package";
@@ -72,6 +74,11 @@ public String getVersion() {
     return Artifact.getVersion();
   }
 
+  public boolean isCriteriaEnabled() {
+    String enabled = getOption(CRITERIA_ENABLED);
+    return Boolean.valueOf(enabled);
+  }
+
   public Date getDate() {
     if (isTestEnabled()) {
       return new Date(0L);

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

@@ -2,6 +2,8 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
@@ -16,13 +18,27 @@
 import org.seasar.doma.internal.apt.meta.entity.EmbeddableMeta;
 
 @SupportedAnnotationTypes({"org.seasar.doma.internal.EmbeddableDesc"})
-@SupportedOptions({Options.RESOURCES_DIR, Options.TEST, Options.DEBUG, Options.CONFIG_PATH})
+@SupportedOptions({
+  Options.RESOURCES_DIR,
+  Options.TEST,
+  Options.DEBUG,
+  Options.CONFIG_PATH,
+  Options.CRITERIA_ENABLED
+})
 public class EmbeddableDescProcessor extends AbstractGeneratingProcessor<EmbeddableDescMeta> {
 
   public EmbeddableDescProcessor() {
     super(EmbeddableDesc.class);
   }
 
+  @Override
+  public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+    if (!ctx.getOptions().isCriteriaEnabled()) {
+      return true;
+    }
+    return super.process(annotations, roundEnv);
+  }
+
   @Override
   protected EmbeddableDescMetaFactory createTypeElementMetaFactory() {
     return new EmbeddableDescMetaFactory(ctx);

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

@@ -2,6 +2,8 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.element.TypeElement;
@@ -16,13 +18,27 @@
 import org.seasar.doma.internal.apt.meta.entity.EntityMeta;
 
 @SupportedAnnotationTypes({"org.seasar.doma.internal.EntityDesc"})
-@SupportedOptions({Options.RESOURCES_DIR, Options.TEST, Options.DEBUG, Options.CONFIG_PATH})
+@SupportedOptions({
+  Options.RESOURCES_DIR,
+  Options.TEST,
+  Options.DEBUG,
+  Options.CONFIG_PATH,
+  Options.CRITERIA_ENABLED
+})
 public class EntityDescProcessor extends AbstractGeneratingProcessor<EntityDescMeta> {
 
   public EntityDescProcessor() {
     super(EntityDesc.class);
   }
 
+  @Override
+  public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+    if (!ctx.getOptions().isCriteriaEnabled()) {
+      return true;
+    }
+    return super.process(annotations, roundEnv);
+  }
+
   @Override
   protected EntityDescMetaFactory createTypeElementMetaFactory() {
     return new EntityDescMetaFactory(ctx);

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/embeddabledesc/EmbeddableDescProcessorTest.java

@@ -24,6 +24,7 @@ class EmbeddableDescProcessorTest extends CompilerSupport {
   @BeforeEach
   void beforeEach() {
     addOption("-Adoma.test=true");
+    addOption("-Adoma.criteria.enabled=true");
   }
 
   @TestTemplate

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entitydesc/EntityDescProcessorTest.java

@@ -24,6 +24,7 @@ class EntityDescProcessorTest extends CompilerSupport {
   @BeforeEach
   void beforeEach() {
     addOption("-Adoma.test=true");
+    addOption("-Adoma.criteria.enabled=true");
   }
 
   @TestTemplate

test-doma-criteria/build.gradle.kts

@@ -3,6 +3,12 @@ plugins {
     kotlin("kapt") apply true
 }
 
+kapt {
+    arguments {
+        arg("doma.criteria.enabled", true)
+    }
+}
+
 dependencies {
     kapt(project(":doma-processor"))
     implementation(project(":doma-core"))