diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java index 663e828..52ba86f 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java @@ -30,7 +30,8 @@ public abstract class BaseComparablePropertyValidator range) { withRule(value -> value != null && range.contains(value), - convertExceptionCreator("The value is not in the interval " + range.toString())); + value -> new IllegalArgumentException( + String.format("The input must in the interval %s. You entered %s.", range, value))); return thisObject(); } 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 2c32402..d3255b5 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 @@ -71,10 +71,12 @@ public abstract class BasePropertyValidator new IllegalArgumentException(String.format("(%s) 必须与 (%s) 相等", value, that))); + return equalsThat(that, + value -> new IllegalArgumentException(String.format("The input must be equal to '%s'.", that))); } public TPropertyValidator equalsThat(Object that, String errMsg) { @@ -126,10 +141,16 @@ public abstract class BasePropertyValidator condition) { - return must(condition, "无效的用户输入"); + return must(condition, "The specified condition was not met for the input."); } public TPropertyValidator must(Predicate condition, String errMsg) { @@ -149,10 +170,8 @@ public abstract class BasePropertyValidator> conditions) { - return must(conditions, "无效的用户输入"); + return must(conditions, "The specified conditions were not met for the input."); } public TPropertyValidator must(Collection> conditions, String errMsg) { @@ -174,6 +193,10 @@ public abstract class BasePropertyValidator Function convertExceptionCreator(String errMsg) { return value -> new IllegalArgumentException(errMsg); } 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 8c44513..2357381 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 @@ -28,7 +28,7 @@ public class BoolPropertyValidator extends BasePropertyValidator isTrueValue() { - return isTrueValue("The value must be true."); + return isTrueValue("The input must be true."); } public BoolPropertyValidator isTrueValue(String errMsg) { @@ -49,7 +49,7 @@ public class BoolPropertyValidator extends BasePropertyValidator isFalseValue() { - return isFalseValue("The value must be false."); + return isFalseValue("The input must be false."); } public BoolPropertyValidator isFalseValue(String errMsg) { 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 8922bc4..c48a8f5 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 @@ -31,7 +31,8 @@ public class DoublePropertyValidator // ================================ public DoublePropertyValidator gt(double min) { - return gt(min, String.format("The value should be greater than %s", min)); + return gt(min, () -> new IllegalArgumentException( + String.format("The input must be greater than '%s'.", min))); } public DoublePropertyValidator gt(double min, String errMsg) { @@ -58,7 +59,8 @@ public class DoublePropertyValidator // ================================ public DoublePropertyValidator ge(double min) { - return ge(min, String.format("The value should be greater than or equal to %s", min)); + return ge(min, () -> new IllegalArgumentException( + String.format("The input must be greater than or equal to '%s'.", min))); } public DoublePropertyValidator ge(double min, String errMsg) { @@ -85,7 +87,8 @@ public class DoublePropertyValidator // ================================ public DoublePropertyValidator lt(double max) { - return lt(max, String.format("The value should be less than %s", max)); + return lt(max, () -> new IllegalArgumentException( + String.format("The input must be less than '%s'.", max))); } public DoublePropertyValidator lt(double max, String errMsg) { @@ -112,7 +115,8 @@ public class DoublePropertyValidator // ================================ public DoublePropertyValidator le(double max) { - return le(max, String.format("The value should be less than or equal to %s", max)); + return le(max, () -> new IllegalArgumentException( + String.format("The input must be less than or equal to '%s'.", max))); } public DoublePropertyValidator le(double max, String errMsg) { 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 2afb9d1..50740cd 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 @@ -31,7 +31,8 @@ public class IntPropertyValidator // ================================ public IntPropertyValidator gt(int min) { - return gt(min, String.format("The value should be greater than %d", min)); + return gt(min, () -> new IllegalArgumentException( + String.format("The input must be greater than '%d'.", min))); } public IntPropertyValidator gt(int min, String errMsg) { @@ -58,7 +59,8 @@ public class IntPropertyValidator // ================================ public IntPropertyValidator ge(int min) { - return ge(min, String.format("The value should be greater than or equal to %d", min)); + return ge(min, () -> new IllegalArgumentException( + String.format("The input must be greater than or equal to '%d'.", min))); } public IntPropertyValidator ge(int min, String errMsg) { @@ -85,7 +87,8 @@ public class IntPropertyValidator // ================================ public IntPropertyValidator lt(int max) { - return lt(max, String.format("The value should be less than %d", max)); + return lt(max, () -> new IllegalArgumentException( + String.format("The input must be less than '%d'.", max))); } public IntPropertyValidator lt(int max, String errMsg) { @@ -112,7 +115,8 @@ public class IntPropertyValidator // ================================ public IntPropertyValidator le(int max) { - return le(max, String.format("The value should be less than or equal to %d", max)); + return le(max, () -> new IllegalArgumentException( + String.format("The input must be less than or equal to '%d'.", max))); } public IntPropertyValidator le(int max, String errMsg) { 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 7459209..92b284a 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 @@ -31,7 +31,8 @@ public class LongPropertyValidator // ================================ public LongPropertyValidator gt(long min) { - return gt(min, String.format("The value should be greater than %d", min)); + return gt(min, () -> new IllegalArgumentException( + String.format("The input must be greater than '%d'.", min))); } public LongPropertyValidator gt(long min, String errMsg) { @@ -58,7 +59,8 @@ public class LongPropertyValidator // ================================ public LongPropertyValidator ge(long min) { - return ge(min, String.format("The value should be greater than or equal to %d", min)); + return ge(min, () -> new IllegalArgumentException( + String.format("The input must be greater than or equal to '%d'.", min))); } public LongPropertyValidator ge(long min, String errMsg) { @@ -85,7 +87,8 @@ public class LongPropertyValidator // ================================ public LongPropertyValidator lt(long max) { - return lt(max, String.format("The value should be less than %d", max)); + return lt(max, () -> new IllegalArgumentException( + String.format("The input must be less than '%d'.", max))); } public LongPropertyValidator lt(long max, String errMsg) { @@ -112,7 +115,8 @@ public class LongPropertyValidator // ================================ public LongPropertyValidator le(long max) { - return le(max, String.format("The value should be less than or equal to %d", max)); + return le(max, () -> new IllegalArgumentException( + String.format("The input must be less than or equal to '%d'.", max))); } public LongPropertyValidator le(long max, String errMsg) { 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 fdcc22f..eaf35b5 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 @@ -156,7 +156,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< // ================================ public StringPropertyValidator notBlank() { - return notBlank("The value must have text; it must not be null, empty, or blank."); + return notBlank("The input must not be blank."); } public StringPropertyValidator notBlank(String errMsg) { @@ -182,7 +182,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< // ================================ public StringPropertyValidator emailAddress() { - return emailAddress("The value is not an email address."); + return emailAddress("The input is not a valid email address."); } public StringPropertyValidator emailAddress(String errMsg) { @@ -208,7 +208,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< // ================================ public StringPropertyValidator notEmpty() { - return notEmpty("The value must not be empty."); + return notEmpty("The input must not be empty."); } public StringPropertyValidator notEmpty(String errMsg) { @@ -245,7 +245,7 @@ public class StringPropertyValidator extends BaseComparablePropertyValidator< public StringPropertyValidator length(int length, Function exceptionCreator) { AssertTools.checkArgument(length >= 0, - "The required length must be greater than or equal to 0."); + "The expected length must be greater than or equal to 0."); withRule(s -> s == null || s.length() == length, exceptionCreator); return this; }