refactor: merge HashSet to MutableSet, HashMap to MutableMap, ArrayList to MutableList

This commit is contained in:
2023-10-02 00:35:35 +08:00
parent 8b7de28e33
commit a681ac61f7
11 changed files with 25 additions and 25 deletions

View File

@@ -442,7 +442,7 @@ fun enclosing(vararg name: String)
## FromPackageRules <span class="symbol">- class</span> ## FromPackageRules <span class="symbol">- class</span>
```kotlin:no-line-numbers ```kotlin:no-line-numbers
inner class FromPackageRules internal constructor(private val packages: ArrayList<ClassRulesData.PackageRulesData>) inner class FromPackageRules internal constructor(private val packages: MutableList<ClassRulesData.PackageRulesData>)
``` ```
**Change Records** **Change Records**

View File

@@ -434,7 +434,7 @@ fun enclosing(vararg name: String)
## FromPackageRules <span class="symbol">- class</span> ## FromPackageRules <span class="symbol">- class</span>
```kotlin:no-line-numbers ```kotlin:no-line-numbers
inner class FromPackageRules internal constructor(private val packages: ArrayList<ClassRulesData.PackageRulesData>) inner class FromPackageRules internal constructor(private val packages: MutableList<ClassRulesData.PackageRulesData>)
``` ```
**变更记录** **变更记录**

View File

@@ -47,14 +47,14 @@ class ModifierRules private constructor(private val instance: Any) {
internal companion object { internal companion object {
/** 当前实例数组 */ /** 当前实例数组 */
private val instances = HashMap<Long, ModifierRules>() private val instances = mutableMapOf<Long, ModifierRules>()
/** /**
* 获取模板字符串数组 * 获取模板字符串数组
* @param value 唯一标识值 * @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<String>() private val templates = mutableListOf<String>()
/** /**
* [Class]、[Member] 类型是否包含 public * [Class]、[Member] 类型是否包含 public

View File

@@ -168,7 +168,7 @@ class DexClassFinder internal constructor(
* @param name 指定包名 * @param name 指定包名
* @return [FromPackageRules] 可设置 [FromPackageRules.absolute] 标识包名绝对匹配 * @return [FromPackageRules] 可设置 [FromPackageRules.absolute] 标识包名绝对匹配
*/ */
fun from(vararg name: String) = FromPackageRules(arrayListOf<ClassRulesData.PackageRulesData>().also { fun from(vararg name: String) = FromPackageRules(mutableListOf<ClassRulesData.PackageRulesData>().also {
name.takeIf { e -> e.isNotEmpty() }?.forEach { e -> it.add(rulesData.createPackageRulesData(e)) } name.takeIf { e -> e.isNotEmpty() }?.forEach { e -> it.add(rulesData.createPackageRulesData(e)) }
if (it.isNotEmpty()) rulesData.fromPackages.addAll(it) if (it.isNotEmpty()) rulesData.fromPackages.addAll(it)
}) })
@@ -351,7 +351,7 @@ class DexClassFinder internal constructor(
* 包名范围名称过滤匹配条件实现类 * 包名范围名称过滤匹配条件实现类
* @param packages 包名数组 * @param packages 包名数组
*/ */
inner class FromPackageRules internal constructor(private val packages: ArrayList<ClassRulesData.PackageRulesData>) { inner class FromPackageRules internal constructor(private val packages: MutableList<ClassRulesData.PackageRulesData>) {
/** /**
* 设置包名绝对匹配 * 设置包名绝对匹配

View File

@@ -63,7 +63,7 @@ import java.lang.reflect.Method
* @param constroctorRules [Constructor] 查找条件数据数组 * @param constroctorRules [Constructor] 查找条件数据数组
*/ */
internal class ClassRulesData internal constructor( internal class ClassRulesData internal constructor(
var fromPackages: ArrayList<PackageRulesData> = arrayListOf(), var fromPackages: MutableList<PackageRulesData> = mutableListOf(),
var fullName: NameRulesData? = null, var fullName: NameRulesData? = null,
var simpleName: NameRulesData? = null, var simpleName: NameRulesData? = null,
var singleName: NameRulesData? = null, var singleName: NameRulesData? = null,
@@ -73,13 +73,13 @@ internal class ClassRulesData internal constructor(
var isAnonymousClass: Boolean? = null, var isAnonymousClass: Boolean? = null,
var isNoExtendsClass: Boolean? = null, var isNoExtendsClass: Boolean? = null,
var isNoImplementsClass: Boolean? = null, var isNoImplementsClass: Boolean? = null,
var extendsClass: ArrayList<String> = arrayListOf(), var extendsClass: MutableList<String> = mutableListOf(),
var implementsClass: ArrayList<String> = arrayListOf(), var implementsClass: MutableList<String> = mutableListOf(),
var enclosingClass: ArrayList<String> = arrayListOf(), var enclosingClass: MutableList<String> = mutableListOf(),
var memberRules: ArrayList<MemberRulesData> = arrayListOf(), var memberRules: MutableList<MemberRulesData> = mutableListOf(),
var fieldRules: ArrayList<FieldRulesData> = arrayListOf(), var fieldRules: MutableList<FieldRulesData> = mutableListOf(),
var methodRules: ArrayList<MethodRulesData> = arrayListOf(), var methodRules: MutableList<MethodRulesData> = mutableListOf(),
var constroctorRules: ArrayList<ConstructorRulesData> = arrayListOf() var constroctorRules: MutableList<ConstructorRulesData> = mutableListOf()
) : BaseRulesData() { ) : BaseRulesData() {
/** /**

View File

@@ -103,7 +103,7 @@ class ConstructorRules internal constructor(private val rulesData: ConstructorRu
fun param(vararg paramType: Any) { fun param(vararg paramType: Any) {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead") if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes = rulesData.paramTypes =
arrayListOf<Class<*>>().apply { paramType.forEach { add(it.compat(tag = "Constructor") ?: UndefinedType) } }.toTypedArray() mutableListOf<Class<*>>().apply { paramType.forEach { add(it.compat(tag = "Constructor") ?: UndefinedType) } }.toTypedArray()
} }
/** /**

View File

@@ -129,7 +129,7 @@ class MethodRules internal constructor(private val rulesData: MethodRulesData) :
fun param(vararg paramType: Any) { fun param(vararg paramType: Any) {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead") if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes = rulesData.paramTypes =
arrayListOf<Class<*>>().apply { paramType.forEach { add(it.compat(tag = "Method") ?: UndefinedType) } }.toTypedArray() mutableListOf<Class<*>>().apply { paramType.forEach { add(it.compat(tag = "Method") ?: UndefinedType) } }.toTypedArray()
} }
/** /**

View File

@@ -124,7 +124,7 @@ class ConstructorFinder internal constructor(override val classSet: Class<*>? =
*/ */
fun param(vararg paramType: Any): IndexTypeCondition { fun param(vararg paramType: Any): IndexTypeCondition {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead") if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes = arrayListOf<Class<*>>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray() rulesData.paramTypes = mutableListOf<Class<*>>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
return IndexTypeCondition(IndexConfigType.MATCH) return IndexTypeCondition(IndexConfigType.MATCH)
} }

View File

@@ -154,7 +154,7 @@ class MethodFinder internal constructor(override val classSet: Class<*>? = null)
*/ */
fun param(vararg paramType: Any): IndexTypeCondition { fun param(vararg paramType: Any): IndexTypeCondition {
if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead") if (paramType.isEmpty()) error("paramTypes is empty, please use emptyParam() instead")
rulesData.paramTypes = arrayListOf<Class<*>>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray() rulesData.paramTypes = mutableListOf<Class<*>>().apply { paramType.forEach { add(it.compat() ?: UndefinedType) } }.toTypedArray()
return IndexTypeCondition(IndexConfigType.MATCH) return IndexTypeCondition(IndexConfigType.MATCH)
} }

View File

@@ -85,10 +85,10 @@ internal object ReflectionTool {
private object MemoryCache { private object MemoryCache {
/** 缓存的 [Class] 列表数组 */ /** 缓存的 [Class] 列表数组 */
val dexClassListData = HashMap<String, List<String>>() val dexClassListData = mutableMapOf<String, List<String>>()
/** 缓存的 [Class] 对象数组 */ /** 缓存的 [Class] 对象数组 */
val classData = HashMap<String, Class<*>?>() val classData = mutableMapOf<String, Class<*>?>()
} }
/** /**
@@ -660,7 +660,7 @@ internal object ReflectionTool {
*/ */
private val Class<*>.existMembers private val Class<*>.existMembers
get() = runCatching { get() = runCatching {
arrayListOf<Member>().apply { mutableListOf<Member>().apply {
addAll(declaredFields.toList()) addAll(declaredFields.toList())
addAll(declaredMethods.toList()) addAll(declaredMethods.toList())
addAll(declaredConstructors.toList()) addAll(declaredConstructors.toList())

View File

@@ -96,10 +96,10 @@ internal inline fun <T> T.conditions(initiate: Conditions<T>.() -> Unit) = Condi
internal class Conditions<T>(internal var value: T) { internal class Conditions<T>(internal var value: T) {
/** 全部判断条件数组 (与) */ /** 全部判断条件数组 (与) */
private val andConditions = ArrayList<Boolean>() private val andConditions = mutableListOf<Boolean>()
/** 全部判断条件数组 (或) */ /** 全部判断条件数组 (或) */
private val optConditions = ArrayList<Boolean>() private val optConditions = mutableListOf<Boolean>()
/** /**
* 添加与 (and) 条件 * 添加与 (and) 条件