From 2a343379525446d6597320b393f07f5c3c138bea Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 28 Jun 2022 16:34:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CharSequence=E4=BF=AE=E6=AD=A3=E4=B8=BA?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/lang/Opt.java | 8 ++------ .../src/test/java/cn/hutool/core/lang/OptTest.java | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 8616ca7a5..60e3c7d52 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -28,11 +28,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.text.StrUtil; -import java.util.Objects; -import java.util.Optional; -import java.util.Collection; -import java.util.Collections; -import java.util.NoSuchElementException; +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; @@ -94,7 +90,7 @@ public class Opt { * @param value 传入需要包裹的元素 * @return 一个包裹里元素可能为空，或者为空字符串的 {@code Opt} */ - public static Opt ofBlankAble(final CharSequence value) { + public static Opt ofBlankAble(final T value) { return StrUtil.isBlank(value) ? empty() : new Opt<>(value); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java index cff243336..f4c9fe43f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java @@ -8,13 +8,7 @@ import lombok.NoArgsConstructor; import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; +import java.util.*; import java.util.stream.Stream; /** @@ -27,7 +21,7 @@ public class OptTest { @Test public void ofBlankAbleTest() { // ofBlankAble相对于ofNullable考虑了字符串为空串的情况 - final CharSequence hutool = Opt.ofBlankAble("").orElse("hutool"); + final String hutool = Opt.ofBlankAble("").orElse("hutool"); Assert.assertEquals("hutool", hutool); } From 7c5ec4160a48cb7e937b94906d579877509ad49a Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 28 Jun 2022 16:36:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?CharSequence=E4=BF=AE=E6=AD=A3=E4=B8=BA?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/lang/Opt.java | 2 +- hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 8616ca7a5..e15d1c7be 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -94,7 +94,7 @@ public class Opt { * @param value 传入需要包裹的元素 * @return 一个包裹里元素可能为空，或者为空字符串的 {@code Opt} */ - public static Opt ofBlankAble(final CharSequence value) { + public static Opt ofBlankAble(final T value) { return StrUtil.isBlank(value) ? empty() : new Opt<>(value); } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java index cff243336..ff3d4ace6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java @@ -27,7 +27,7 @@ public class OptTest { @Test public void ofBlankAbleTest() { // ofBlankAble相对于ofNullable考虑了字符串为空串的情况 - final CharSequence hutool = Opt.ofBlankAble("").orElse("hutool"); + final String hutool = Opt.ofBlankAble("").orElse("hutool"); Assert.assertEquals("hutool", hutool); } From 57cf8264c941f60037af29a398664777e3d38e62 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Tue, 28 Jun 2022 16:40:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=89=81=E5=B9=B3?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/lang/Opt.java | 6 +++++- .../src/test/java/cn/hutool/core/lang/OptTest.java | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java index 60e3c7d52..e15d1c7be 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Opt.java @@ -28,7 +28,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.text.StrUtil; -import java.util.*; +import java.util.Objects; +import java.util.Optional; +import java.util.Collection; +import java.util.Collections; +import java.util.NoSuchElementException; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java index f4c9fe43f..ff3d4ace6 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java @@ -8,7 +8,13 @@ import lombok.NoArgsConstructor; import org.junit.Assert; import org.junit.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; import java.util.stream.Stream; /**