Refactor usage checks for DAO method parameters to simplify subtype validation

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiDaoMethod.kt

@@ -103,11 +103,6 @@ class PsiDaoMethod(
 
     private fun getSqlAnnotation(): PsiAnnotation? = DomaAnnotationType.Sql.getPsiAnnotation(psiMethod)
 
-    fun isSelectTypeCollect(): Boolean {
-        val selectAnnotation = DomaAnnotationType.Select.getPsiAnnotation(psiMethod) ?: return false
-        return daoType.isSelectTypeCollect(selectAnnotation)
-    }
-
     fun useSqlAnnotation(): Boolean = getSqlAnnotation() != null
 
     private fun setSqlFilePath() {

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

@@ -19,32 +19,17 @@ import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiParameter
 import org.domaframework.doma.intellij.common.util.DomaClassName
 
-val PsiParameter.isFunctionClazz: Boolean
-    get() {
-        val functionType = DomaClassName.JAVA_FUNCTION
-        val superCollection: PsiClassType? = getSuperClassType(functionType)
-        return superCollection != null
-    }
-
-val PsiParameter.isBiFunctionClazz: Boolean
-    get() {
-        val functionType = DomaClassName.BI_FUNCTION
-        val superCollection: PsiClassType? = getSuperClassType(functionType)
-        return superCollection != null
-    }
-
-val PsiParameter.isSelectOption: Boolean
-    get() {
-        val collectorType = DomaClassName.SELECT_OPTIONS
-        val superCollection: PsiClassType? = getSuperClassType(collectorType)
-        return superCollection != null
-    }
+private val ignoreUsageCheckType =
+    listOf<DomaClassName>(
+        DomaClassName.JAVA_FUNCTION,
+        DomaClassName.BI_FUNCTION,
+        DomaClassName.SELECT_OPTIONS,
+        DomaClassName.JAVA_COLLECTOR,
+    )
 
-val PsiParameter.isCollector: Boolean
-    get() {
-        val collectorType = DomaClassName.JAVA_COLLECTOR
-        val superCollection: PsiClassType? = getSuperClassType(collectorType)
-        return superCollection != null
+fun PsiParameter.isIgnoreUsageCheck(): Boolean =
+    ignoreUsageCheckType.any { type ->
+        getSuperClassType(type) != null
     }
 
 fun PsiParameter.getSuperClassType(superClassType: DomaClassName): PsiClassType? {

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/visitor/UsedDaoMethodParamInspectionVisitor.kt

@@ -27,10 +27,7 @@ import org.domaframework.doma.intellij.common.dao.getDaoClass
 import org.domaframework.doma.intellij.common.isJavaOrKotlinFileType
 import org.domaframework.doma.intellij.common.psi.PsiDaoMethod
 import org.domaframework.doma.intellij.extension.findFile
-import org.domaframework.doma.intellij.extension.psi.isBiFunctionClazz
-import org.domaframework.doma.intellij.extension.psi.isCollector
-import org.domaframework.doma.intellij.extension.psi.isFunctionClazz
-import org.domaframework.doma.intellij.extension.psi.isSelectOption
+import org.domaframework.doma.intellij.extension.psi.isIgnoreUsageCheck
 import org.domaframework.doma.intellij.extension.psi.methodParameters
 
 class UsedDaoMethodParamInspectionVisitor(
@@ -45,8 +42,7 @@ class UsedDaoMethodParamInspectionVisitor(
         if (!psiDaoMethod.useSqlAnnotation() && !psiDaoMethod.isUseSqlFileMethod()) return
 
         val methodParameters =
-            method.methodParameters
-                .filter { !it.isFunctionClazz && !it.isBiFunctionClazz && !it.isSelectOption && !it.isCollector }
+            method.methodParameters.filter { !it.isIgnoreUsageCheck() }
         val sqlFileManager =
             psiDaoMethod.sqlFile?.let {
                 method.project.findFile(it)