diff --git a/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java index 4913aa5..990aaba 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java @@ -16,7 +16,7 @@ public abstract class BasePropertyValidator< // private final Function getter; - private final List> consumers = new LinkedList<>(); + private final List> consumers = new LinkedList<>(); protected BasePropertyValidator(Function getter) { this.getter = getter; @@ -47,7 +47,7 @@ public abstract class BasePropertyValidator< // } public final void validate(T obj) { - for (Consumer consumer : consumers) { + for (Consumer consumer : consumers) { consumer.accept(getter.apply(obj)); } } @@ -115,22 +115,22 @@ public abstract class BasePropertyValidator< // // ===== isTrue ===== - public TPropertyValidator isTrue(Predicate condition) { + public TPropertyValidator isTrue(Predicate condition) { return isTrue(condition, "无效的用户输入"); } - public TPropertyValidator isTrue(Predicate condition, String errMsg) { + public TPropertyValidator isTrue(Predicate condition, String errMsg) { return isTrue(condition, convertExceptionCreator(errMsg)); } public TPropertyValidator isTrue( - Predicate condition, + Predicate condition, Supplier exceptionCreator) { return isTrue(condition, convertExceptionCreator(exceptionCreator)); } public TPropertyValidator isTrue( - Predicate condition, + Predicate condition, Function exceptionCreator) { withRule(condition, exceptionCreator); return thisObject(); @@ -138,24 +138,24 @@ public abstract class BasePropertyValidator< // // ===== isTrue ===== - public TPropertyValidator isTrue(Collection> conditions) { + public TPropertyValidator isTrue(Collection> conditions) { return isTrue(conditions, "无效的用户输入"); } - public TPropertyValidator isTrue(Collection> conditions, String errMsg) { + public TPropertyValidator isTrue(Collection> conditions, String errMsg) { return isTrue(conditions, convertExceptionCreator(errMsg)); } public TPropertyValidator isTrue( - Collection> conditions, + Collection> conditions, Supplier exceptionCreator) { return isTrue(conditions, convertExceptionCreator(exceptionCreator)); } public TPropertyValidator isTrue( - Collection> conditions, + Collection> conditions, Function exceptionCreator) { - for (Predicate condition : conditions) { + for (Predicate condition : conditions) { withRule(condition, exceptionCreator); } return thisObject(); diff --git a/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java index 9564991..7fd882c 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; public abstract class BaseValidator { private final List> rules = new ArrayList<>(); - protected void withRule(final Predicate rule, final String errorMessage) { + protected void withRule(final Predicate rule, final String errorMessage) { withRule(rule, () -> new IllegalArgumentException(errorMessage)); } diff --git a/src/main/java/xyz/zhouxy/plusone/validator/Validator.java b/src/main/java/xyz/zhouxy/plusone/validator/Validator.java index d5919ed..1cbd982 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/Validator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/Validator.java @@ -38,22 +38,22 @@ import java.util.function.Supplier; * @see BaseValidator */ public final class Validator extends BaseValidator { - public final Validator addRule(final Predicate rule, final String errorMessage) { + public final Validator addRule(final Predicate rule, final String errorMessage) { withRule(rule, errorMessage); return this; } - public final Validator addRule(Predicate rule, Supplier exceptionCreator) { + public final Validator addRule(Predicate rule, Supplier exceptionCreator) { withRule(rule, exceptionCreator); return this; } - public final Validator addRule(Predicate rule, Function exceptionCreator) { + public final Validator addRule(Predicate rule, Function exceptionCreator) { withRule(rule, exceptionCreator); return this; } - public final Validator addRule(Consumer rule) { + public final Validator addRule(Consumer rule) { withRule(rule); return this; }