Optimize code

tangllty · May 24, 2024 · d312fee · d312fee
1 parent f41aef1
commit d312fee
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/tang-commons/src/main/kotlin/com/tang/commons/utils/poi/ExcelUtils.kt b/tang-commons/src/main/kotlin/com/tang/commons/utils/poi/ExcelUtils.kt
@@ -385,19 +385,11 @@ object ExcelUtils {
 
         return fields
             .filter { it.isAnnotationPresent(Excel::class.java) }
-            .map { field -> field to getAnnotation(field, Excel::class.java) }
+            .map { field -> field to AnnotationUtils.getAnnotation(field, Excel::class.java)!! }
             .sortedBy { it.second.sort }
             .associateByTo(LinkedHashMap(), { it.first }, { it.second })
     }
 
-    /**
-     * 此方法不会抛出异常，目的是消除AnnotationUtils.getAnnotation返回值可能为空的警告
-     * .filter { it.isAnnotationPresent(Excel::class.java) } 已经过滤无Excel注解的字段
-     */
-    private fun getAnnotation(annotatedElement: Field, annotationType: Class<Excel>): Excel {
-        return AnnotationUtils.getAnnotation(annotatedElement, annotationType) ?: throw IllegalStateException("Annotation not found")
-    }
-
     /**
      * 响应 Excel
      *