zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix cod

Browse Source
This commit is contained in:
Looly
2024-12-15 22:36:09 +08:00
parent 1ad06d3d81
commit b37382dd1c
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java
View File

@@ -257,11 +257,27 @@ public class EnumUtil {
* @since 5.8.0 * @since 5.8.0
*/ */
public static <E extends Enum<E>> E getBy(final Class<E> enumClass, final Predicate<? super E> predicate) { public static <E extends Enum<E>> E getBy(final Class<E> enumClass, final Predicate<? super E> predicate) {
return getBy(enumClass, predicate, null);
}
/**
* 通过 某字段对应值 获取 枚举，获取不到时为 {@code defaultEnum}
*
* @param enumClass 枚举类
* @param predicate 条件
* @param defaultEnum 获取不到时的默认枚举值
* @param <E> 枚举类型
* @return 对应枚举 ，获取不到时为 {@code defaultEnum}
* @since 5.8.35
*/
public static <E extends Enum<E>> E getBy(final Class<E> enumClass,
final Predicate<? super E> predicate,
final E defaultEnum) {
if (null == enumClass || null == predicate) { if (null == enumClass || null == predicate) {
return null; return null;
} }
return Arrays.stream(enumClass.getEnumConstants()) return Arrays.stream(enumClass.getEnumConstants())
.filter(predicate).findFirst().orElse(null); .filter(predicate).findAny().orElse(defaultEnum);
} }
/** /**
@@ -274,14 +290,7 @@ public class EnumUtil {
* @return 对应枚举 ，获取不到时为 {@code null} * @return 对应枚举 ，获取不到时为 {@code null}
*/ */
public static <E extends Enum<E>, C> E getBy(final SerFunction<E, C> condition, final C value) { public static <E extends Enum<E>, C> E getBy(final SerFunction<E, C> condition, final C value) {
if(null == condition){ return getBy(condition, value, null);
return null;
}
final Class<E> implClass = LambdaUtil.getRealClass(condition);
return Arrays.stream(implClass.getEnumConstants())
.filter(constant -> ObjUtil.equals(condition.apply(constant), value))
.findAny()
.orElse(null);
} }
/** /**
@@ -295,7 +304,14 @@ public class EnumUtil {
* @return 对应枚举 ，获取不到时为 {@code null} * @return 对应枚举 ，获取不到时为 {@code null}
*/ */
public static <E extends Enum<E>, C> E getBy(final SerFunction<E, C> condition, final C value, final E defaultEnum) { public static <E extends Enum<E>, C> E getBy(final SerFunction<E, C> condition, final C value, final E defaultEnum) {
return ObjUtil.defaultIfNull(getBy(condition, value), defaultEnum); if (null == condition) {
return null;
}
final Class<E> implClass = LambdaUtil.getRealClass(condition);
return Arrays.stream(implClass.getEnumConstants())
.filter(constant -> ObjUtil.equals(condition.apply(constant), value))
.findAny()
.orElse(defaultEnum);
} }
/** /**