Merge pull request #384 from domaframework/issue-383

Resolve type parameters with actual type arguments for generic types

Author: nakamura-to

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

@@ -560,6 +560,8 @@ public enum Message implements MessageResource {
       "Failed to verify the SQL template \"{0}\" on line {2} at column {3}. "
           + "The parameter type that corresponds to the expression \"{4}\" must be a subtype of either java.lang.Iterable or an array type. "
           + "But the actual type is \"{5}\". "
+          + "If the actual type is a subtype of java.lang.Iterable, ensure that the type parameter or it is resolved with one of the supported types. "
+          + "If the actual type is an array type, ensure that the component type of it is one of the supported types. "
           + "You may forget to access to its field or to invoke its method. SQL=[{1}]"),
   DOMA4163(
       "The user defined Config class must not be abstract. " + "The class \"{0}\" is abstract."),

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

@@ -5,8 +5,17 @@
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 import static org.seasar.doma.internal.util.AssertionUtil.assertTrue;
 
-import java.util.*;
-import javax.lang.model.element.*;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
@@ -124,6 +133,30 @@ private TypeMirror resolveTypeParameter(
       if (formalType.equals(typeParameterDecl.getFormalType())) {
         return typeParameterDecl.getActualType();
       }
+      DeclaredType declaredType = ctx.getMoreTypes().toDeclaredType(formalType);
+      if (declaredType == null) {
+        continue;
+      }
+      if (declaredType.getTypeArguments().isEmpty()) {
+        continue;
+      }
+      List<Optional<TypeMirror>> optTypeArgs =
+          declaredType.getTypeArguments().stream()
+              .map(
+                  arg ->
+                      typeParameterDeclarations.stream()
+                          .filter(declaration -> arg.equals(declaration.getFormalType()))
+                          .map(TypeParameterDeclaration::getActualType)
+                          .findFirst())
+              .collect(Collectors.toList());
+      if (optTypeArgs.stream().allMatch(Optional::isPresent)) {
+        TypeMirror[] typeArgs = optTypeArgs.stream().map(Optional::get).toArray(TypeMirror[]::new);
+        TypeElement typeElement = ctx.getMoreElements().toTypeElement(declaredType.asElement());
+        if (typeElement == null) {
+          continue;
+        }
+        return ctx.getMoreTypes().getDeclaredType(typeElement, typeArgs);
+      }
     }
     return formalType;
   }

doma-processor/src/test/java/org/seasar/doma/internal/apt/validator/AbstractCriteria.java

@@ -0,0 +1,8 @@
+package org.seasar.doma.internal.apt.validator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AbstractCriteria<T> {
+  private List<T> list = new ArrayList<>();
+}

doma-processor/src/test/java/org/seasar/doma/internal/apt/validator/CriteriaHolder.java

@@ -0,0 +1,5 @@
+package org.seasar.doma.internal.apt.validator;
+
+public class CriteriaHolder {
+  private LongCriteria criteria = new LongCriteria();
+}

doma-processor/src/test/java/org/seasar/doma/internal/apt/validator/LongCriteria.java

@@ -0,0 +1,3 @@
+package org.seasar.doma.internal.apt.validator;
+
+public class LongCriteria extends AbstractCriteria<Long> {}

doma-processor/src/test/java/org/seasar/doma/internal/apt/validator/SqlValidationDao.java

@@ -29,4 +29,6 @@ public interface SqlValidationDao {
   void testExpand(String name);
 
   void testPopulate(String name);
+
+  void testTypeParameterResolution(CriteriaHolder criteriaHolder);
 }

doma-processor/src/test/java/org/seasar/doma/internal/apt/validator/SqlValidatorTest.java

@@ -25,6 +25,33 @@ void beforeEach() {
     addSourcePath("src/main/java");
   }
 
+  @Test
+  void testFormalTypeParameterResolution() throws Exception {
+    Class<?> target = SqlValidationDao.class;
+    addCompilationUnit(target);
+    addProcessor(
+        new TestProcessor() {
+          @Override
+          protected void run() {
+            ExecutableElement methodElement =
+                createMethodElement(target, "testTypeParameterResolution", CriteriaHolder.class);
+            LinkedHashMap<String, TypeMirror> parameterTypeMap =
+                createParameterTypeMap(methodElement);
+
+            SqlValidator validator =
+                new SqlValidator(
+                    ctx, methodElement, parameterTypeMap, "aaa/bbbDao/ccc.sql", false, false);
+            SqlParser parser =
+                new SqlParser(
+                    "select * from emp where name in /* criteriaHolder.criteria.list */(0)");
+            SqlNode sqlNode = parser.parse();
+            sqlNode.accept(validator, null);
+          }
+        });
+    compile();
+    assertTrue(getCompiledResult());
+  }
+
   @Test
   void testBindVariable() throws Exception {
     Class<?> target = SqlValidationDao.class;