From 4c4b037900c71f1d6dff2911ea7144375caeb397 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Sun, 18 May 2025 13:34:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor!:=20=E9=87=8D=E5=91=BD=E5=90=8D=20`Boo?= =?UTF-8?q?lPropertyValidator`=20=E4=B8=AD=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 `BoolPropertyValidator` 中的 `isTrue` 重命名为 `isTrueValue`, 避免与 `BasePropertyValidator` 中的 `isTrue` 产生歧义; `isFalse` 也相应地重命名为 `isFalseValue`。 Reviewed-on: http://zhouxy.xyz:3000/plusone/plusone-validator/pulls/6 Co-authored-by: ZhouXY108 Co-committed-by: ZhouXY108 --- .../validator/BoolPropertyValidator.java | 34 ++++++++++--------- .../validator/map/test/MapValidatorTests.java | 2 +- 2 files changed, 19 insertions(+), 17 deletions(-) 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("角色列表不能为空!")