diff --git a/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java b/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java index c18b6bd2528466d10b5dc6ab25b92e98ce9f1e60..358b6263a0509ebf8a0184ffac024b3676bbc0a7 100644 --- a/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java +++ b/commons/common-util/src/main/java/com/schbrain/common/util/TreeUtils.java @@ -41,7 +41,7 @@ public class TreeUtils { Function parentKeyExtractor, Function childMapper, BiConsumer> childrenSetter, - Comparator childrenComparator, + @Nullable Comparator childrenComparator, @Nullable K parentId) { if (CollectionUtils.isEmpty(nodes)) { return new ArrayList<>(); diff --git a/commons/common/src/main/java/com/schbrain/common/enums/BooleanEnum.java b/commons/common/src/main/java/com/schbrain/common/enums/BooleanEnum.java index 9b2acd09e1e960cf50d658944356ba75f0f83e1d..99d9830b0932fea583c4a7327211a1b8bdad5537 100644 --- a/commons/common/src/main/java/com/schbrain/common/enums/BooleanEnum.java +++ b/commons/common/src/main/java/com/schbrain/common/enums/BooleanEnum.java @@ -3,7 +3,10 @@ package com.schbrain.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.Arrays; import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; /** * @author huangxi @@ -22,10 +25,20 @@ public enum BooleanEnum { */ FALSE(0); + private static final Set VALUES = Arrays.stream(values()).map(BooleanEnum::getValue).collect(Collectors.toSet()); + private final Integer value; public static boolean validate(Integer value) { + return VALUES.contains(value); + } + + public static boolean isTrue(Integer value) { return Objects.equals(TRUE.value, value); } + public static boolean isFalse(Integer value) { + return Objects.equals(FALSE.value, value); + } + }