From fdffcbfe7cef93a9095cbf9fd59c030d70341e20 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Sat, 11 Feb 2023 15:30:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=94=E5=9B=9EemptyMap=E4=BB=A3?= =?UTF-8?q?=E6=9B=BFnull=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E9=A2=9D=E5=A4=96=E5=88=A4=E6=96=ADnull=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/util/EnumUtil.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java index 6e85d2095..57a3e437b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java @@ -8,11 +8,7 @@ import cn.hutool.core.reflect.FieldUtil; import cn.hutool.core.text.StrUtil; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.function.Predicate; @@ -315,7 +311,7 @@ public class EnumUtil { public static Map getNameFieldMap(final Class> clazz, final String fieldName) { final Enum[] enums = clazz.getEnumConstants(); if (null == enums) { - return null; + return Collections.emptyMap(); } final Map map = MapUtil.newHashMap(enums.length, true); for (final Enum e : enums) { From 2becd707b669bf34bdf7797419b3cadcf23f3eff Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Mon, 13 Feb 2023 21:37:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=8A=9B=E5=87=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=96=B9=E5=BC=8F=E4=BB=A3=E6=9B=BFnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java index 57a3e437b..cc03082b3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java @@ -311,7 +311,7 @@ public class EnumUtil { public static Map getNameFieldMap(final Class> clazz, final String fieldName) { final Enum[] enums = clazz.getEnumConstants(); if (null == enums) { - return Collections.emptyMap(); + throw new IllegalArgumentException(StrUtil.format("Class [{}] is not an Enum type!", clazz.getName())); } final Map map = MapUtil.newHashMap(enums.length, true); for (final Enum e : enums) { From bfebc8bc0fdeaf7a830424c0c482709acd371328 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Thu, 16 Feb 2023 09:57:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?if=E6=94=B9=E6=88=90Assert.notNull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java index cc03082b3..7990cad8d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java @@ -310,9 +310,7 @@ public class EnumUtil { */ public static Map getNameFieldMap(final Class> clazz, final String fieldName) { final Enum[] enums = clazz.getEnumConstants(); - if (null == enums) { - throw new IllegalArgumentException(StrUtil.format("Class [{}] is not an Enum type!", clazz.getName())); - } + Assert.notNull(enums, "Enum clazz must be not null !"); final Map map = MapUtil.newHashMap(enums.length, true); for (final Enum e : enums) { map.put(e.name(), FieldUtil.getFieldValue(e, fieldName)); From 65239df0e499bf428cb8afa8752518d958606a64 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Thu, 16 Feb 2023 09:58:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?if=E6=94=B9=E6=88=90Assert.notNull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java index 7990cad8d..3f9e3fe51 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java @@ -310,7 +310,7 @@ public class EnumUtil { */ public static Map getNameFieldMap(final Class> clazz, final String fieldName) { final Enum[] enums = clazz.getEnumConstants(); - Assert.notNull(enums, "Enum clazz must be not null !"); + Assert.notNull(enums, "Class [{}] is not an Enum type!", clazz); final Map map = MapUtil.newHashMap(enums.length, true); for (final Enum e : enums) { map.put(e.name(), FieldUtil.getFieldValue(e, fieldName));