From bcc5bc6d6c94768cb6db29918569d5bba66a2624 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Fri, 15 Dec 2023 22:00:15 +0800
Subject: [PATCH] =?UTF-8?q?Opt.ofEmptyAble=E6=94=AF=E6=8C=81=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/hutool/core/lang/Opt.java     | 6 +++---
 .../src/test/java/org/dromara/hutool/core/lang/OptTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
index bfa1c8a99..92a111cda 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Opt.java
@@ -11,10 +11,10 @@
  */
 package org.dromara.hutool.core.lang;
 
-import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.func.SerSupplier;
 import org.dromara.hutool.core.stream.EasyStream;
 import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.util.ObjUtil;
 
 import java.util.Collection;
 import java.util.NoSuchElementException;
@@ -93,12 +93,12 @@ public class Opt<T> {
 	 *
 	 * @param <T>   包裹里元素的类型
 	 * @param <R>   集合值类型
-	 * @param value 传入需要包裹的元素
+	 * @param value 传入需要包裹的元素，支持CharSequence、Map、Iterable、Iterator、Array类型
 	 * @return 一个包裹里元素可能为空的 {@code Opt}
 	 * @since 5.7.17
 	 */
 	public static <T, R extends Collection<T>> Opt<R> ofEmptyAble(final R value) {
-		return CollUtil.isEmpty(value) || CollUtil.getFirstNoneNull(value) == null ? empty() : new Opt<>(value);
+		return ObjUtil.isEmpty(value) ? empty() : new Opt<>(value);
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java
index 7385cccb7..41ce9123b 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/OptTest.java
@@ -168,7 +168,7 @@ public class OptTest {
 		final List<String> hutool = Opt.ofEmptyAble(Collections.<String>emptyList()).orElseGet(() -> Collections.singletonList("hutool"));
 		Assertions.assertEquals(past, hutool);
 		Assertions.assertEquals(Collections.singletonList("hutool"), hutool);
-		Assertions.assertTrue(Opt.ofEmptyAble(Arrays.asList(null, null, null)).isEmpty());
+		Assertions.assertFalse(Opt.ofEmptyAble(Arrays.asList(null, null, null)).isEmpty());
 	}
 
 	@SuppressWarnings({"MismatchedQueryAndUpdateOfCollection", "ConstantConditions"})