From 0a83116e81a81611a3fc78c06a2a7ceddfe498f6 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Sun, 1 Jun 2025 20:16:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=B8=8E=E8=BF=94=E5=9B=9E=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E5=90=88=E5=B9=B6=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BA=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/BoolPropertyValidator.java | 6 ++-- .../validator/DoublePropertyValidator.java | 12 +++----- .../validator/IntPropertyValidator.java | 12 +++----- .../validator/LongPropertyValidator.java | 12 +++----- .../validator/StringPropertyValidator.java | 29 +++++++------------ 5 files changed, 24 insertions(+), 47 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 b2bfc5c..bf74c36 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 @@ -74,8 +74,7 @@ public class BoolPropertyValidator extends BasePropertyValidator BoolPropertyValidator isTrueValue(Function e) { - withRule(Boolean.TRUE::equals, e); - return this; + return withRule(Boolean.TRUE::equals, e); } // ====== isFalseValue ====== @@ -118,8 +117,7 @@ public class BoolPropertyValidator extends BasePropertyValidator BoolPropertyValidator isFalseValue(Function e) { - withRule(Boolean.FALSE::equals, e); - return this; + return withRule(Boolean.FALSE::equals, e); } @Override diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java index 72c28a9..758c6fa 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java @@ -80,8 +80,7 @@ public class DoublePropertyValidator * @return 属性校验器 */ public DoublePropertyValidator gt(double min, Function e) { - withRule(value -> (value != null && value > min), e); - return this; + return withRule(value -> (value != null && value > min), e); } // ================================ @@ -134,8 +133,7 @@ public class DoublePropertyValidator * @return 属性校验器 */ public DoublePropertyValidator ge(double min, Function e) { - withRule(value -> (value != null && value >= min), e); - return this; + return withRule(value -> (value != null && value >= min), e); } // ================================ @@ -188,8 +186,7 @@ public class DoublePropertyValidator * @return 属性校验器 */ public DoublePropertyValidator lt(double max, Function e) { - withRule(value -> (value != null && value < max), e); - return this; + return withRule(value -> (value != null && value < max), e); } // ================================ @@ -242,8 +239,7 @@ public class DoublePropertyValidator * @return 属性校验器 */ public DoublePropertyValidator le(double max, Function e) { - withRule(value -> (value != null && value <= max), e); - return this; + return withRule(value -> (value != null && value <= max), e); } // ================================ diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java index 51c44e5..e955760 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java @@ -80,8 +80,7 @@ public class IntPropertyValidator * @return 属性校验器 */ public IntPropertyValidator gt(int min, Function e) { - withRule(value -> (value != null && value > min), e); - return this; + return withRule(value -> (value != null && value > min), e); } // ================================ @@ -134,8 +133,7 @@ public class IntPropertyValidator * @return 属性校验器 */ public IntPropertyValidator ge(int min, Function e) { - withRule(value -> (value != null && value >= min), e); - return this; + return withRule(value -> (value != null && value >= min), e); } // ================================ @@ -188,8 +186,7 @@ public class IntPropertyValidator * @return 属性校验器 */ public IntPropertyValidator lt(int max, Function e) { - withRule(value -> (value != null && value < max), e); - return this; + return withRule(value -> (value != null && value < max), e); } // ================================ @@ -242,8 +239,7 @@ public class IntPropertyValidator * @return 属性校验器 */ public IntPropertyValidator le(int max, Function e) { - withRule(value -> (value != null && value <= max), e); - return this; + return withRule(value -> (value != null && value <= max), e); } // ================================ diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java index f6eeb7c..6d7cbdc 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java @@ -80,8 +80,7 @@ public class LongPropertyValidator * @return 属性校验器 */ public LongPropertyValidator gt(long min, Function e) { - withRule(value -> (value != null && value > min), e); - return this; + return withRule(value -> (value != null && value > min), e); } // ================================ @@ -134,8 +133,7 @@ public class LongPropertyValidator * @return 属性校验器 */ public LongPropertyValidator ge(long min, Function e) { - withRule(value -> (value != null && value >= min), e); - return this; + return withRule(value -> (value != null && value >= min), e); } // ================================ @@ -188,8 +186,7 @@ public class LongPropertyValidator * @return 属性校验器 */ public LongPropertyValidator lt(long max, Function e) { - withRule(value -> (value != null && value < max), e); - return this; + return withRule(value -> (value != null && value < max), e); } // ================================ @@ -242,8 +239,7 @@ public class LongPropertyValidator * @return 属性校验器 */ public LongPropertyValidator le(long max, Function e) { - withRule(value -> (value != null && value <= max), e); - return this; + return withRule(value -> (value != null && value <= max), e); } // ================================ diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java index 70190af..5a96707 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java @@ -80,8 +80,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator matches( Pattern regex, Function e) { - withRule(input -> (input == null || RegexTools.matches(input, regex)), e); - return this; + return withRule(input -> (input == null || RegexTools.matches(input, regex)), e); } // ================================ @@ -126,8 +125,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator matchesOne( Pattern[] regexs, Function e) { - withRule(input -> input == null || RegexTools.matchesOne(input, regexs), e); - return this; + return withRule(input -> input == null || RegexTools.matchesOne(input, regexs), e); } /** @@ -164,8 +162,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator matchesOne( List regexs, Function e) { - withRule(input -> input == null || RegexTools.matchesOne(input, regexs.toArray(new Pattern[regexs.size()])), e); - return this; + return withRule(input -> input == null || RegexTools.matchesOne(input, regexs.toArray(new Pattern[regexs.size()])), e); } // ================================ @@ -210,8 +207,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator matchesAll( Pattern[] regexs, Function e) { - withRule(input -> input == null || RegexTools.matchesAll(input, regexs), e); - return this; + return withRule(input -> input == null || RegexTools.matchesAll(input, regexs), e); } /** @@ -248,8 +244,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator matchesAll( Collection regexs, Function e) { - withRule(input -> input == null || RegexTools.matchesAll(input, regexs.toArray(new Pattern[regexs.size()])), e); - return this; + return withRule(input -> input == null || RegexTools.matchesAll(input, regexs.toArray(new Pattern[regexs.size()])), e); } // ================================ @@ -298,8 +293,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< * @return 属性校验器 */ public StringPropertyValidator notBlank(Function e) { - withRule(StringTools::isNotBlank, e); - return this; + return withRule(StringTools::isNotBlank, e); } // ================================ @@ -399,8 +393,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< */ public StringPropertyValidator notEmpty( Function e) { - withRule(s -> s != null && !s.isEmpty(), e); - return this; + return withRule(s -> s != null && !s.isEmpty(), e); } // ================================ @@ -445,11 +438,10 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< public StringPropertyValidator length(int length, Function e) { AssertTools.checkArgument(length >= 0, "The expected length must be greater than or equal to 0."); - withRule(s -> s == null || s.length() == length, e); - return this; + return withRule(s -> s == null || s.length() == length, e); } - static boolean length(String str, int min, int max) { + static boolean checkLength(String str, int min, int max) { if (str == null) { return true; } @@ -494,8 +486,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< Function e) { AssertTools.checkArgument(min >= 0, "min must be non-negative."); AssertTools.checkArgument(min <= max, "min must be less than or equal to max."); - withRule(s -> length(s, min, max), e); - return this; + return withRule(s -> checkLength(s, min, max), e); } // ================================