From 564131291051ebd21a1055fea2679241e38affe1 Mon Sep 17 00:00:00 2001 From: emeroad Date: Fri, 25 Aug 2023 16:06:25 +0900 Subject: [PATCH] [#noissue] Cleanup --- .../navercorp/pinpoint/common/util/BytesUtils.java | 13 +++++++++---- .../navercorp/pinpoint/common/util/StringUtils.java | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/BytesUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/BytesUtils.java index 652929958161..8e5e62d4626a 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/BytesUtils.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/BytesUtils.java @@ -529,10 +529,7 @@ public static byte[] concat(final byte[]... arrays) { if (arrays == null) { throw new NullPointerException("arrays"); } - int totalLength = 0; - for (byte[] array : arrays) { - totalLength += array.length; - } + final int totalLength = getTotalLength(arrays); byte[] result = new byte[totalLength]; @@ -545,6 +542,14 @@ public static byte[] concat(final byte[]... arrays) { return result; } + private static int getTotalLength(byte[][] arrays) { + int totalLength = 0; + for (byte[] array : arrays) { + totalLength += array.length; + } + return totalLength; + } + public static byte[] concat(final byte[] b1, final byte[] b2) { if (b1 == null) { diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java index ad76869f7c58..66e47c1d0555 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/StringUtils.java @@ -46,7 +46,7 @@ public static boolean isEmpty(final String string) { } public static boolean hasLength(final String string) { - return string != null && string.length() > 0; + return string != null && !string.isEmpty(); } public static boolean hasText(String string) { @@ -63,11 +63,11 @@ public static boolean hasText(String string) { return false; } - public static int getLength(final String string) { + public static int getLength(final String string) { return getLength(string, 0); } - public static int getLength(final String string, final int nullValue) { + public static int getLength(final String string, final int nullValue) { if (string == null) { return nullValue; } @@ -189,7 +189,7 @@ public static List tokenizeToStringList(final String str, final String d if (trimTokens) { token = token.trim(); } - if (!ignoreEmptyTokens || token.length() > 0) { + if (!ignoreEmptyTokens || !token.isEmpty()) { tokens.add(token); } }