🌟 Add new annotation, ReadAsList ((#7).

theapache64 · Apr 24, 2021 · 8ae8591 · 8ae8591
1 parent c47fbcf
commit 8ae8591
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/retrosheet/src/main/kotlin/com/github/theapache64/retrosheet/RetrosheetInterceptor.kt b/retrosheet/src/main/kotlin/com/github/theapache64/retrosheet/RetrosheetInterceptor.kt
@@ -43,18 +43,24 @@ private constructor(
 
         private fun isReturnTypeList(request: Request): Boolean {
             val method = request.tag(Invocation::class.java)?.method()
-            val genericReturnType = method?.genericReturnType?.toString()
-            return if (genericReturnType != null && genericReturnType != TYPE_OBJECT) {
-                genericReturnType.contains(PACKAGE_LIST_CONTAINS)
+            val hasReadAsList = method?.annotations?.indexOfFirst { it is ReadAsList } != -1
+            if (hasReadAsList) {
+                return true
             } else {
-                // go for hard reflection
-                try {
-                    val f = Method::class.java.getDeclaredField("signature")
-                    f.isAccessible = true
-                    val signature = f.get(method).toString()
-                    signature.contains(SIGNATURE_LIST_CONTAINS)
-                } catch (e: NoSuchFieldException) {
-                    false
+                // Trying to find return type using reflection
+                val genericReturnType = method?.genericReturnType?.toString()
+                return if (genericReturnType != null && genericReturnType != TYPE_OBJECT) {
+                    genericReturnType.contains(PACKAGE_LIST_CONTAINS)
+                } else {
+                    // go for hard reflection
+                    try {
+                        val f = Method::class.java.getDeclaredField("signature")
+                        f.isAccessible = true
+                        val signature = f.get(method).toString()
+                        signature.contains(SIGNATURE_LIST_CONTAINS)
+                    } catch (e: NoSuchFieldException) {
+                        false
+                    }
                 }
             }
 

diff --git a/retrosheet/src/main/kotlin/com/github/theapache64/retrosheet/core/ReadAsList.kt b/retrosheet/src/main/kotlin/com/github/theapache64/retrosheet/core/ReadAsList.kt
@@ -0,0 +1,9 @@
+package com.github.theapache64.retrosheet.core
+
+/**
+ * To tell Retrosheet that the method expects List/multiple items
+ */
+@MustBeDocumented
+@Target(AnnotationTarget.FUNCTION)
+@Retention
+annotation class ReadAsList