plusone/plusone-commons
1
1
Fork 1
Code Issues Pull Requests Projects Releases 5 Activity

refactor: 优化 OptionalTools 代码

Browse Source
This commit is contained in:
zhouxy108 2025-04-09 22:11:21 +08:00
parent 7abd3a05ab
commit 56a4a606a6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
View File

@ -64,7 +64,7 @@ public class OptionalTools {
* @return {@link OptionalInt} 实例 * @return {@link OptionalInt} 实例
*/ */
public static OptionalInt toOptionalInt(Optional<Integer> optionalObj) { 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} 实例 * @return {@link OptionalLong} 实例
*/ */
public static OptionalLong toOptionalLong(Optional<Long> optionalObj) { 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} 实例 * @return {@link OptionalDouble} 实例
*/ */
public static OptionalDouble toOptionalDouble(Optional<Double> optionalObj) { 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}. * @return the value of the optional object if present, otherwise {@code null}.
*/ */
@Beta @Beta
@Nullable
public static <T> T orElseNull(Optional<T> optionalObj) { public static <T> T orElseNull(Optional<T> optionalObj) {
return optionalObj.orElse(null); return optionalObj.orElse(null);
} }
@ -141,6 +142,7 @@ public class OptionalTools {
* @return {@link Integer} 对象。如果 {@code OptionalInt} 的值缺失，返回 {@code null}。 * @return {@link Integer} 对象。如果 {@code OptionalInt} 的值缺失，返回 {@code null}。
*/ */
@Beta @Beta
@Nullable
public static Integer toInteger(OptionalInt optionalObj) { public static Integer toInteger(OptionalInt optionalObj) {
return optionalObj.isPresent() ? optionalObj.getAsInt() : null; return optionalObj.isPresent() ? optionalObj.getAsInt() : null;
} }
@ -152,6 +154,7 @@ public class OptionalTools {
* @return {@link Long} 对象。如果 {@code OptionalLong} 的值缺失，返回 {@code null}。 * @return {@link Long} 对象。如果 {@code OptionalLong} 的值缺失，返回 {@code null}。
*/ */
@Beta @Beta
@Nullable
public static Long toLong(OptionalLong optionalObj) { public static Long toLong(OptionalLong optionalObj) {
return optionalObj.isPresent() ? optionalObj.getAsLong() : null; return optionalObj.isPresent() ? optionalObj.getAsLong() : null;
} }
@ -163,6 +166,7 @@ public class OptionalTools {
* @return {@link Double} 对象。如果 {@code OptionalDouble} 的值缺失，返回 {@code null}。 * @return {@link Double} 对象。如果 {@code OptionalDouble} 的值缺失，返回 {@code null}。
*/ */
@Beta @Beta
@Nullable
public static Double toDouble(OptionalDouble optionalObj) { public static Double toDouble(OptionalDouble optionalObj) {
return optionalObj.isPresent() ? optionalObj.getAsDouble() : null; return optionalObj.isPresent() ? optionalObj.getAsDouble() : null;
} }