From 647128a02c0589d8389248c866ee63628a02ec5c Mon Sep 17 00:00:00 2001 From: JohnSimith <873764691@qq.com> Date: Tue, 1 Aug 2023 10:36:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8E=BB=E9=99=A4=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E5=A4=9A=E4=BD=99toString=E7=9A=84=E5=A4=9A=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/hutool/core/array/ArrayUtil.java | 3 +- .../hutool/core/array/ArrayWrapper.java | 32 +------------------ 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java index 631ca9b85..26969336e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java @@ -1299,10 +1299,9 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @return 数组字符串,与集合转字符串格式相同 */ public static String toString(final Object obj) { - if (null == obj) { + if (Objects.isNull(obj)) { return null; } - if (obj instanceof long[]) { return Arrays.toString((long[]) obj); } else if (obj instanceof int[]) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java index 3726e51bb..1223329d1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java @@ -569,37 +569,7 @@ public class ArrayWrapper implements Wrapper, Iterable { @Override public String toString() { - final A array = this.array; - if (null == array) { - return null; - } - - if (array instanceof long[]) { - return Arrays.toString((long[]) array); - } else if (array instanceof int[]) { - return Arrays.toString((int[]) array); - } else if (array instanceof short[]) { - return Arrays.toString((short[]) array); - } else if (array instanceof char[]) { - return Arrays.toString((char[]) array); - } else if (array instanceof byte[]) { - return Arrays.toString((byte[]) array); - } else if (array instanceof boolean[]) { - return Arrays.toString((boolean[]) array); - } else if (array instanceof float[]) { - return Arrays.toString((float[]) array); - } else if (array instanceof double[]) { - return Arrays.toString((double[]) array); - } else if (ArrayUtil.isArray(array)) { - // 对象数组 - try { - return Arrays.deepToString((Object[]) array); - } catch (final Exception ignore) { - //ignore - } - } - - return array.toString(); + return ArrayUtil.toString(this.array); } // region ----- private methods