From 0e2dc01cf73b417b2329e2d0fb74c2df143ad41d Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Thu, 26 Oct 2023 14:54:18 +0800
Subject: [PATCH] =?UTF-8?q?Function=20=E4=B8=8D=E9=99=90=E5=88=B6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=9A=84=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 .../java/xyz/zhouxy/plusone/validator/BaseValidator.java | 8 ++++----
 .../java/xyz/zhouxy/plusone/validator/BoolValidator.java | 2 +-
 .../xyz/zhouxy/plusone/validator/DoubleValidator.java    | 2 +-
 .../java/xyz/zhouxy/plusone/validator/IntValidator.java  | 2 +-
 .../xyz/zhouxy/plusone/validator/PropertyValidator.java  | 9 +++++----
 .../xyz/zhouxy/plusone/validator/StringValidator.java    | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12d02a5..76f910f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>xyz.zhouxy.plusone</groupId>
-  <artifactId>plusone-validator</artifactId>
+  <artifactId>plusone-validator-for-mfp</artifactId>
   <version>0.1.3-SNAPSHOT</version>
 
   <name>plusone-validator</name>
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<T> {
         return validValueHolder;
     }
 
-    protected final IntValidator<T> ruleForInt(Function<T, Integer> getter) {
+    protected final IntValidator<T> ruleForInt(Function<T, ?> getter) {
         IntValidator<T> validValueHolder = new IntValidator<>(getter);
         propertyValidators.add(validValueHolder);
         return validValueHolder;
     }
 
-    protected final DoubleValidator<T> ruleForDouble(Function<T, Double> getter) {
+    protected final DoubleValidator<T> ruleForDouble(Function<T, ?> getter) {
         DoubleValidator<T> validValueHolder = new DoubleValidator<>(getter);
         propertyValidators.add(validValueHolder);
         return validValueHolder;
     }
 
-    protected final BoolValidator<T> ruleForBool(Function<T, Boolean> getter) {
+    protected final BoolValidator<T> ruleForBool(Function<T, ?> getter) {
         BoolValidator<T> validValueHolder = new BoolValidator<>(getter);
         propertyValidators.add(validValueHolder);
         return validValueHolder;
     }
 
-    protected final StringValidator<T> ruleForString(Function<T, String> getter) {
+    protected final StringValidator<T> ruleForString(Function<T, ?> getter) {
         StringValidator<T> 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<DTO> extends PropertyValidator<DTO, Boolean, BoolValidator<DTO>> {
 
-    BoolValidator(Function<DTO, Boolean> getter) {
+    BoolValidator(Function<DTO, ?> 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<DTO> extends PropertyValidator<DTO, Double, DoubleValidator<DTO>> {
 
-    DoubleValidator(Function<DTO, Double> getter) {
+    DoubleValidator(Function<DTO, ?> 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<DTO> extends PropertyValidator<DTO, Integer, IntValidator<DTO>> {
 
-    IntValidator(Function<DTO, Integer> getter) {
+    IntValidator(Function<DTO, ?> 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<DTO, PROPERTY, THIS> {
-    Function<DTO, PROPERTY> getter;
+    Function<DTO, ?> getter;
     Validator<PROPERTY> validator = new Validator<>();
 
-    PropertyValidator(Function<DTO, PROPERTY> getter) {
+    PropertyValidator(Function<DTO, ?> getter) {
         this.getter = getter;
     }
 
@@ -137,8 +137,9 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
 
     // ========================================================================
 
+    @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<DTO, PROPERTY, THIS> {
             Supplier<E> 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<DTO> extends PropertyValidator<DTO, String, StringValidator<DTO>> {
 
-    StringValidator(Function<DTO, String> getter) {
+    StringValidator(Function<DTO, ?> getter) {
         super(getter);
     }