From 56a4a606a6edc88e6b7f20ebdead530789eca572 Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Wed, 9 Apr 2025 22:11:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=20`OptionalTools?=
 =?UTF-8?q?`=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xyz/zhouxy/plusone/commons/util/OptionalTools.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
index 397f4df..50b7a83 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
@@ -64,7 +64,7 @@ public class OptionalTools {
      * @return {@link OptionalInt} 实例
      */
     public static OptionalInt toOptionalInt(Optional<Integer> optionalObj) {
-        return optionalObj.isPresent() ? OptionalInt.of(optionalObj.get()) : OptionalInt.empty();
+        return optionalObj.map(OptionalInt::of).orElseGet(OptionalInt::empty);
     }
 
     /**
@@ -91,7 +91,7 @@ public class OptionalTools {
      * @return {@link OptionalLong} 实例
      */
     public static OptionalLong toOptionalLong(Optional<Long> optionalObj) {
-        return optionalObj.isPresent() ? OptionalLong.of(optionalObj.get()) : OptionalLong.empty();
+        return optionalObj.map(OptionalLong::of).orElseGet(OptionalLong::empty);
     }
 
     /**
@@ -118,7 +118,7 @@ public class OptionalTools {
      * @return {@link OptionalDouble} 实例
      */
     public static OptionalDouble toOptionalDouble(Optional<Double> optionalObj) {
-        return optionalObj.isPresent() ? OptionalDouble.of(optionalObj.get()) : OptionalDouble.empty();
+        return optionalObj.map(OptionalDouble::of).orElseGet(OptionalDouble::empty);
     }
 
     /**
@@ -130,6 +130,7 @@ public class OptionalTools {
      * @return the value of the optional object if present, otherwise {@code null}.
      */
     @Beta
+    @Nullable
     public static <T> T orElseNull(Optional<T> optionalObj) {
         return optionalObj.orElse(null);
     }
@@ -141,6 +142,7 @@ public class OptionalTools {
      * @return {@link Integer} 对象。如果 {@code OptionalInt} 的值缺失，返回 {@code null}。
      */
     @Beta
+    @Nullable
     public static Integer toInteger(OptionalInt optionalObj) {
         return optionalObj.isPresent() ? optionalObj.getAsInt() : null;
     }
@@ -152,6 +154,7 @@ public class OptionalTools {
      * @return {@link Long} 对象。如果 {@code OptionalLong} 的值缺失，返回 {@code null}。
      */
     @Beta
+    @Nullable
     public static Long toLong(OptionalLong optionalObj) {
         return optionalObj.isPresent() ? optionalObj.getAsLong() : null;
     }
@@ -163,6 +166,7 @@ public class OptionalTools {
      * @return {@link Double} 对象。如果 {@code OptionalDouble} 的值缺失，返回 {@code null}。
      */
     @Beta
+    @Nullable
     public static Double toDouble(OptionalDouble optionalObj) {
         return optionalObj.isPresent() ? optionalObj.getAsDouble() : null;
     }