Allow the domain class to implement the Iterable interface (#705)

Author: nakamura-to

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

@@ -546,18 +546,18 @@ public CtType newCtType(TypeMirror type) {
 
   private CtType newCtTypeInternal(
       TypeMirror type, CtTypeVisitor<Void, Void, AptException> validator) {
-    // The newArrayCtType function must be after the newDomainCtType function
+    // Apply newDomainCtType, newEmbeddableCtType and newEntityCtType functions first.
     List<Function<TypeMirror, CtType>> functions =
         Arrays.asList(
+            this::newDomainCtType,
+            this::newEmbeddableCtType,
+            this::newEntityCtType,
             this::newIterableCtType,
             this::newStreamCtType,
-            this::newEntityCtType,
             this::newOptionalCtType,
             this::newOptionalIntCtType,
             this::newOptionalLongCtType,
             this::newOptionalDoubleCtType,
-            this::newDomainCtType,
-            this::newEmbeddableCtType,
             this::newBasicCtType,
             this::newMapCtType,
             this::newSelectOptionsCtType,

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

@@ -17,6 +17,8 @@ public class DomainPropertyEntity {
 
   Name name;
 
+  Names names;
+
   @Version Ver ver;
 
   public Identifier getId() {
@@ -35,6 +37,14 @@ public void setName(Name name) {
     this.name = name;
   }
 
+  public Names getNames() {
+    return names;
+  }
+
+  public void setNames(Names names) {
+    this.names = names;
+  }
+
   public Ver getVer() {
     return ver;
   }

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

@@ -0,0 +1,23 @@
+package org.seasar.doma.internal.apt.processor.entity;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import org.seasar.doma.Domain;
+
+@Domain(valueType = String.class)
+public class Names implements Iterable<String> {
+  private final String value;
+
+  public Names(String value) {
+    this.value = value;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public Iterator<String> iterator() {
+    return Arrays.asList(value.split(",")).iterator();
+  }
+}

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

@@ -0,0 +1,35 @@
+package org.seasar.doma.internal.apt.processor.entity;
+
+import org.seasar.doma.jdbc.domain.AbstractDomainType;
+import org.seasar.doma.wrapper.StringWrapper;
+
+public class _Names extends AbstractDomainType<String, Names> {
+
+  private _Names() {
+    super(StringWrapper::new);
+  }
+
+  @Override
+  public Names newDomain(String value) {
+    return null;
+  }
+
+  @Override
+  public String getBasicValue(Names domain) {
+    return null;
+  }
+
+  @Override
+  public Class<String> getBasicClass() {
+    return null;
+  }
+
+  @Override
+  public Class<Names> getDomainClass() {
+    return null;
+  }
+
+  public static _Names getSingletonInternal() {
+    return null;
+  }
+}

doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/entity/EntityProcessorTest_DomainPropertyEntity.txt

@@ -53,9 +53,9 @@ public final class _DomainPropertyEntity extends org.seasar.doma.jdbc.entity.Abs
         __tableName = "";
         __isQuoteRequired = false;
         java.util.List<org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __idList = new java.util.ArrayList<>();
-        java.util.List<org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __list = new java.util.ArrayList<>(3);
-        java.util.Map<String, org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __map = new java.util.LinkedHashMap<>(3);
-        java.util.Map<String, org.seasar.doma.jdbc.entity.EmbeddedPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __embeddedMap = new java.util.LinkedHashMap<>(3);
+        java.util.List<org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __list = new java.util.ArrayList<>(4);
+        java.util.Map<String, org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __map = new java.util.LinkedHashMap<>(4);
+        java.util.Map<String, org.seasar.doma.jdbc.entity.EmbeddedPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __embeddedMap = new java.util.LinkedHashMap<>(4);
         initializeMaps(__map, __embeddedMap);
         initializeIdList(__map, __idList);
         initializeList(__map, __list);
@@ -68,6 +68,7 @@ public final class _DomainPropertyEntity extends org.seasar.doma.jdbc.entity.Abs
     private void initializeMaps(java.util.Map<String, org.seasar.doma.jdbc.entity.EntityPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __map, java.util.Map<String, org.seasar.doma.jdbc.entity.EmbeddedPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, ?>> __embeddedMap) {
         __map.put("id", new org.seasar.doma.jdbc.entity.GeneratedIdPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, java.lang.Integer, org.seasar.doma.internal.apt.processor.entity.Identifier>(org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity.class, org.seasar.doma.internal.apt.processor.entity._Identifier.getSingletonInternal().createScalarSupplier(), "id", "", __namingType, false, __idGenerator));
         __map.put("name", new org.seasar.doma.jdbc.entity.DefaultPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, java.lang.String, org.seasar.doma.internal.apt.processor.entity.Name>(org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity.class, org.seasar.doma.internal.apt.processor.entity._Name.getSingletonInternal().createScalarSupplier(), "name", "", __namingType, true, true, false));
+        __map.put("names", new org.seasar.doma.jdbc.entity.DefaultPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, java.lang.String, org.seasar.doma.internal.apt.processor.entity.Names>(org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity.class, org.seasar.doma.internal.apt.processor.entity._Names.getSingletonInternal().createScalarSupplier(), "names", "", __namingType, true, true, false));
         __map.put("ver", new org.seasar.doma.jdbc.entity.VersionPropertyType<org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity, java.lang.Integer, org.seasar.doma.internal.apt.processor.entity.Ver>(org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity.class, org.seasar.doma.internal.apt.processor.entity._Ver.getSingletonInternal().createScalarSupplier(), "ver", "", __namingType, false));
     }
 
@@ -209,6 +210,7 @@ public final class _DomainPropertyEntity extends org.seasar.doma.jdbc.entity.Abs
         org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity entity = new org.seasar.doma.internal.apt.processor.entity.DomainPropertyEntity();
         if (__args.get("id") != null) __args.get("id").save(entity);
         if (__args.get("name") != null) __args.get("name").save(entity);
+        if (__args.get("names") != null) __args.get("names").save(entity);
         if (__args.get("ver") != null) __args.get("ver").save(entity);
         return entity;
     }