From c1fe5e83574943c258ce52accd0be5c3b9e9df6b Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Sat, 26 Jun 2021 11:58:27 +0800 Subject: [PATCH] =?UTF-8?q?perf[array]:=20=E5=B0=86CollectionUtils?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E7=BB=84=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=96=B9=E6=B3=95=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0ArrayUtils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/dispatcher/manager/PacketBus.java | 4 ++-- .../java/com/zfoo/orm/model/vo/EntityDef.java | 4 ++-- .../zfoo/protocol/collection/ArrayUtils.java | 2 +- .../protocol/collection/CollectionUtils.java | 8 ------- .../registration/ProtocolAnalysis.java | 3 +-- .../com/zfoo/protocol/util/FileUtils.java | 4 ++-- .../com/zfoo/protocol/util/StringUtils.java | 4 ++-- .../java/com/zfoo/util/math/NumberUtils.java | 22 +++++++++---------- 8 files changed, 21 insertions(+), 30 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/dispatcher/manager/PacketBus.java b/net/src/main/java/com/zfoo/net/dispatcher/manager/PacketBus.java index 2a0b6d0f..a40a1622 100644 --- a/net/src/main/java/com/zfoo/net/dispatcher/manager/PacketBus.java +++ b/net/src/main/java/com/zfoo/net/dispatcher/manager/PacketBus.java @@ -11,7 +11,7 @@ import com.zfoo.net.packet.service.PacketService; import com.zfoo.net.session.model.Session; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; -import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; @@ -58,7 +58,7 @@ public abstract class PacketBus { var methods = ReflectionUtils.getMethodsByAnnoInPOJOClass(clazz, PacketReceiver.class); - if (CollectionUtils.isNotEmpty(methods) && !ReflectionUtils.isPojoClass(clazz)) { + if (ArrayUtils.isNotEmpty(methods) && !ReflectionUtils.isPojoClass(clazz)) { logger.warn("消息注册类不是POJO类，父类的不会被扫描到"); } diff --git a/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java b/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java index fa9b5b87..57979ee4 100644 --- a/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java +++ b/orm/src/main/java/com/zfoo/orm/model/vo/EntityDef.java @@ -20,7 +20,7 @@ import com.zfoo.orm.model.anno.IndexText; import com.zfoo.orm.model.config.CacheStrategy; import com.zfoo.orm.model.config.PersisterStrategy; import com.zfoo.orm.model.entity.IEntity; -import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; @@ -79,7 +79,7 @@ public class EntityDef { entityDef.expireMillisecond = cacheStrategy.getExpireMillisecond(); var idFields = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Id.class); - AssertionUtils.isTrue(CollectionUtils.isNotEmpty(idFields) && idFields.length == 1, "实体类Entity[{}]必须只有且仅有一个Id注解", clazz.getSimpleName()); + AssertionUtils.isTrue(ArrayUtils.isNotEmpty(idFields) && idFields.length == 1, "实体类Entity[{}]必须只有且仅有一个Id注解", clazz.getSimpleName()); entityDef.idField = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Id.class)[0]; ReflectionUtils.makeAccessible(entityDef.idField); // idField必须用private修饰 diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayUtils.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayUtils.java index 08bf85e5..389a2d72 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayUtils.java @@ -235,7 +235,7 @@ public abstract class ArrayUtils { } public static List toList(T[] array) { - if (CollectionUtils.isEmpty(array)) { + if (ArrayUtils.isEmpty(array)) { return Collections.emptyList(); } return Arrays.asList(array); diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/CollectionUtils.java b/protocol/src/main/java/com/zfoo/protocol/collection/CollectionUtils.java index 738b2dfe..e811b464 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/CollectionUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/CollectionUtils.java @@ -40,14 +40,6 @@ public abstract class CollectionUtils { return !isEmpty(collection); } - public static boolean isEmpty(Object[] array) { - return (array == null || array.length == 0); - } - - public static boolean isNotEmpty(Object[] array) { - return !isEmpty(array); - } - /** * Return {@code true} if the supplied Map is {@code null} or empty. * Otherwise, return {@code false}. diff --git a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java index 39e0e2b1..70cd2311 100644 --- a/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java +++ b/protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java @@ -15,7 +15,6 @@ package com.zfoo.protocol.registration; import com.zfoo.protocol.IPacket; import com.zfoo.protocol.ProtocolManager; import com.zfoo.protocol.collection.ArrayUtils; -import com.zfoo.protocol.collection.CollectionUtils; import com.zfoo.protocol.exception.RunException; import com.zfoo.protocol.exception.UnknownException; import com.zfoo.protocol.generate.GenerateOperation; @@ -235,7 +234,7 @@ public class ProtocolAnalysis { // 是否实现了IPacket接口 AssertionUtils.isTrue(IPacket.class.isAssignableFrom(clazz), "[class:{}]没有实现接口[IPacket:{}]", clazz.getCanonicalName(), IPacket.class.getCanonicalName()); // 不能是泛型类 - AssertionUtils.isTrue(CollectionUtils.isEmpty(clazz.getTypeParameters()), "[class:{}]不能是泛型类", clazz.getCanonicalName()); + AssertionUtils.isTrue(ArrayUtils.isEmpty(clazz.getTypeParameters()), "[class:{}]不能是泛型类", clazz.getCanonicalName()); Field protocolIdField; try { diff --git a/protocol/src/main/java/com/zfoo/protocol/util/FileUtils.java b/protocol/src/main/java/com/zfoo/protocol/util/FileUtils.java index 68ad2732..64d323c1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/util/FileUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/util/FileUtils.java @@ -12,7 +12,7 @@ package com.zfoo.protocol.util; -import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.collection.ArrayUtils; import java.io.*; import java.nio.channels.FileChannel; @@ -80,7 +80,7 @@ public abstract class FileUtils { } if (file.isDirectory()) { var files = file.listFiles(); - if (CollectionUtils.isEmpty(files)) { + if (ArrayUtils.isEmpty(files)) { return null; } diff --git a/protocol/src/main/java/com/zfoo/protocol/util/StringUtils.java b/protocol/src/main/java/com/zfoo/protocol/util/StringUtils.java index 83b7a79c..d7ef641c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/util/StringUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/util/StringUtils.java @@ -12,7 +12,7 @@ package com.zfoo.protocol.util; -import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.collection.ArrayUtils; import java.nio.charset.Charset; import java.util.Arrays; @@ -430,7 +430,7 @@ public abstract class StringUtils { * @return 结果 */ public static String format(final String template, final Object... args) { - if (isBlank(template) || CollectionUtils.isEmpty(args)) { + if (isBlank(template) || ArrayUtils.isEmpty(args)) { return template; } diff --git a/util/src/main/java/com/zfoo/util/math/NumberUtils.java b/util/src/main/java/com/zfoo/util/math/NumberUtils.java index f5c1bcd8..d188f2c7 100644 --- a/util/src/main/java/com/zfoo/util/math/NumberUtils.java +++ b/util/src/main/java/com/zfoo/util/math/NumberUtils.java @@ -13,7 +13,7 @@ package com.zfoo.util.math; -import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.collection.ArrayUtils; import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.StringUtils; @@ -54,7 +54,7 @@ public abstract class NumberUtils { * @return 和 */ public static BigDecimal add(Number... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -77,7 +77,7 @@ public abstract class NumberUtils { * @return 求和 */ public static BigDecimal add(String... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -100,7 +100,7 @@ public abstract class NumberUtils { * @return 求和 */ public static BigDecimal add(BigDecimal... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -124,7 +124,7 @@ public abstract class NumberUtils { * @return 差 */ public static BigDecimal sub(Number... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -147,7 +147,7 @@ public abstract class NumberUtils { * @return 差 */ public static BigDecimal sub(String... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -170,7 +170,7 @@ public abstract class NumberUtils { * @return 差 */ public static BigDecimal sub(BigDecimal... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -194,7 +194,7 @@ public abstract class NumberUtils { * @return 积 */ public static BigDecimal mul(Number... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -228,7 +228,7 @@ public abstract class NumberUtils { * @return 积 */ public static BigDecimal mul(String... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -251,7 +251,7 @@ public abstract class NumberUtils { * @return 积 */ public static BigDecimal mul(BigDecimal... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; } @@ -368,7 +368,7 @@ public abstract class NumberUtils { * @return 积 */ public static BigDecimal div(BigDecimal... values) { - if (CollectionUtils.isEmpty(values)) { + if (ArrayUtils.isEmpty(values)) { return BigDecimal.ZERO; }