From 40f30f88a1bf54462954221ffd49403f175389f0 Mon Sep 17 00:00:00 2001
From: ZhouXY108 <luquanlion@outlook.com>
Date: Thu, 5 Jan 2023 14:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |  2 +-
 .../zhouxy/plusone/validator/BoolValidator.java    |  2 +-
 .../plusone/validator/CollectionValidator.java     |  2 +-
 .../zhouxy/plusone/validator/DoubleValidator.java  |  2 +-
 .../xyz/zhouxy/plusone/validator/IntValidator.java |  2 +-
 .../zhouxy/plusone/validator/ObjectValidator.java  |  2 +-
 .../plusone/validator/PropertyValidator.java       | 10 +++++-----
 .../zhouxy/plusone/validator/StringValidator.java  |  2 +-
 .../plusone/validator/test/BaseValidatorTest.java  | 14 +++++---------
 9 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index acf1209..e394e82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>xyz.zhouxy.plusone</groupId>
   <artifactId>plusone-validator</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.1.1-SNAPSHOT</version>
 
   <name>plusone-validator</name>
   <url>http://zhouxy.xyz</url>
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java
index 37bc4ca..9912c37 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java
@@ -50,7 +50,7 @@ public class BoolValidator<DTO> extends PropertyValidator<DTO, Boolean, BoolVali
     }
     
     @Override
-    protected BoolValidator<DTO> returnThis() {
+    protected BoolValidator<DTO> thisObject() {
         return this;
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/CollectionValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/CollectionValidator.java
index f033c92..5a79048 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/CollectionValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/CollectionValidator.java
@@ -53,7 +53,7 @@ public class CollectionValidator<DTO, T> extends PropertyValidator<DTO, Collecti
     }
 
     @Override
-    protected CollectionValidator<DTO, T> returnThis() {
+    protected CollectionValidator<DTO, T> thisObject() {
         return this;
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java
index 3ad5173..4174e79 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java
@@ -29,7 +29,7 @@ public class DoubleValidator<DTO> extends PropertyValidator<DTO, Double, DoubleV
     }
 
     @Override
-    protected DoubleValidator<DTO> returnThis() {
+    protected DoubleValidator<DTO> thisObject() {
         return this;
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java
index 980726f..29fc24f 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java
@@ -29,7 +29,7 @@ public class IntValidator<DTO> extends PropertyValidator<DTO, Integer, IntValida
     }
 
     @Override
-    protected IntValidator<DTO> returnThis() {
+    protected IntValidator<DTO> thisObject() {
         return this;
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/ObjectValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/ObjectValidator.java
index 8e9cbc4..6f2de5f 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/ObjectValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/ObjectValidator.java
@@ -9,7 +9,7 @@ public class ObjectValidator<DTO, T> extends PropertyValidator<DTO, T, ObjectVal
     }
 
     @Override
-    protected ObjectValidator<DTO, T> returnThis() {
+    protected ObjectValidator<DTO, T> thisObject() {
         return this;
     }
 }
diff --git a/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java b/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java
index d1d8ec1..3ff1d79 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/PropertyValidator.java
@@ -47,7 +47,7 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
 
     public <E extends RuntimeException> THIS notNull(Function<PROPERTY, E> exceptionCreator) {
         withRule(Objects::nonNull, exceptionCreator);
-        return returnThis();
+        return thisObject();
     }
 
     // ====== isNull =====
@@ -62,7 +62,7 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
 
     public <E extends RuntimeException> THIS isNull(Function<PROPERTY, E> exceptionCreator) {
         withRule(Objects::isNull, exceptionCreator);
-        return returnThis();
+        return thisObject();
     }
 
     // ===== equals =====
@@ -83,7 +83,7 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
     public <E extends RuntimeException> THIS equalsThat(
             Object that, Function<PROPERTY, E> exceptionCreator) {
         withRule(value -> Objects.equals(value, that), exceptionCreator);
-        return returnThis();
+        return thisObject();
     }
 
     // ===== state =====
@@ -106,7 +106,7 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
             Predicate<PROPERTY> condition,
             Function<PROPERTY, E> exceptionCreator) {
         withRule(condition, exceptionCreator);
-        return returnThis();
+        return thisObject();
     }
 
     // ========================================================================
@@ -125,5 +125,5 @@ abstract class PropertyValidator<DTO, PROPERTY, THIS> {
         return value -> exceptionSupplier.get();
     }
     
-    protected abstract THIS returnThis();
+    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 ef9ecae..7e02756 100644
--- a/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java
+++ b/src/main/java/xyz/zhouxy/plusone/validator/StringValidator.java
@@ -173,7 +173,7 @@ public class StringValidator<DTO> extends PropertyValidator<DTO, String, StringV
     }
 
     @Override
-    protected StringValidator<DTO> returnThis() {
+    protected StringValidator<DTO> thisObject() {
         return this;
     }
 }
diff --git a/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java b/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java
index 8bb0f07..d9ffe81 100644
--- a/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java
+++ b/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java
@@ -8,15 +8,16 @@ import org.junit.Test;
 
 import xyz.zhouxy.plusone.constant.RegexConsts;
 import xyz.zhouxy.plusone.validator.BaseValidator;
-import xyz.zhouxy.plusone.validator.IValidateRequired;
+import xyz.zhouxy.plusone.validator.ValidateUtil;
 
 public class BaseValidatorTest {
     @Test
-    public void testRuleFor() {
+    public void testValidate() {
         RegisterCommand registerCommand = new RegisterCommand("zhouxy108", "luquanlion@outlook.com", "22336", "A1b2C3d4",
                 "A1b2C3d4",
                 Arrays.asList(new String[] { "admin", "editor" }));
-        registerCommand.validate();
+        RegisterCommandValidator.INSTANCE.validate(registerCommand);
+        ValidateUtil.validate(registerCommand, RegisterCommandValidator.INSTANCE);
         System.out.println(registerCommand);
     }
 }
@@ -50,7 +51,7 @@ class RegisterCommandValidator extends BaseValidator<RegisterCommand> {
 /**
  * RegisterCommand
  */
-class RegisterCommand implements IValidateRequired {
+class RegisterCommand {
 
     private String username;
     private String account;
@@ -59,11 +60,6 @@ class RegisterCommand implements IValidateRequired {
     private String password2;
     private List<String> roles;
 
-    @Override
-    public void validate() {
-        RegisterCommandValidator.INSTANCE.validate(this);
-    }
-
     public RegisterCommand() {
     }