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 4d3bad9..4e9a85c 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 @@ -33,7 +33,7 @@ import com.google.common.collect.Range; */ public abstract class BaseComparablePropertyValidator< T, - TProperty extends Comparable, + TProperty extends Comparable, TPropertyValidator extends BaseComparablePropertyValidator> extends BasePropertyValidator { @@ -47,9 +47,9 @@ public abstract class BaseComparablePropertyValidator< * @param range 区间 * @return 当前校验器实例,用于链式调用 */ - public final TPropertyValidator inRange(final Range range) { + public final TPropertyValidator inRange(final Range range) { return withRule(Conditions.inRange(range), value -> ValidationException.withMessage( - "The input must in the interval %s. You entered %s.", range, value)); + "The input must in the interval %s. You entered %s.", range, value)); } /** @@ -60,7 +60,7 @@ public abstract class BaseComparablePropertyValidator< * @return 当前校验器实例,用于链式调用 */ public final TPropertyValidator inRange( - final Range range, final String errorMessage) { + final Range range, final String errorMessage) { return withRule(Conditions.inRange(range), errorMessage); } @@ -73,7 +73,7 @@ public abstract class BaseComparablePropertyValidator< * @return 当前校验器实例,用于链式调用 */ public final TPropertyValidator inRange( - final Range range, final Supplier exceptionSupplier) { + final Range range, final Supplier exceptionSupplier) { return withRule(Conditions.inRange(range), exceptionSupplier); } @@ -86,7 +86,7 @@ public abstract class BaseComparablePropertyValidator< * @return 当前校验器实例,用于链式调用 */ public final TPropertyValidator inRange( - final Range range, final Function exceptionFunction) { + final Range range, final Function exceptionFunction) { return withRule(Conditions.inRange(range), exceptionFunction); } @@ -95,8 +95,8 @@ public abstract class BaseComparablePropertyValidator< */ private static class Conditions { - private static > Predicate inRange( - final Range range) { + private static > Predicate inRange( + final Range range) { return value -> value == null || range.contains(value); } } diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java index b35eb58..525c493 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java @@ -109,7 +109,7 @@ public abstract class BaseValidator implements IValidator { * 示例:{@code Person::getName}。 * @return {@code ComparablePropertyValidator}。用于添加针对该属性的校验规则。 */ - protected final > ComparablePropertyValidator ruleForComparable( + protected final > ComparablePropertyValidator ruleForComparable( Function getter) { ComparablePropertyValidator validator = new ComparablePropertyValidator<>(getter); this.rules.add(validator::validate); diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java index db5a9a6..3a7bce8 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java @@ -26,7 +26,7 @@ import java.util.function.Function; * @see com.google.common.collect.Range * @author ZhouXY */ -public class ComparablePropertyValidator> +public class ComparablePropertyValidator> extends BaseComparablePropertyValidator> { ComparablePropertyValidator(Function getter) { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java index 4cbb010..cb16276 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java @@ -173,7 +173,8 @@ public abstract class MapValidator extends BaseValidator> { * @param key key * @return 属性校验器 */ - protected final > ComparablePropertyValidator, E> ruleForComparable(K key) { + protected final > // + ComparablePropertyValidator, E> ruleForComparable(K key) { @SuppressWarnings("unchecked") Function, E> getter = m -> (E) m.get(key); return ruleForComparable(getter); diff --git a/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java b/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java index 0833fa1..106cb4c 100644 --- a/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java +++ b/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java @@ -122,14 +122,14 @@ class ParamsValidator extends MapValidator { .notNull(d -> ExampleException.withMessage("The doubleProperty cannot be null, but it was %s", d)); ruleForString(STRING_PROPERTY) .notNull(); - ruleForComparable(DATE_TIME_PROPERTY) + this.ruleForComparable(DATE_TIME_PROPERTY) .notNull("The dateTimeProperty cannot be null"); ruleFor(OBJECT_PROPERTY) .notNull(() -> ExampleException.withMessage("The objectProperty cannot be null")); - ruleForCollection(STRING_LIST_PROPERTY) + this.ruleForCollection(STRING_LIST_PROPERTY) .notNull(d -> ExampleException.withMessage("The stringListProperty cannot be null, but it was %s", d)); - ruleForPair(STRING_PROPERTY, STRING_PROPERTY2) + this.ruleForPair(STRING_PROPERTY, STRING_PROPERTY2) .must((str1, str2) -> str1 != null && str1.equals(str2), "'stringProperty' must be equal to 'stringProperty2'."); }