From ecdd0a616af070c0383cc86ba84cbe2a1468ac87 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Mon, 19 May 2025 17:11:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor!:=20`BasePropertyValidator#isTrue`=20?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA=20`must`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/BasePropertyValidator.java | 32 +++++++++---------- .../validator/test/BaseValidatorTest.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java index e3843ac..47e8621 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java @@ -129,46 +129,46 @@ public abstract class BasePropertyValidator< // return thisObject(); } - // ===== isTrue ===== + // ===== must ===== - public TPropertyValidator isTrue(Predicate condition) { - return isTrue(condition, "无效的用户输入"); + public TPropertyValidator must(Predicate condition) { + return must(condition, "无效的用户输入"); } - public TPropertyValidator isTrue(Predicate condition, String errMsg) { - return isTrue(condition, convertExceptionCreator(errMsg)); + public TPropertyValidator must(Predicate condition, String errMsg) { + return must(condition, convertExceptionCreator(errMsg)); } - public TPropertyValidator isTrue( + public TPropertyValidator must( Predicate condition, Supplier exceptionCreator) { - return isTrue(condition, convertExceptionCreator(exceptionCreator)); + return must(condition, convertExceptionCreator(exceptionCreator)); } - public TPropertyValidator isTrue( + public TPropertyValidator must( Predicate condition, Function exceptionCreator) { withRule(condition, exceptionCreator); return thisObject(); } - // ===== isTrue ===== + // ===== must ===== - public TPropertyValidator isTrue(Collection> conditions) { - return isTrue(conditions, "无效的用户输入"); + public TPropertyValidator must(Collection> conditions) { + return must(conditions, "无效的用户输入"); } - public TPropertyValidator isTrue(Collection> conditions, String errMsg) { - return isTrue(conditions, convertExceptionCreator(errMsg)); + public TPropertyValidator must(Collection> conditions, String errMsg) { + return must(conditions, convertExceptionCreator(errMsg)); } - public TPropertyValidator isTrue( + public TPropertyValidator must( Collection> conditions, Supplier exceptionCreator) { - return isTrue(conditions, convertExceptionCreator(exceptionCreator)); + return must(conditions, convertExceptionCreator(exceptionCreator)); } - public TPropertyValidator isTrue( + public TPropertyValidator must( Collection> conditions, Function exceptionCreator) { for (Predicate condition : conditions) { diff --git a/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java b/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java index b65d14d..018682d 100644 --- a/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java +++ b/plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java @@ -37,7 +37,7 @@ class BaseValidatorTest { int thisYear = Year.now().getValue(); ruleForString(RegisterCommand::getUsername) - .isTrue(PredicateTools.from(Objects::nonNull) + .must(PredicateTools.from(Objects::nonNull) .and(StringTools::isNotEmpty) .and(StringTools::isNotBlank) .and(username -> RegexTools.matches(username, PatternConsts.USERNAME)),