diff --git a/pom.xml b/pom.xml index 12d02a5..76f910f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 xyz.zhouxy.plusone - plusone-validator + plusone-validator-for-mfp 0.1.3-SNAPSHOT plusone-validator diff --git a/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java index 847a01d..aaa009e 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java @@ -39,25 +39,25 @@ public class BaseValidator { return validValueHolder; } - protected final IntValidator ruleForInt(Function getter) { + protected final IntValidator ruleForInt(Function getter) { IntValidator validValueHolder = new IntValidator<>(getter); propertyValidators.add(validValueHolder); return validValueHolder; } - protected final DoubleValidator ruleForDouble(Function getter) { + protected final DoubleValidator ruleForDouble(Function getter) { DoubleValidator validValueHolder = new DoubleValidator<>(getter); propertyValidators.add(validValueHolder); return validValueHolder; } - protected final BoolValidator ruleForBool(Function getter) { + protected final BoolValidator ruleForBool(Function getter) { BoolValidator validValueHolder = new BoolValidator<>(getter); propertyValidators.add(validValueHolder); return validValueHolder; } - protected final StringValidator ruleForString(Function getter) { + protected final StringValidator ruleForString(Function getter) { StringValidator validValueHolder = new StringValidator<>(getter); propertyValidators.add(validValueHolder); return validValueHolder; diff --git a/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java index fa408f6..6d00130 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.BooleanUtils; public class BoolValidator extends PropertyValidator> { - BoolValidator(Function getter) { + BoolValidator(Function getter) { super(getter); } diff --git a/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java index 4174e79..5e02774 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; public class DoubleValidator extends PropertyValidator> { - DoubleValidator(Function getter) { + DoubleValidator(Function getter) { super(getter); } diff --git a/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java index 1cdf093..3327d39 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; public class IntValidator extends PropertyValidator> { - IntValidator(Function getter) { + IntValidator(Function getter) { super(getter); } diff --git a/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java index 2dafff3..fc08f0f 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java @@ -8,10 +8,10 @@ import java.util.function.Predicate; import java.util.function.Supplier; abstract class PropertyValidator { - Function getter; + Function getter; Validator validator = new Validator<>(); - PropertyValidator(Function getter) { + PropertyValidator(Function getter) { this.getter = getter; } @@ -137,8 +137,9 @@ abstract class PropertyValidator { // ======================================================================== + @SuppressWarnings("unchecked") void validate(DTO obj) { - PROPERTY value = this.getter.apply(obj); + PROPERTY value = (PROPERTY) this.getter.apply(obj); this.validator.validate(value); } @@ -150,6 +151,6 @@ abstract class PropertyValidator { Supplier exceptionSupplier) { return value -> exceptionSupplier.get(); } - + protected abstract THIS thisObject(); } diff --git a/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java index 77824e3..79863d1 100644 --- a/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java +++ b/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java @@ -13,7 +13,7 @@ import xyz.zhouxy.plusone.commons.util.RegexUtil; public class StringValidator extends PropertyValidator> { - StringValidator(Function getter) { + StringValidator(Function getter) { super(getter); }