Support @datatype for DAO method parameter types

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/extension/psi/PsiClassExtension.kt

@@ -50,7 +50,7 @@ fun PsiClass.isEntity(): Boolean = this.getClassAnnotation(DomaClassName.ENTITY.
 
 fun PsiClass.isDomain(): Boolean = this.getClassAnnotation(DomaClassName.DOMAIN.className) != null
 
-fun PsiClass.isDataType(): Boolean = this.getClassAnnotation(DomaClassName.DATATYPE.className) != null
+fun PsiClass.isDataType(): Boolean = this.getClassAnnotation(DomaClassName.DATATYPE.className) != null && this.isRecord
 
 fun PsiClassType.getSuperType(superClassName: String): PsiClassType? {
     var parent: PsiClassType? = this

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/processor/paramtype/BatchParamTypeCheckProcessor.kt

@@ -86,8 +86,19 @@ class BatchParamTypeCheckProcessor(
 
         val iterableClassType = param.type as? PsiClassType
         iterableClassType?.parameters?.firstOrNull()?.let { iterableParam ->
-            if (!TypeUtil.isEntity(iterableParam, project)) {
-                resultParamType.highlightElement(holder)
+            // Check if @Sql annotation is present or sqlFile=true
+            if (psiDaoMethod.useSqlAnnotation() || psiDaoMethod.sqlFileOption) {
+                if (!TypeUtil.isEntity(iterableParam, project) &&
+                    !TypeUtil.isDomain(iterableParam, project) &&
+                    !TypeUtil.isDataType(iterableParam, project)
+                ) {
+                    resultParamType.highlightElement(holder)
+                }
+            } else {
+                // When @Sql annotation is present or sqlFile=true, only Entity types are allowed
+                if (!TypeUtil.isEntity(iterableParam, project)) {
+                    resultParamType.highlightElement(holder)
+                }
             }
             return
         }

src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/AnnotationParamTypeCheckInspectionTest.kt

@@ -32,6 +32,7 @@ class AnnotationParamTypeCheckInspectionTest : DomaSqlTest() {
             "ScriptParamTestDao",
             "SqlProcessorParamTestDao",
             "FactoryParamTestDao",
+            "DataTypeParamTypeTestDao",
         )
     private val daoPackage = "inspection/paramtype"
 
@@ -43,6 +44,7 @@ class AnnotationParamTypeCheckInspectionTest : DomaSqlTest() {
         addOtherJavaFile("collector", "HogeCollector.java")
         addOtherJavaFile("function", "HogeFunction.java")
         addOtherJavaFile("function", "HogeBiFunction.java")
+        addOtherJavaFile("domain", "Salary.java")
         testDaoNames.forEach { daoName ->
             addDaoJavaFile("$daoPackage/$daoName.java")
         }
@@ -87,4 +89,9 @@ class AnnotationParamTypeCheckInspectionTest : DomaSqlTest() {
         val dao = findDaoClass("$daoPackage.FactoryParamTestDao")
         myFixture.testHighlighting(false, false, false, dao.containingFile.virtualFile)
     }
+
+    fun testDataTypeParam() {
+        val dao = findDaoClass("$daoPackage.DataTypeParamTypeTestDao")
+        myFixture.testHighlighting(false, false, false, dao.containingFile.virtualFile)
+    }
 }

src/test/testData/src/main/java/doma/example/dao/inspection/returntype/DataTypeReturnTypeTestDao.java

@@ -3,6 +3,7 @@
 import org.seasar.doma.*;
 import doma.example.domain.Salary;
 import org.seasar.doma.jdbc.Reference;
+import org.seasar.doma.jdbc.Result;
 
 import java.util.List;
 import java.util.Optional;
@@ -18,9 +19,57 @@ public interface DataTypeReturnTypeTestDao {
   @Sql("select * from salary where id = /*salary.value*/0")
   Optional<Salary> selectOptSalary(Salary salary) ;
 
+  @Update
+  @Sql("UPDATE salary SET val = /*salary.value*/0")
+  int updateSalaryWithSql1(Salary salary);
+
+  @Update
+  @Sql("UPDATE salary SET val = /*salary.value*/0")
+  Result<Salary> <error descr="The return type must be \"int\"">updateSalaryWithSql2</error>(Salary salary);
+
+  @Insert
+  @Sql("INSERT INTO salary (val) VALUES (/*salary.value*/0)")
+  int insertSalaryWithSql(Salary salary);
+
+  @Insert
+  @Sql("INSERT INTO salary (val) VALUES (/*salary.value*/0)")
+  Result<Salary> <error descr="The return type must be \"int\"">insertSalaryWithSql2</error>(Salary salary);
+
+  @Delete
+  @Sql("DELETE FROM salary WHERE val = /*salary.value*/0 ")
+  int deleteSalaryWithSql(Salary salary);
+
+  @Delete
+  @Sql("DELETE FROM salary WHERE val = /*salary.value*/0 ")
+  Result<Salary> <error descr="The return type must be \"int\"">deleteSalaryWithSql2</error>(Salary salary);
+
+  @BatchUpdate
+  @Sql("UPDATE salary SET val = /*salary.value*/0")
+  int[] batchUpdateSalaryWithSql(List<Salary> salary);
+
+  @BatchUpdate
+  @Sql("UPDATE salary SET val = /*salary.value*/0")
+  <error descr="Cannot resolve symbol 'BatchResult'">BatchResult</error><Salary> <error descr="The return type must be \"int[]\"">batchUpdateSalaryWithSql2</error>(List<Salary> salary);
+
+  @BatchInsert
+  @Sql("INSERT INTO salary (val) VALUES (/*salary.value*/0)")
+  int[] batchInsertSalaryWithSql(List<Salary> salary);
+
+  @BatchInsert
+  @Sql("INSERT INTO salary (val) VALUES (/*salary.value*/0)")
+  <error descr="Cannot resolve symbol 'BatchResult'">BatchResult</error><Salary> <error descr="The return type must be \"int[]\"">batchInsertSalaryWithSql2</error>(List<Salary> salary);
+
+  @BatchDelete
+  @Sql("DELETE FROM salary WHERE val = /*salary.value*/0 ")
+  int[] batchDeleteSalaryWithSql(List<Salary> salary);
+
+  @BatchDelete
+  @Sql("DELETE FROM salary WHERE val = /*salary.value*/0 ")
+  <error descr="Cannot resolve symbol 'BatchResult'">BatchResult</error><Salary> <error descr="The return type must be \"int[]\"">batchDeleteSalaryWithSql2</error>(List<Salary> salary);
+
   @Function
-  Salary calculateAverageSalary();
-  
+  List<Salary> getTopSalaries(@In Salary limit);
+
   @Function
   Optional<Salary> getMaxSalary(@InOut Reference<Salary> percentage, @ResultSet List<Salary> resultSet);