From 127c6902bf06b8fdc48fa81034face3a9609da17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=9B=AA=E5=89=91=E8=BE=B0?= <1107047387@qq.com>
Date: Thu, 22 Feb 2024 11:39:23 +0000
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=88=A4=E6=96=AD=E7=A9=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 夜雪剑辰 <1107047387@qq.com>
---
 .../java/com/yexuejc/base/util/StrUtil.java   | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/yexuejc/base/util/StrUtil.java b/src/main/java/com/yexuejc/base/util/StrUtil.java
index 359d0e0..81bbf6a 100644
--- a/src/main/java/com/yexuejc/base/util/StrUtil.java
+++ b/src/main/java/com/yexuejc/base/util/StrUtil.java
@@ -1,8 +1,7 @@
 package com.yexuejc.base.util;
 
 import java.io.UnsupportedEncodingException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
+import java.lang.reflect.Array;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -11,9 +10,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Random;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -33,36 +32,25 @@ public final class StrUtil {
     private static char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
     /**
-     * 判断字符串，数组，集合 是否为空
+     * 判断字符串，数组，集合 是否为空(null，""，[],{})
      *
-     * @param obj
+     * @param obj 対象
+     * @return true:空;false:非空
      * @return
      */
     public static boolean isEmpty(Object obj) {
-        if (obj instanceof String) {
-            if (obj == null || "".equals((String) obj)) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if (obj instanceof Object[]) {
-            if (obj == null || ((Object[]) obj).length == 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if (obj instanceof Collection<?>) {
-            if (obj == null || ((Collection<?>) obj).size() == 0) {
-                return true;
-            } else {
-                return false;
-            }
+        if (obj == null) {
+            return true;
+        } else if (obj instanceof Optional) {
+            return ((Optional<?>) obj).isEmpty();
+        } else if (obj instanceof CharSequence) {
+            return ((CharSequence) obj).length() == 0;
+        } else if (obj.getClass().isArray()) {
+            return Array.getLength(obj) == 0;
+        } else if (obj instanceof Collection) {
+            return ((Collection<?>) obj).isEmpty();
         } else {
-            if (obj == null) {
-                return true;
-            } else {
-                return false;
-            }
+            return obj instanceof Map && ((Map<?, ?>) obj).isEmpty();
         }
     }