From 44a45a7d049fc073eb5b35fe89e09af09030d79a Mon Sep 17 00:00:00 2001 From: "super.xie" Date: Fri, 20 Aug 2021 01:26:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=8D=E7=94=A8=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java index cdf88321f..64f9040e4 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ObjectUtil.java @@ -217,7 +217,7 @@ public class ObjectUtil { */ public static boolean isNotNull(Object obj) { //noinspection ConstantConditions - return null != obj && false == obj.equals(null); + return false == isNull(obj); } /** From 8180674d21e56261a070d94d1ea98cf332f6f5f3 Mon Sep 17 00:00:00 2001 From: "super.xie" Date: Fri, 20 Aug 2021 01:28:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AF=BC=E5=85=A5=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/comparator/FieldsComparator.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java index ff20eb628..6e21c6d1a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/FieldsComparator.java @@ -1,13 +1,9 @@ package cn.hutool.core.comparator; import cn.hutool.core.util.ClassUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import java.io.Serializable; import java.lang.reflect.Field; -import java.util.Comparator; /** * Bean字段排序器