From fc8bd64f34d7e34d25144051b1161363a2d31477 Mon Sep 17 00:00:00 2001 From: SungbinYang Date: Mon, 30 Sep 2024 18:06:24 +0900 Subject: [PATCH] Simplify ObjectUtils#unwrapOptional This commit replaces optional.isEmpty() and optional.get() with optional.orElse(null) for better efficiency and readability. Closes gh-33612 --- .../src/main/java/org/springframework/util/ObjectUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java index 06dd448d76..eaf97d9a61 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -173,10 +173,7 @@ public abstract class ObjectUtils { @Nullable public static Object unwrapOptional(@Nullable Object obj) { if (obj instanceof Optional optional) { - if (optional.isEmpty()) { - return null; - } - Object result = optional.get(); + Object result = optional.orElse(null); Assert.isTrue(!(result instanceof Optional), "Multi-level Optional usage not supported"); return result; }