diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java index c4acd58..f357798 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java @@ -9,41 +9,43 @@ public class BoolPropertyValidator extends BasePropertyValidator isTrue() { - return isTrue("The value must be true."); + public BoolPropertyValidator isTrueValue() { + return isTrueValue("The value must be true."); } - public BoolPropertyValidator isTrue(String errMsg) { - return isTrue(convertExceptionCreator(errMsg)); + public BoolPropertyValidator isTrueValue(String errMsg) { + return isTrueValue(convertExceptionCreator(errMsg)); } - public BoolPropertyValidator isTrue(Supplier exceptionCreator) { - return isTrue(convertExceptionCreator(exceptionCreator)); + public BoolPropertyValidator isTrueValue( + Supplier exceptionCreator) { + return isTrueValue(convertExceptionCreator(exceptionCreator)); } - public BoolPropertyValidator isTrue( + public BoolPropertyValidator isTrueValue( Function exceptionCreator) { withRule(Boolean.TRUE::equals, exceptionCreator); return this; } - // ====== isFalse ====== + // ====== isFalseValue ====== - public BoolPropertyValidator isFalse() { - return isFalse("The value must be false."); + public BoolPropertyValidator isFalseValue() { + return isFalseValue("The value must be false."); } - public BoolPropertyValidator isFalse(String errMsg) { - return isFalse(convertExceptionCreator(errMsg)); + public BoolPropertyValidator isFalseValue(String errMsg) { + return isFalseValue(convertExceptionCreator(errMsg)); } - public BoolPropertyValidator isFalse(Supplier exceptionCreator) { - return isFalse(convertExceptionCreator(exceptionCreator)); + public BoolPropertyValidator isFalseValue( + Supplier exceptionCreator) { + return isFalseValue(convertExceptionCreator(exceptionCreator)); } - public BoolPropertyValidator isFalse( + public BoolPropertyValidator isFalseValue( Function exceptionCreator) { withRule(Boolean.FALSE::equals, exceptionCreator); return this; diff --git a/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/map/test/MapValidatorTests.java b/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/map/test/MapValidatorTests.java index 39bb3d7..60500c4 100644 --- a/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/map/test/MapValidatorTests.java +++ b/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/map/test/MapValidatorTests.java @@ -76,7 +76,7 @@ class ParamsValidator extends MapValidator { ruleForBool(BOOLEAN) .notNull("Boolean property could not be null.") - .isTrue("Boolean property must be true."); + .isTrueValue("Boolean property must be true."); this.ruleForCollection(ROLE_LIST) .notEmpty("角色列表不能为空!")