Rename annotation processing options

Author: nakamura-to

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

@@ -20,11 +20,11 @@ public final class Options {
 
   public static final String TEST = "doma.test";
 
-  public static final String CRITERIA_ENABLED = "doma.criteria.enabled";
+  public static final String METAMODEL_ENABLED = "doma.metamodel.enabled";
 
-  public static final String CRITERIA_PREFIX = "doma.criteria.prefix";
+  public static final String METAMODEL_PREFIX = "doma.metamodel.prefix";
 
-  public static final String CRITERIA_SUFFIX = "doma.criteria.suffix";
+  public static final String METAMODEL_SUFFIX = "doma.metamodel.suffix";
 
   public static final String DEBUG = "doma.debug";
 
@@ -78,19 +78,19 @@ public String getVersion() {
     return Artifact.getVersion();
   }
 
-  public boolean isCriteriaEnabled() {
-    String enabled = getOption(CRITERIA_ENABLED);
-    return enabled != null ? Boolean.valueOf(enabled) : true;
+  public boolean isMetamodelEnabled() {
+    String enabled = getOption(METAMODEL_ENABLED);
+    return enabled != null ? Boolean.valueOf(enabled) : false;
   }
 
-  public String getCriteriaPrefix() {
-    String prefix = getOption(CRITERIA_PREFIX);
-    return prefix != null ? prefix : Constants.DEFAULT_CRITERIA_PREFIX;
+  public String getMetamodelPrefix() {
+    String prefix = getOption(METAMODEL_PREFIX);
+    return prefix != null ? prefix : Constants.DEFAULT_METAMODEL_PREFIX;
   }
 
-  public String getCriteriaSuffix() {
-    String suffix = getOption(CRITERIA_SUFFIX);
-    return suffix != null ? suffix : Constants.DEFAULT_CRITERIA_SUFFIX;
+  public String getMetamodelSuffix() {
+    String suffix = getOption(METAMODEL_SUFFIX);
+    return suffix != null ? suffix : Constants.DEFAULT_METAMODEL_SUFFIX;
   }
 
   public Date getDate() {
@@ -211,9 +211,9 @@ private Map<String, String> loadProperties(FileObject config) throws IOException
 
   public static class Constants {
 
-    public static final String DEFAULT_CRITERIA_PREFIX = "";
+    public static final String DEFAULT_METAMODEL_PREFIX = "";
 
-    public static final String DEFAULT_CRITERIA_SUFFIX = "_";
+    public static final String DEFAULT_METAMODEL_SUFFIX = "_";
 
     public static final String DEFAULT_DAO_SUFFIX = "Impl";
 

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

@@ -26,9 +26,9 @@
   Options.TEST,
   Options.DEBUG,
   Options.CONFIG_PATH,
-  Options.CRITERIA_ENABLED,
-  Options.CRITERIA_PREFIX,
-  Options.CRITERIA_SUFFIX
+  Options.METAMODEL_ENABLED,
+  Options.METAMODEL_PREFIX,
+  Options.METAMODEL_SUFFIX
 })
 public class EmbeddableProcessor extends AbstractGeneratingProcessor<EmbeddableMeta> {
 

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

@@ -34,9 +34,9 @@
   Options.TEST,
   Options.DEBUG,
   Options.CONFIG_PATH,
-  Options.CRITERIA_ENABLED,
-  Options.CRITERIA_PREFIX,
-  Options.CRITERIA_SUFFIX
+  Options.METAMODEL_ENABLED,
+  Options.METAMODEL_PREFIX,
+  Options.METAMODEL_SUFFIX
 })
 public class EntityProcessor extends AbstractProcessor {
 
@@ -72,7 +72,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
   private boolean isMetamodelEnabled(EntityMeta meta) {
     EntityAnnot entityAnnot = meta.getEntityAnnot();
     MetamodelAnnot metamodelAnnot = entityAnnot.getMetamodelValue();
-    return metamodelAnnot != null || ctx.getOptions().isCriteriaEnabled();
+    return metamodelAnnot != null || ctx.getOptions().isMetamodelEnabled();
   }
 
   private void generateEntityType(TypeElement typeElement, EntityMeta meta) {
@@ -106,8 +106,8 @@ private ClassName createEntityMetamodelClassName(TypeElement typeElement, Entity
     EntityAnnot entityAnnot = meta.getEntityAnnot();
     MetamodelAnnot metamodelAnnot = entityAnnot.getMetamodelValue();
     Name binaryName = ctx.getMoreElements().getBinaryName(typeElement);
-    String prefix = ctx.getOptions().getCriteriaPrefix();
-    String suffix = ctx.getOptions().getCriteriaSuffix();
+    String prefix = ctx.getOptions().getMetamodelPrefix();
+    String suffix = ctx.getOptions().getMetamodelSuffix();
     if (metamodelAnnot != null) {
       String prefixValue = metamodelAnnot.getPrefixValue();
       String suffixValue = metamodelAnnot.getSuffixValue();

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/embeddable/EmbeddableProcessorTest.java

@@ -27,7 +27,7 @@ class EmbeddableProcessorTest extends CompilerSupport {
 
   @BeforeEach
   void setUp() {
-    addOption("-Adoma.test=true", "-Adoma.criteria.enabled=false");
+    addOption("-Adoma.test=true");
   }
 
   @TestTemplate

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entity/EntityProcessorTest.java

@@ -29,8 +29,7 @@ class EntityProcessorTest extends CompilerSupport {
   void beforeEach() {
     addOption(
         "-Adoma.test=true",
-        "-Adoma.domain.converters=org.seasar.doma.internal.apt.processor.entity.DomainConvertersProvider",
-        "-Adoma.criteria.enabled=false");
+        "-Adoma.domain.converters=org.seasar.doma.internal.apt.processor.entity.DomainConvertersProvider");
   }
 
   @TestTemplate

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/metamodel/MetamodelOptionTest.java

@@ -22,14 +22,14 @@
 class MetamodelOptionTest extends CompilerSupport {
 
   private static final String PREFIX = "Q";
-  private static final String SUFFIX = "Def";
+  private static final String SUFFIX = "Metamodel";
 
   @BeforeEach
   void beforeEach() {
     addOption("-Adoma.test=true");
-    addOption("-Adoma.criteria.enabled=true");
-    addOption("-Adoma.criteria.prefix=" + PREFIX);
-    addOption("-Adoma.criteria.suffix=" + SUFFIX);
+    addOption("-Adoma.metamodel.enabled=true");
+    addOption("-Adoma.metamodel.prefix=" + PREFIX);
+    addOption("-Adoma.metamodel.suffix=" + SUFFIX);
   }
 
   @TestTemplate
@@ -53,7 +53,7 @@ public boolean supportsTestTemplate(ExtensionContext context) {
     @Override
     public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContexts(
         ExtensionContext context) {
-      return Stream.of(invocationContext(Emp.class));
+      return Stream.of(invocationContext(Emp.class), invocationContext(Person.class));
     }
 
     private TestTemplateInvocationContext invocationContext(

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/metamodel/MetamodelTest.java

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

doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/metamodel/Person.java

@@ -0,0 +1,9 @@
+package org.seasar.doma.internal.apt.processor.metamodel;
+
+import org.seasar.doma.Entity;
+
+@Entity
+public class Person {
+  public Integer id;
+  public Name name;
+}

doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/metamodel/MetamodelOptionTest_Emp.txt

@@ -2,7 +2,7 @@ package org.seasar.doma.internal.apt.processor.metamodel;
 
 /** */
 @javax.annotation.Generated(value = { "Doma", "@VERSION@" }, date = "1970-01-01T09:00:00.000+0900")
-public final class QEmpDef implements org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel<org.seasar.doma.internal.apt.processor.metamodel.Emp> {
+public final class QEmpMetamodel implements org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel<org.seasar.doma.internal.apt.processor.metamodel.Emp> {
 
     static {
         org.seasar.doma.internal.Artifact.validateVersion("@VERSION@");
@@ -26,7 +26,7 @@ public final class QEmpDef implements org.seasar.doma.jdbc.criteria.metamodel.En
 
     public final org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<java.lang.Long> optionalLong = new org.seasar.doma.jdbc.criteria.metamodel.DefaultPropertyMetamodel<java.lang.Long>(long.class, __entityType, "optionalLong");
 
-    public QEmpDef() {
+    public QEmpMetamodel() {
         java.util.ArrayList<org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<?>> __list = new java.util.ArrayList<>(7);
         __list.add(id);
         __list.add(name);

doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/metamodel/MetamodelOptionTest_Person.txt

@@ -0,0 +1,36 @@
+package org.seasar.doma.internal.apt.processor.metamodel;
+
+/** */
+@javax.annotation.Generated(value = { "Doma", "@VERSION@" }, date = "1970-01-01T09:00:00.000+0900")
+public final class QPersonMetamodel implements org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel<org.seasar.doma.internal.apt.processor.metamodel.Person> {
+
+    static {
+        org.seasar.doma.internal.Artifact.validateVersion("@VERSION@");
+    }
+
+    private final org.seasar.doma.internal.apt.processor.metamodel._Person __entityType = org.seasar.doma.internal.apt.processor.metamodel._Person.getSingletonInternal();
+
+    private final java.util.List<org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<?>> __allPropertyMetamodels;
+
+    public final org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<java.lang.Integer> id = new org.seasar.doma.jdbc.criteria.metamodel.DefaultPropertyMetamodel<java.lang.Integer>(java.lang.Integer.class, __entityType, "id");
+
+    public final org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<org.seasar.doma.internal.apt.processor.metamodel.Name> name = new org.seasar.doma.jdbc.criteria.metamodel.DefaultPropertyMetamodel<org.seasar.doma.internal.apt.processor.metamodel.Name>(org.seasar.doma.internal.apt.processor.metamodel.Name.class, __entityType, "name");
+
+    public QPersonMetamodel() {
+        java.util.ArrayList<org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<?>> __list = new java.util.ArrayList<>(2);
+        __list.add(id);
+        __list.add(name);
+        __allPropertyMetamodels = java.util.Collections.unmodifiableList(__list);
+    }
+
+    @Override
+    public org.seasar.doma.internal.apt.processor.metamodel._Person asType() {
+        return __entityType;
+    }
+
+    @Override
+    public java.util.List<org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel<?>> allPropertyMetamodels() {
+        return __allPropertyMetamodels;
+    }
+
+}