Refactor TypeProcessor

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/processor/option/DaoAnnotationOptionParameterCheckProcessor.kt

@@ -1,3 +1,18 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.domaframework.doma.intellij.inspection.dao.processor.option
 
 import com.intellij.codeInspection.ProblemsHolder
@@ -52,16 +67,23 @@ class DaoAnnotationOptionParameterCheckProcessor(
             return
         }
 
-        checkArrayOption(annotation, "include", entityClass, holder)
-        checkArrayOption(annotation, "exclude", entityClass, holder)
+        checkAnnotationOptions(annotation, entityClass, holder)
 
         val returningOption = getDaoAnnotationOption(annotation, "returning") ?: return
         if (hasReturingOption()) {
-            checkArrayOption(returningOption, "include", entityClass, holder)
-            checkArrayOption(returningOption, "exclude", entityClass, holder)
+            checkAnnotationOptions(returningOption, entityClass, holder)
         }
     }
 
+    private fun checkAnnotationOptions(
+        annotation: PsiAnnotation,
+        entityClass: PsiClass,
+        holder: ProblemsHolder,
+    ) {
+        checkArrayOption(annotation, "include", entityClass, holder)
+        checkArrayOption(annotation, "exclude", entityClass, holder)
+    }
+
     private fun checkArrayOption(
         annotation: PsiAnnotation,
         optionName: String,

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/processor/returntype/ReturnTypeCheckerProcessor.kt

@@ -15,7 +15,6 @@
  */
 package org.domaframework.doma.intellij.inspection.dao.processor.returntype
 
-import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiType
 import org.domaframework.doma.intellij.common.psi.PsiDaoMethod
 import org.domaframework.doma.intellij.common.util.DomaClassName
@@ -27,21 +26,13 @@ import org.domaframework.doma.intellij.extension.psi.getSuperClassType
 import org.domaframework.doma.intellij.inspection.dao.processor.TypeCheckerProcessor
 
 abstract class ReturnTypeCheckerProcessor(
-    private val psiDaoMethod: PsiDaoMethod,
+    psiDaoMethod: PsiDaoMethod,
     private val shortName: String,
 ) : TypeCheckerProcessor(psiDaoMethod) {
-    protected val returningFqn = DomaClassName.RETURNING.className
     protected val returnType = psiDaoMethod.psiMethod.returnType
 
     abstract fun checkReturnType(): ValidationResult?
 
-    protected fun hasReturingOption(): Boolean {
-        val methodAnnotation: PsiAnnotation =
-            getAnnotation(psiDaoMethod.daoType.fqdn) ?: return false
-        val returningOption: PsiAnnotation? = getDaoAnnotationOption(methodAnnotation, "returning")
-        return returningOption?.nameReferenceElement?.qualifiedName == returningFqn
-    }
-
     protected fun generatePsiTypeReturnTypeResult(methodOtherReturnType: PsiType): ValidationResult? =
         if (returnType != methodOtherReturnType) {
             ValidationReturnTypeResult(