From 3c13da55153acbfd471e1705c781ba1a5b5b7dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=B3=E9=95=BF=E5=A4=A7=E7=9A=84=E7=AC=A8=E5=B0=8F?= =?UTF-8?q?=E5=AD=A9?= <276584041@qq.com> Date: Sat, 25 Mar 2023 10:00:44 +0000 Subject: [PATCH] =?UTF-8?q?!1=20NullComparator=20=E6=AF=94=E8=BE=83?= =?UTF-8?q?=E5=99=A8bug=E4=BF=AE=E5=A4=8D=20*=201.=20=E5=BD=93=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20new=20PropertyComparator("endTime",=20false)=20?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8A=8Anull=E5=80=BC=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E5=90=8E=EF=BC=8C=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/comparator/FuncComparator.java | 2 +- .../main/java/cn/hutool/core/comparator/NullComparator.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java index 78ea09840..ea32bba95 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/FuncComparator.java @@ -53,7 +53,7 @@ public class FuncComparator extends NullComparator { */ @SuppressWarnings({"rawtypes", "unchecked"}) private int compare(T o1, T o2, Comparable v1, Comparable v2) { - int result = ObjectUtil.compare(v1, v2); + int result = ObjectUtil.compare(v1, v2, this.nullGreater); if (0 == result) { //避免TreeSet / TreeMap 过滤掉排序字段相同但是对象不相同的情况 result = CompareUtil.compare(o1, o2, this.nullGreater); diff --git a/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java b/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java index 7f3544d27..c2a3a192b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java +++ b/hutool-core/src/main/java/cn/hutool/core/comparator/NullComparator.java @@ -51,11 +51,6 @@ public class NullComparator implements Comparator, Serializable { return new NullComparator<>(nullGreater, comparator == null ? other : comparator.thenComparing(other)); } - @Override - public Comparator reversed() { - return new NullComparator<>((false == nullGreater), comparator == null ? null : comparator.reversed()); - } - /** * 不检查{@code null}的比较方法
* 用户可自行重写此方法自定义比较方式