From 1361e1159263cee052205489d1cced0288bbea67 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Tue, 30 Aug 2022 21:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86ObjUtil.defaultIfNull=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=BB=8EObject?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=B3=9B=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/hutool/core/util/ObjUtil.java       | 9 ++++++---
 .../src/test/java/cn/hutool/core/util/ObjUtilTest.java   | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
index 18bbdc7f6..3d88ceb10 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjUtil.java
@@ -13,7 +13,11 @@ import cn.hutool.core.text.StrUtil;
 
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -305,8 +309,7 @@ public class ObjUtil {
 	 * @return 处理后的返回值
 	 * @since 6.0.0
 	 */
-	public static <T, R> R defaultIfNull(
-		final T source, final Function<? super T, ? extends R> handler, final Supplier<? extends R> defaultSupplier) {
+	public static <T, R> R defaultIfNull(final T source, final Function<? super T, ? extends R> handler, final Supplier<? extends R> defaultSupplier) {
 		if (isNotNull(source)) {
 			return handler.apply(source);
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java
index 2b41568ba..dd920ee8b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ObjUtilTest.java
@@ -82,7 +82,7 @@ public class ObjUtilTest {
 		public Obj clone() {
 			try {
 				return (Obj) super.clone();
-			} catch (CloneNotSupportedException e) {
+			} catch (final CloneNotSupportedException e) {
 				throw new CloneRuntimeException(e);
 			}
 		}
@@ -122,7 +122,7 @@ public class ObjUtilTest {
 
 	@Test
 	public void cloneIfPossibleTest() {
-		String a = "a";
+		final String a = "a";
 		final String a2 = ObjUtil.cloneIfPossible(a);
 		Assert.assertNotSame(a, a2);
 	}