Refactor Scope features (#660)

* Refactor Metamodel

* Rename ScopeMethod to Scope

* Replace ScopeClass with ScopeClassMeta

* Split validator from generator

* Remove warning messages

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/Metamodel.java

@@ -33,5 +33,5 @@
   String suffix() default "";
 
   /** @return the scope class array */
-  Class<?>[] scope() default {};
+  Class<?>[] scopes() default {};
 }

doma-core/src/main/java/org/seasar/doma/ScopeMethod.java renamed to doma-core/src/main/java/org/seasar/doma/Scope.java

@@ -7,4 +7,4 @@
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface ScopeMethod {}
+public @interface Scope {}

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

@@ -442,8 +442,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 class \"{1}\"."),
-  DOMA4091("The annotation processor \"{0}\" ends processing for the class \"{1}\"."),
+  DOMA4090("The annotation processor \"{0}\" starts processing for the element \"{1}\"."),
+  DOMA4091("The annotation processor \"{0}\" ends processing for the 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/annot/Annotations.java

@@ -3,20 +3,44 @@
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.lang.model.element.*;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-import org.seasar.doma.*;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import org.seasar.doma.AnnotateWith;
+import org.seasar.doma.ArrayFactory;
+import org.seasar.doma.BatchDelete;
+import org.seasar.doma.BatchInsert;
+import org.seasar.doma.BatchUpdate;
+import org.seasar.doma.BlobFactory;
+import org.seasar.doma.ClobFactory;
+import org.seasar.doma.Column;
+import org.seasar.doma.Dao;
+import org.seasar.doma.Delete;
+import org.seasar.doma.Domain;
+import org.seasar.doma.DomainConverters;
+import org.seasar.doma.Embeddable;
+import org.seasar.doma.Entity;
+import org.seasar.doma.Insert;
+import org.seasar.doma.NClobFactory;
+import org.seasar.doma.Procedure;
+import org.seasar.doma.ResultSet;
+import org.seasar.doma.SQLXMLFactory;
+import org.seasar.doma.Script;
+import org.seasar.doma.Select;
+import org.seasar.doma.SequenceGenerator;
+import org.seasar.doma.Sql;
+import org.seasar.doma.SqlProcessor;
+import org.seasar.doma.Table;
+import org.seasar.doma.TableGenerator;
+import org.seasar.doma.Update;
 import org.seasar.doma.experimental.DataType;
 import org.seasar.doma.internal.apt.Context;
-import org.seasar.doma.internal.apt.decl.TypeDeclaration;
-import org.seasar.doma.internal.apt.decl.TypeParameterDeclaration;
 import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
 
 public class Annotations {
@@ -179,42 +203,7 @@ public InsertAnnot newInsertAnnot(ExecutableElement method) {
 
   public MetamodelAnnot newMetamodelAnnot(AnnotationMirror annotationMirror) {
     assertNotNull(annotationMirror);
-    MetamodelAnnot metamodelAnnot = newInstance(annotationMirror, MetamodelAnnot::new);
-    List<TypeMirror> types = AnnotationValueUtil.toTypeList(metamodelAnnot.getScope());
-    for (TypeMirror t : types) {
-      ScopeClass scopeClass = newScopeClass(t);
-      metamodelAnnot.addScope(scopeClass);
-    }
-
-    return metamodelAnnot;
-  }
-
-  private ScopeClass newScopeClass(TypeMirror scopeType) {
-    TypeDeclaration type = ctx.getDeclarations().newTypeDeclaration(scopeType);
-    TypeElement typeElement = ctx.getMoreTypes().toTypeElement(scopeType);
-    List<? extends Element> members = ctx.getMoreElements().getAllMembers(typeElement);
-    List<ExecutableElement> methods = new ArrayList<>(ElementFilter.methodsIn(members));
-    methods.removeIf(m -> m.getAnnotation(ScopeMethod.class) == null);
-
-    List<TypeParameterDeclaration> typeParameterDeclarations =
-        type.getAllTypeParameterDeclarations();
-    List<ScopeMethodAdapter> methodAdapters = new ArrayList<>(methods.size());
-    for (ExecutableElement method : methods) {
-      List<? extends VariableElement> parameters = method.getParameters();
-
-      List<TypeParameterDeclaration> typeParams =
-          parameters.stream()
-              .map(Element::asType)
-              .map(
-                  formalType ->
-                      ctx.getDeclarations()
-                          .newTypeParameterDeclarationUsingTypeParams(
-                              formalType, typeParameterDeclarations))
-              .collect(Collectors.toList());
-      methodAdapters.add(new ScopeMethodAdapter(method, typeParams));
-    }
-    Collections.sort(methodAdapters);
-    return new ScopeClass(type, methodAdapters);
+    return newInstance(annotationMirror, MetamodelAnnot::new);
   }
 
   public NClobFactoryAnnot newNClobFactoryAnnot(ExecutableElement method) {

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

@@ -2,11 +2,11 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.assertNonNullValue;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.type.TypeMirror;
 import org.seasar.doma.internal.apt.AptIllegalStateException;
 import org.seasar.doma.internal.apt.util.AnnotationValueUtil;
 
@@ -16,21 +16,19 @@ public class MetamodelAnnot extends AbstractAnnot {
 
   private static final String SUFFIX = "suffix";
 
-  private static final String SCOPE = "scope";
+  private static final String SCOPES = "scopes";
 
   private final AnnotationValue prefix;
 
   private final AnnotationValue suffix;
 
-  private final AnnotationValue scopeClasses;
-
-  private final List<ScopeClass> scopes = new ArrayList<>();
+  private final AnnotationValue scopes;
 
   MetamodelAnnot(AnnotationMirror annotationMirror, Map<String, AnnotationValue> values) {
     super(annotationMirror);
     this.prefix = assertNonNullValue(values, PREFIX);
     this.suffix = assertNonNullValue(values, SUFFIX);
-    this.scopeClasses = assertNonNullValue(values, SCOPE);
+    this.scopes = assertNonNullValue(values, SCOPES);
   }
 
   public AnnotationValue getPrefix() {
@@ -41,8 +39,8 @@ public AnnotationValue getSuffix() {
     return suffix;
   }
 
-  public AnnotationValue getScope() {
-    return scopeClasses;
+  public AnnotationValue getScopes() {
+    return scopes;
   }
 
   public String getPrefixValue() {
@@ -61,11 +59,11 @@ public String getSuffixValue() {
     return value;
   }
 
-  public void addScope(ScopeClass scopeClass) {
-    scopes.add(scopeClass);
-  }
-
-  public List<ScopeClass> scopes() {
-    return scopes;
+  public List<TypeMirror> getScopesValue() {
+    List<TypeMirror> value = AnnotationValueUtil.toTypeList(scopes);
+    if (value == null) {
+      throw new AptIllegalStateException(SCOPES);
+    }
+    return value;
   }
 }