diff --git a/docs-source/src/en/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md b/docs-source/src/en/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
index db02284..bd81314 100644
--- a/docs-source/src/en/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
+++ b/docs-source/src/en/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
@@ -442,7 +442,7 @@ fun enclosing(vararg name: String)
## FromPackageRules - class
```kotlin:no-line-numbers
-inner class FromPackageRules internal constructor(private val packages: ArrayList)
+inner class FromPackageRules internal constructor(private val packages: MutableList)
```
**Change Records**
diff --git a/docs-source/src/zh-cn/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md b/docs-source/src/zh-cn/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
index d02243d..4846f03 100644
--- a/docs-source/src/zh-cn/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
+++ b/docs-source/src/zh-cn/api/public/com/highcapable/yukireflection/finder/classes/DexClassFinder.md
@@ -434,7 +434,7 @@ fun enclosing(vararg name: String)
## FromPackageRules - class
```kotlin:no-line-numbers
-inner class FromPackageRules internal constructor(private val packages: ArrayList)
+inner class FromPackageRules internal constructor(private val packages: MutableList)
```
**变更记录**
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/base/rules/ModifierRules.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/base/rules/ModifierRules.kt
index ec47a84..28449f9 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/base/rules/ModifierRules.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/base/rules/ModifierRules.kt
@@ -47,14 +47,14 @@ class ModifierRules private constructor(private val instance: Any) {
internal companion object {
/** 当前实例数组 */
- private val instances = HashMap()
+ private val instances = mutableMapOf()
/**
* 获取模板字符串数组
* @param value 唯一标识值
- * @return [ArrayList]<[String]>
+ * @return [MutableList]<[String]>
*/
- internal fun templates(value: Long) = instances[value]?.templates ?: arrayListOf()
+ internal fun templates(value: Long) = instances[value]?.templates ?: mutableListOf()
/**
* 创建实例
@@ -66,7 +66,7 @@ class ModifierRules private constructor(private val instance: Any) {
}
/** 当前模板字符串数组 */
- private val templates = ArrayList()
+ private val templates = mutableListOf()
/**
* [Class]、[Member] 类型是否包含 public
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/DexClassFinder.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/DexClassFinder.kt
index b57b45d..ebaca55 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/DexClassFinder.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/DexClassFinder.kt
@@ -168,7 +168,7 @@ class DexClassFinder internal constructor(
* @param name 指定包名
* @return [FromPackageRules] 可设置 [FromPackageRules.absolute] 标识包名绝对匹配
*/
- fun from(vararg name: String) = FromPackageRules(arrayListOf().also {
+ fun from(vararg name: String) = FromPackageRules(mutableListOf().also {
name.takeIf { e -> e.isNotEmpty() }?.forEach { e -> it.add(rulesData.createPackageRulesData(e)) }
if (it.isNotEmpty()) rulesData.fromPackages.addAll(it)
})
@@ -351,7 +351,7 @@ class DexClassFinder internal constructor(
* 包名范围名称过滤匹配条件实现类
* @param packages 包名数组
*/
- inner class FromPackageRules internal constructor(private val packages: ArrayList) {
+ inner class FromPackageRules internal constructor(private val packages: MutableList) {
/**
* 设置包名绝对匹配
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/data/ClassRulesData.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/data/ClassRulesData.kt
index ecac162..b1ee882 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/data/ClassRulesData.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/data/ClassRulesData.kt
@@ -63,7 +63,7 @@ import java.lang.reflect.Method
* @param constroctorRules [Constructor] 查找条件数据数组
*/
internal class ClassRulesData internal constructor(
- var fromPackages: ArrayList = arrayListOf(),
+ var fromPackages: MutableList = mutableListOf(),
var fullName: NameRulesData? = null,
var simpleName: NameRulesData? = null,
var singleName: NameRulesData? = null,
@@ -73,13 +73,13 @@ internal class ClassRulesData internal constructor(
var isAnonymousClass: Boolean? = null,
var isNoExtendsClass: Boolean? = null,
var isNoImplementsClass: Boolean? = null,
- var extendsClass: ArrayList = arrayListOf(),
- var implementsClass: ArrayList = arrayListOf(),
- var enclosingClass: ArrayList = arrayListOf(),
- var memberRules: ArrayList = arrayListOf(),
- var fieldRules: ArrayList = arrayListOf(),
- var methodRules: ArrayList = arrayListOf(),
- var constroctorRules: ArrayList = arrayListOf()
+ var extendsClass: MutableList = mutableListOf(),
+ var implementsClass: MutableList = mutableListOf(),
+ var enclosingClass: MutableList = mutableListOf(),
+ var memberRules: MutableList = mutableListOf(),
+ var fieldRules: MutableList = mutableListOf(),
+ var methodRules: MutableList = mutableListOf(),
+ var constroctorRules: MutableList = mutableListOf()
) : BaseRulesData() {
/**
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/ConstructorRules.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/ConstructorRules.kt
index f5e085e..2238e90 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/ConstructorRules.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/ConstructorRules.kt
@@ -103,7 +103,7 @@ class ConstructorRules internal constructor(private val rulesData: ConstructorRu
fun param(vararg paramType: Any) {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes =
- arrayListOf>().apply { paramType.forEach { add(it.compat(tag = "Constructor") ?: UndefinedType) } }.toTypedArray()
+ mutableListOf>().apply { paramType.forEach { add(it.compat(tag = "Constructor") ?: UndefinedType) } }.toTypedArray()
}
/**
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/MethodRules.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/MethodRules.kt
index d72c8f2..8b8445a 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/MethodRules.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/classes/rules/MethodRules.kt
@@ -129,7 +129,7 @@ class MethodRules internal constructor(private val rulesData: MethodRulesData) :
fun param(vararg paramType: Any) {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes =
- arrayListOf>().apply { paramType.forEach { add(it.compat(tag = "Method") ?: UndefinedType) } }.toTypedArray()
+ mutableListOf>().apply { paramType.forEach { add(it.compat(tag = "Method") ?: UndefinedType) } }.toTypedArray()
}
/**
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/ConstructorFinder.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/ConstructorFinder.kt
index 9f68822..542e1de 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/ConstructorFinder.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/ConstructorFinder.kt
@@ -124,7 +124,7 @@ class ConstructorFinder internal constructor(override val classSet: Class<*>? =
*/
fun param(vararg paramType: Any): IndexTypeCondition {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
- rulesData.paramTypes = arrayListOf>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
+ rulesData.paramTypes = mutableListOf>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
return IndexTypeCondition(IndexConfigType.MATCH)
}
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/MethodFinder.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/MethodFinder.kt
index 02b220e..3a74d08 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/MethodFinder.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/members/MethodFinder.kt
@@ -154,7 +154,7 @@ class MethodFinder internal constructor(override val classSet: Class<*>? = null)
*/
fun param(vararg paramType: Any): IndexTypeCondition {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
- rulesData.paramTypes = arrayListOf>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
+ rulesData.paramTypes = mutableListOf>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
return IndexTypeCondition(IndexConfigType.MATCH)
}
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/tools/ReflectionTool.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/tools/ReflectionTool.kt
index e372016..bb5fb8e 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/tools/ReflectionTool.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/finder/tools/ReflectionTool.kt
@@ -85,10 +85,10 @@ internal object ReflectionTool {
private object MemoryCache {
/** 缓存的 [Class] 列表数组 */
- val dexClassListData = HashMap>()
+ val dexClassListData = mutableMapOf>()
/** 缓存的 [Class] 对象数组 */
- val classData = HashMap?>()
+ val classData = mutableMapOf?>()
}
/**
@@ -660,7 +660,7 @@ internal object ReflectionTool {
*/
private val Class<*>.existMembers
get() = runCatching {
- arrayListOf().apply {
+ mutableListOf().apply {
addAll(declaredFields.toList())
addAll(declaredMethods.toList())
addAll(declaredConstructors.toList())
diff --git a/yukireflection-core/src/main/java/com/highcapable/yukireflection/utils/factory/VariableFactory.kt b/yukireflection-core/src/main/java/com/highcapable/yukireflection/utils/factory/VariableFactory.kt
index 78c14e8..144746c 100644
--- a/yukireflection-core/src/main/java/com/highcapable/yukireflection/utils/factory/VariableFactory.kt
+++ b/yukireflection-core/src/main/java/com/highcapable/yukireflection/utils/factory/VariableFactory.kt
@@ -96,10 +96,10 @@ internal inline fun T.conditions(initiate: Conditions.() -> Unit) = Condi
internal class Conditions(internal var value: T) {
/** 全部判断条件数组 (与) */
- private val andConditions = ArrayList()
+ private val andConditions = mutableListOf()
/** 全部判断条件数组 (或) */
- private val optConditions = ArrayList()
+ private val optConditions = mutableListOf()
/**
* 添加与 (and) 条件