feat: add support for generic return types and default values in MethodAccessor and MethodCondition

Author: fankes

kavaref-android/src/main/kotlin/com/highcapable/kavaref/platform/MethodAccessor.kt

@@ -26,6 +26,7 @@ package com.highcapable.kavaref.platform
 import android.os.Build
 import java.lang.reflect.Member
 import java.lang.reflect.Method
+import java.lang.reflect.Type
 
 /**
  * Accessor for [Method] to provide platform-specific features.
@@ -35,8 +36,10 @@ internal class MethodAccessor(override val member: Member) : MemberAccessor(memb
     private val method = member as Method
 
     val returnType: Class<*> get() = method.returnType
+    val genericReturnType: Type get() = method.genericReturnType
     val isBridge: Boolean get() = method.isBridge
     val isDefault: Boolean get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) method.isDefault else false
+    val defaultValue: Any? get() = method.defaultValue
 
     override fun toString() = member.toString()
 }

kavaref-core/src/main/kotlin/com/highcapable/kavaref/condition/MethodCondition.kt

@@ -30,6 +30,7 @@ import com.highcapable.kavaref.condition.type.Modifiers
 import com.highcapable.kavaref.resolver.MethodResolver
 import com.highcapable.kavaref.resolver.processor.MemberProcessor
 import java.lang.reflect.Method
+import java.lang.reflect.Type
 
 /**
  * Condition for [Method] of [MethodResolver].
@@ -42,6 +43,12 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
     /** @see Method.getReturnType */
     var returnTypeCondition: ((Class<*>) -> Boolean)? = null
 
+    /** @see Method.getGenericReturnType */
+    var genericReturnType: TypeMatcher? = null
+
+    /** @see Method.getGenericReturnType */
+    var genericReturnTypeCondition: ((Type) -> Boolean)? = null
+
     /** @see Method.isBridge */
     var isBridge: Boolean? = null
 
@@ -54,6 +61,12 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
     /** @see Method.isDefault */
     var isDefaultNot: Boolean? = null
 
+    /** @see Method.getDefaultValue */
+    var defaultValue: Any? = null
+
+    /** @see Method.getDefaultValue */
+    var defaultValueCondition: ((Any?) -> Boolean)? = null
+
     override fun name(name: String) = apply { super.name(name) }
     override fun name(condition: (String) -> Boolean) = apply { super.name(condition) }
     override fun modifiers(vararg modifiers: Modifiers) = apply { super.modifiers(*modifiers) }
@@ -105,6 +118,16 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
         this.returnTypeCondition = condition
     }
 
+    /** @see Method.getGenericReturnType */
+    fun genericReturnType(type: TypeMatcher) = apply {
+        this.genericReturnType = type
+    }
+
+    /** @see Method.getGenericReturnType */
+    fun genericReturnType(condition: (Type) -> Boolean) = apply {
+        this.genericReturnTypeCondition = condition
+    }
+
     /** @see Method.isBridge */
     fun isBridge(isBridge: Boolean) = apply {
         this.isBridge = isBridge
@@ -125,16 +148,30 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
         this.isDefaultNot = isDefault
     }
 
+    /** @see Method.getDefaultValue */
+    fun defaultValue(value: Any?) = apply {
+        this.defaultValue = value
+    }
+
+    /** @see Method.getDefaultValue */
+    fun defaultValue(condition: (Any?) -> Boolean) = apply {
+        this.defaultValueCondition = condition
+    }
+
     override fun initializeCopiedData(newSelf: MemberCondition<Method, MethodResolver<T>, T>) {
         super.initializeCopiedData(newSelf)
 
         (newSelf as? MethodCondition)?.also {
             it.returnType = returnType
             it.returnTypeCondition = returnTypeCondition
+            it.genericReturnType = genericReturnType
+            it.genericReturnTypeCondition = genericReturnTypeCondition
             it.isBridge = isBridge
             it.isBridgeNot = isBridgeNot
             it.isDefault = isDefault
             it.isDefaultNot = isDefaultNot
+            it.defaultValue = defaultValue
+            it.defaultValueCondition = defaultValueCondition
         }
     }
 
@@ -144,10 +181,14 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
         (other as? MethodCondition)?.also { condition ->
             condition.returnType?.let { returnType = it }
             condition.returnTypeCondition?.let { returnTypeCondition = it }
+            condition.genericReturnType?.let { genericReturnType = it }
+            condition.genericReturnTypeCondition?.let { genericReturnTypeCondition = it }
             condition.isBridge?.let { isBridge = it }
             condition.isBridgeNot?.let { isBridgeNot = it }
             condition.isDefault?.let { isDefault = it }
             condition.isDefaultNot?.let { isDefaultNot = it }
+            condition.defaultValue?.let { defaultValue = it }
+            condition.defaultValueCondition?.let { defaultValueCondition = it }
         }
     }
 
@@ -164,18 +205,26 @@ class MethodCondition<T : Any> : ExecutableCondition<Method, MethodResolver<T>,
         get() = super.conditionStringMap + mapOf(
             RETURN_TYPE to returnType,
             RETURN_TYPE_CONDITION to returnTypeCondition,
+            GENERIC_RETURN_TYPE to genericReturnType,
+            GENERIC_RETURN_TYPE_CONDITION to genericReturnTypeCondition,
             IS_BRIDGE to isBridge,
             IS_BRIDGE_NOT to isBridgeNot,
             IS_DEFAULT to isDefault,
-            IS_DEFAULT_NOT to isDefaultNot
+            IS_DEFAULT_NOT to isDefaultNot,
+            DEFAULT_VALUE to defaultValue,
+            DEFAULT_VALUE_CONDITION to defaultValueCondition
         )
 
     companion object {
         const val RETURN_TYPE = "returnType"
         const val RETURN_TYPE_CONDITION = "returnTypeCondition"
+        const val GENERIC_RETURN_TYPE = "genericReturnType"
+        const val GENERIC_RETURN_TYPE_CONDITION = "genericReturnTypeCondition"
         const val IS_BRIDGE = "isBridge"
         const val IS_BRIDGE_NOT = "isBridgeNot"
         const val IS_DEFAULT = "isDefault"
         const val IS_DEFAULT_NOT = "isDefaultNot"
+        const val DEFAULT_VALUE = "defaultValue"
+        const val DEFAULT_VALUE_CONDITION = "defaultValueCondition"
     }
 }

kavaref-core/src/main/kotlin/com/highcapable/kavaref/resolver/processor/MemberProcessor.kt

@@ -173,10 +173,20 @@ object MemberProcessor {
         .filter(configuration, MethodCondition.RETURN_TYPE_CONDITION, condition.returnTypeCondition) { key, value ->
             runOrElse { key(value.returnType) }
         }
+        .filter(configuration, MethodCondition.GENERIC_RETURN_TYPE, condition.genericReturnType) { key, value ->
+            key.matches(value.genericReturnType)
+        }
+        .filter(configuration, MethodCondition.GENERIC_RETURN_TYPE_CONDITION, condition.genericReturnTypeCondition) { key, value ->
+            runOrElse { key(value.genericReturnType) }
+        }
         .filter(configuration, MethodCondition.IS_BRIDGE, condition.isBridge) { key, value -> value.isBridge == key }
         .filter(configuration, MethodCondition.IS_BRIDGE_NOT, condition.isBridgeNot) { key, value -> value.isBridge != key }
         .filter(configuration, MethodCondition.IS_DEFAULT, condition.isDefault) { key, value -> value.isDefault == key }
         .filter(configuration, MethodCondition.IS_DEFAULT_NOT, condition.isDefaultNot) { key, value -> value.isDefault != key }
+        .filter(configuration, MethodCondition.DEFAULT_VALUE, condition.defaultValue) { key, value -> value.defaultValue == key }
+        .filter(configuration, MethodCondition.DEFAULT_VALUE_CONDITION, condition.defaultValueCondition) { key, value ->
+            runOrElse { key(value.defaultValue) }
+        }
         .endAccess<Method>()
         .resolve(configuration)
 

kavaref-jvm/src/main/kotlin/com/highcapable/kavaref/platform/MethodAccessor.kt

@@ -25,6 +25,7 @@ package com.highcapable.kavaref.platform
 
 import java.lang.reflect.Member
 import java.lang.reflect.Method
+import java.lang.reflect.Type
 
 /**
  * Accessor for [Method] to provide platform-specific features.
@@ -34,8 +35,10 @@ internal class MethodAccessor(override val member: Member) : MemberAccessor(memb
     private val method = member as Method
 
     val returnType: Class<*> get() = method.returnType
+    val genericReturnType: Type get() = method.genericReturnType
     val isBridge: Boolean get() = method.isBridge
     val isDefault: Boolean get() = method.isDefault
+    val defaultValue: Any? get() = method.defaultValue
 
     override fun toString() = member.toString()
 }

kavaref-runtime-stub/src/main/kotlin/com/highcapable/kavaref/platform/MethodAccessor.kt

@@ -19,18 +19,21 @@
  *
  * This file is created by fankes on 2026/6/5.
  */
-@file:Suppress("unused")
+@file:Suppress("unused", "RedundantNullableReturnType")
 
 package com.highcapable.kavaref.platform
 
 import java.lang.reflect.Member
 import java.lang.reflect.Method
+import java.lang.reflect.Type
 
 /**
  * Accessor for [Method] to provide platform-specific features.
  */
 class MethodAccessor(override val member: Member) : MemberAccessor(member) {
     val returnType: Class<*> get() = error("Stub!")
+    val genericReturnType: Type get() = error("Stub!")
     val isBridge: Boolean get() = error("Stub!")
     val isDefault: Boolean get() = error("Stub!")
+    val defaultValue: Any? get() = error("Stub!")
 }