MOD: throw exception when unkown annotation

kanyun-inc · Nov 21, 2023 · 3982940 · 3982940
1 parent f869895
commit 3982940
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...-android-json-reader/src/main/java/com/kanyun/kudos/json/reader/KudosAndroidJsonReader.kt b/...-android-json-reader/src/main/java/com/kanyun/kudos/json/reader/KudosAndroidJsonReader.kt
@@ -32,10 +32,10 @@ object KudosAndroidJsonReader {
         return fromJson(inputStream.bufferedReader(), T::class.java)
     }
 
-    fun <T> fromJson(bufferReader: BufferedReader, clazz: Class<T>): T {
+    fun <T> fromJson(bufferedReader: BufferedReader, clazz: Class<T>): T {
         val adapter = clazz.getDeclaredConstructor().newInstance()
         return if (adapter is KudosJsonAdapter<*>) {
-            val jsonReader = JsonReader(bufferReader)
+            val jsonReader = JsonReader(bufferedReader)
             adapter.fromJson(jsonReader) as T
         } else {
             throw IllegalArgumentException("class ${clazz.name} must implement KudosJsonAdapter")

diff --git a/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/k1/KudosSyntheticResolveExtension.kt b/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/k1/KudosSyntheticResolveExtension.kt
@@ -60,6 +60,9 @@ class KudosSyntheticResolveExtension(
         if (thisDescriptor.annotations.hasAnnotation(KUDOS_NAME)) {
             val kudosAnnotation = thisDescriptor.annotations.findAnnotation(KUDOS_NAME)
             val annotationValues = kudosAnnotation?.allValueArguments?.values?.firstOrNull()?.value?.safeAs<List<IntValue>>()?.map {
+                if (it.value !in Options.validAnnotationList) {
+                    throw IllegalArgumentException("unknown annotation argument ${it.value}")
+                }
                 it.value
             }
             kudosAnnotationValueMap[thisDescriptor.classId?.asString() ?: ""] = annotationValues ?: emptyList()

diff --git a/...mpiler/src/main/java/com/kanyun/kudos/compiler/k2/KudosFirSupertypeGenerationExtension.kt b/...mpiler/src/main/java/com/kanyun/kudos/compiler/k2/KudosFirSupertypeGenerationExtension.kt
@@ -152,8 +152,8 @@ class KudosFirSupertypeGenerationExtension(
 
     private fun FirAnnotation.getIntArrayArgument(): List<Int>? {
         if (this !is FirAnnotationCall) return null
-        return arguments.mapNotNull {
-            when (it.safeAs<FirPropertyAccessExpression>()?.calleeReference?.safeAs<FirSimpleNamedReference>()?.name?.asString()) {
+        return arguments.map {
+            when (val annotationValue = it.safeAs<FirPropertyAccessExpression>()?.calleeReference?.safeAs<FirSimpleNamedReference>()?.name?.asString()) {
                 "KUDOS_ANDROID_JSON_READER" -> {
                     Options.KUDOS_ANDROID_JSON_READER
                 }
@@ -167,7 +167,7 @@ class KudosFirSupertypeGenerationExtension(
                 }
 
                 else -> {
-                    null
+                    throw IllegalArgumentException("unknown annotation argument $annotationValue")
                 }
             }
         }

diff --git a/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/options/Options.kt b/kudos-compiler/src/main/java/com/kanyun/kudos/compiler/options/Options.kt
@@ -21,6 +21,7 @@ object Options {
     const val KUDOS_GSON = 1
     const val KUDOS_JACKSON = 2
     const val KUDOS_ANDROID_JSON_READER = 3
+    val validAnnotationList = listOf(KUDOS_GSON, KUDOS_JACKSON, KUDOS_ANDROID_JSON_READER)
 
     @JvmField
     val gson = Option(