diff --git a/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java b/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java index d3e887e..29bb43a 100644 --- a/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java +++ b/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java @@ -21,8 +21,7 @@ public final class EntityStatus extends Enumeration { public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常"); public static final EntityStatus DISABLED = new EntityStatus(1, "禁用"); - private static final ValueSet VALUE_SET = new ValueSet<>( - AVAILABLE, DISABLED); + private static final ValueSet VALUE_SET = ValueSet.of(AVAILABLE, DISABLED); public static EntityStatus of(int id) { return VALUE_SET.get(id); diff --git a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java index 540ceab..61440cf 100644 --- a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java +++ b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java @@ -23,7 +23,7 @@ public final class AccountStatus extends Enumeration implements I public static final AccountStatus AVAILABLE = new AccountStatus(0, "账号正常"); public static final AccountStatus LOCKED = new AccountStatus(1, "账号被锁定"); - private static final ValueSet VALUE_SET = new ValueSet<>( + private static final ValueSet VALUE_SET = ValueSet.of( AVAILABLE, LOCKED); diff --git a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java index 09735c5..7232581 100644 --- a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java +++ b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java @@ -25,7 +25,7 @@ public final class Sex extends Enumeration implements IValueObject { super(id, name); } - private static final ValueSet VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE); + private static final ValueSet VALUE_SET = ValueSet.of(UNSET, MALE, FEMALE); @StaticFactoryMethod(Sex.class) public static Sex of(int value) {