From c6e861e5cff9a173885fb44e9db7d052e02c2153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=88=9F?= Date: Thu, 15 Dec 2022 09:42:02 +0800 Subject: [PATCH] refactor: move fastListOf method out of CollectionTool --- .../alibaba/testable/agent/handler/MockClassHandler.java | 2 +- .../alibaba/testable/agent/util/AnnotationUtilTest.java | 2 +- .../com/alibaba/testable/core/tool/CollectionTool.java | 9 --------- .../com/alibaba/testable/core/util/CollectionUtil.java | 9 +++++++++ .../alibaba/testable/core/util/CollectionUtilTest.java | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/MockClassHandler.java b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/MockClassHandler.java index 0991dd2..505bde9 100644 --- a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/MockClassHandler.java +++ b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/MockClassHandler.java @@ -18,7 +18,7 @@ import static com.alibaba.testable.agent.constant.ByteCodeConst.TYPE_CLASS; import static com.alibaba.testable.agent.constant.ConstPool.*; import static com.alibaba.testable.agent.util.MockInvokeUtil.*; import static com.alibaba.testable.core.constant.ConstPool.CONSTRUCTOR; -import static com.alibaba.testable.core.tool.CollectionTool.fastListOf; +import static com.alibaba.testable.core.util.CollectionUtil.fastListOf; /** * @author flin diff --git a/testable-agent/src/test/java/com/alibaba/testable/agent/util/AnnotationUtilTest.java b/testable-agent/src/test/java/com/alibaba/testable/agent/util/AnnotationUtilTest.java index b9765a4..04b9dfc 100644 --- a/testable-agent/src/test/java/com/alibaba/testable/agent/util/AnnotationUtilTest.java +++ b/testable-agent/src/test/java/com/alibaba/testable/agent/util/AnnotationUtilTest.java @@ -3,7 +3,7 @@ package com.alibaba.testable.agent.util; import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.AnnotationNode; -import static com.alibaba.testable.core.tool.CollectionTool.fastListOf; +import static com.alibaba.testable.core.util.CollectionUtil.fastListOf; import static org.junit.jupiter.api.Assertions.*; class AnnotationUtilTest { diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/CollectionTool.java b/testable-core/src/main/java/com/alibaba/testable/core/tool/CollectionTool.java index 148aacb..080a18d 100644 --- a/testable-core/src/main/java/com/alibaba/testable/core/tool/CollectionTool.java +++ b/testable-core/src/main/java/com/alibaba/testable/core/tool/CollectionTool.java @@ -41,15 +41,6 @@ public class CollectionTool { return items; } - /** - * Create an immutable list - * @param items elements to add - * @return list of the provided items - */ - public static List fastListOf(T... items) { - return Arrays.asList(items); - } - /** * Create a mutable list * @param items elements to add diff --git a/testable-core/src/main/java/com/alibaba/testable/core/util/CollectionUtil.java b/testable-core/src/main/java/com/alibaba/testable/core/util/CollectionUtil.java index ca5b0fd..1d1190b 100644 --- a/testable-core/src/main/java/com/alibaba/testable/core/util/CollectionUtil.java +++ b/testable-core/src/main/java/com/alibaba/testable/core/util/CollectionUtil.java @@ -52,4 +52,13 @@ public class CollectionUtil { return false; } + /** + * Create an immutable list + * @param items elements to add + * @return list of the provided items + */ + public static List fastListOf(T... items) { + return Arrays.asList(items); + } + } diff --git a/testable-core/src/test/java/com/alibaba/testable/core/util/CollectionUtilTest.java b/testable-core/src/test/java/com/alibaba/testable/core/util/CollectionUtilTest.java index e2fe346..6be5633 100644 --- a/testable-core/src/test/java/com/alibaba/testable/core/util/CollectionUtilTest.java +++ b/testable-core/src/test/java/com/alibaba/testable/core/util/CollectionUtilTest.java @@ -2,7 +2,7 @@ package com.alibaba.testable.core.util; import org.junit.jupiter.api.Test; -import static com.alibaba.testable.core.tool.CollectionTool.fastListOf; +import static com.alibaba.testable.core.util.CollectionUtil.fastListOf; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue;