更新项目描述

原 `IntPropertyValidator`、`LongPropertyValidator` 和 `DoublePropertyValidator` 的
`between` 方法，使用“左闭右开”区间，但方法签名上并不明确，容易产生歧义。

现改为 `gt`（GreaterThan）、`ge`（GreaterThanOrEqualTo）、`lt`（LessThan）、`le`（LessThanOrEqualTo）。

.editorconfig

@@ -10,3 +10,6 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.{xml,yaml,yml}]
+indent_size = 2

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

plusone-validator/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>xyz.zhouxy.plusone</groupId>
+    <artifactId>plusone-validator-parent</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>plusone-validator</artifactId>
+  <name>plusone-validator</name>
+  <url>http://zhouxy.xyz</url>
+
+  <description>
+    Plusone Validator 是一个参数校验框架，可针对 DTO 创建对应的校验器，并复用该校验器实例，对 DTO 进行校验。
+  </description>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>xyz.zhouxy.plusone</groupId>
+      <artifactId>plusone-commons</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import com.google.common.collect.Range;
+
+public abstract
+class BaseComparablePropertyValidator<TObj,
+                                      TProperty extends Comparable<TProperty>,
+                                      TPropertyValidator extends BaseComparablePropertyValidator<TObj, TProperty, TPropertyValidator>>
+        extends BasePropertyValidator<TObj, TProperty, TPropertyValidator> {
+
+    BaseComparablePropertyValidator(Function<TObj, ? extends TProperty> getter) {
+        super(getter);
+    }
+
+    public TPropertyValidator inRange(Range<TProperty> range) {
+        withRule(value -> value != null && range.contains(value),
+                convertExceptionCreator("The value is not in " + range.toString()));
+        return thisObject();
+    }
+
+    public TPropertyValidator inRange(Range<TProperty> range, String errMsg) {
+        withRule(value -> value != null && range.contains(value), convertExceptionCreator(errMsg));
+        return thisObject();
+    }
+
+    public <E extends RuntimeException> TPropertyValidator inRange(
+            Range<TProperty> range,
+            Supplier<E> exceptionCreator) {
+        withRule(value -> value != null && range.contains(value), exceptionCreator);
+        return thisObject();
+    }
+
+    public <E extends RuntimeException> TPropertyValidator inRange(
+            Range<TProperty> range,
+            Function<TProperty, E> exceptionCreator) {
+        withRule(value -> value != null && range.contains(value), exceptionCreator);
+        return thisObject();
+    }
+
+    static <V> Function<V, IllegalArgumentException> convertExceptionCreator(String errMsg) {
+        return value -> new IllegalArgumentException(errMsg);
+    }
+
+    static <V, E extends RuntimeException> Function<V, E> convertExceptionCreator(Supplier<E> exceptionSupplier) {
+        return value -> exceptionSupplier.get();
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xyz.zhouxy.plusone.validator;
 
 import java.util.Collection;
@@ -113,46 +129,46 @@ public abstract class BasePropertyValidator< //
         return thisObject();
     }
 
-    // ===== isTrue =====
+    // ===== must =====
 
-    public TPropertyValidator isTrue(Predicate<? super TProperty> condition) {
+    public TPropertyValidator must(Predicate<? super TProperty> condition) {
-        return isTrue(condition, "无效的用户输入");
+        return must(condition, "无效的用户输入");
     }
 
-    public TPropertyValidator isTrue(Predicate<? super TProperty> condition, String errMsg) {
+    public TPropertyValidator must(Predicate<? super TProperty> condition, String errMsg) {
-        return isTrue(condition, convertExceptionCreator(errMsg));
+        return must(condition, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> TPropertyValidator isTrue(
+    public <E extends RuntimeException> TPropertyValidator must(
             Predicate<? super TProperty> condition,
             Supplier<E> exceptionCreator) {
-        return isTrue(condition, convertExceptionCreator(exceptionCreator));
+        return must(condition, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> TPropertyValidator isTrue(
+    public <E extends RuntimeException> TPropertyValidator must(
             Predicate<? super TProperty> condition,
             Function<TProperty, E> exceptionCreator) {
         withRule(condition, exceptionCreator);
         return thisObject();
     }
 
-    // ===== isTrue =====
+    // ===== must =====
 
-    public TPropertyValidator isTrue(Collection<Predicate<? super TProperty>> conditions) {
+    public TPropertyValidator must(Collection<Predicate<? super TProperty>> conditions) {
-        return isTrue(conditions, "无效的用户输入");
+        return must(conditions, "无效的用户输入");
     }
 
-    public TPropertyValidator isTrue(Collection<Predicate<? super TProperty>> conditions, String errMsg) {
+    public TPropertyValidator must(Collection<Predicate<? super TProperty>> conditions, String errMsg) {
-        return isTrue(conditions, convertExceptionCreator(errMsg));
+        return must(conditions, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> TPropertyValidator isTrue(
+    public <E extends RuntimeException> TPropertyValidator must(
             Collection<Predicate<? super TProperty>> conditions,
             Supplier<E> exceptionCreator) {
-        return isTrue(conditions, convertExceptionCreator(exceptionCreator));
+        return must(conditions, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> TPropertyValidator isTrue(
+    public <E extends RuntimeException> TPropertyValidator must(
             Collection<Predicate<? super TProperty>> conditions,
             Function<TProperty, E> exceptionCreator) {
         for (Predicate<? super TProperty> condition : conditions) {

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2022-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * BaseValidator
+ *
+ * <p>
+ * 校验器的基类
+ * </p>
+ *
+ * <p>
+ * <b>NOTE: content.</b>
+ * </p>
+ * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @since 0.0.1
+ */
+public abstract class BaseValidator<T> {
+    private final List<Consumer<? super T>> rules = new ArrayList<>();
+
+    protected void withRule(final Predicate<? super T> rule, final String errorMessage) {
+        withRule(rule, () -> new IllegalArgumentException(errorMessage));
+    }
+
+    protected <E extends RuntimeException> void withRule(Predicate<? super T> rule, Supplier<E> exceptionBuilder) {
+        withRule(rule, value -> exceptionBuilder.get());
+    }
+
+    protected <E extends RuntimeException> void withRule(
+            Predicate<? super T> condition, Function<T, E> exceptionBuilder) {
+        withRule(value -> {
+            if (!condition.test(value)) {
+                throw exceptionBuilder.apply(value);
+            }
+        });
+    }
+
+    protected void withRule(Consumer<? super T> rule) {
+        this.rules.add(rule);
+    }
+
+    protected final <R> ObjectPropertyValidator<T, R> ruleFor(Function<T, R> getter) {
+        ObjectPropertyValidator<T, R> validator = new ObjectPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final <R extends Comparable<R>> ComparablePropertyValidator<T, R> ruleForComparable(Function<T, R> getter) {
+        ComparablePropertyValidator<T, R> validator = new ComparablePropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final IntPropertyValidator<T> ruleForInt(Function<T, Integer> getter) {
+        IntPropertyValidator<T> validator = new IntPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final LongPropertyValidator<T> ruleForLong(Function<T, Long> getter) {
+        LongPropertyValidator<T> validator = new LongPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final DoublePropertyValidator<T> ruleForDouble(Function<T, Double> getter) {
+        DoublePropertyValidator<T> validator = new DoublePropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final BoolPropertyValidator<T> ruleForBool(Function<T, Boolean> getter) {
+        BoolPropertyValidator<T> validator = new BoolPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final StringPropertyValidator<T> ruleForString(Function<T, String> getter) {
+        StringPropertyValidator<T> validator = new StringPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    protected final <E> CollectionPropertyValidator<T, E> ruleForCollection(Function<T, Collection<E>> getter) {
+        CollectionPropertyValidator<T, E> validator = new CollectionPropertyValidator<>(getter);
+        this.rules.add(validator::validate);
+        return validator;
+    }
+
+    public void validate(T obj) {
+        this.rules.forEach(rule -> rule.accept(obj));
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class BoolPropertyValidator<DTO> extends BasePropertyValidator<DTO, Boolean, BoolPropertyValidator<DTO>> {
+
+    BoolPropertyValidator(Function<DTO, Boolean> getter) {
+        super(getter);
+    }
+
+    // ====== isTrueValue ======
+
+    public BoolPropertyValidator<DTO> isTrueValue() {
+        return isTrueValue("The value must be true.");
+    }
+
+    public BoolPropertyValidator<DTO> isTrueValue(String errMsg) {
+        return isTrueValue(convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> BoolPropertyValidator<DTO> isTrueValue(
+            Supplier<E> exceptionCreator) {
+        return isTrueValue(convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> BoolPropertyValidator<DTO> isTrueValue(
+            Function<Boolean, E> exceptionCreator) {
+        withRule(Boolean.TRUE::equals, exceptionCreator);
+        return this;
+    }
+
+    // ====== isFalseValue ======
+
+    public BoolPropertyValidator<DTO> isFalseValue() {
+        return isFalseValue("The value must be false.");
+    }
+
+    public BoolPropertyValidator<DTO> isFalseValue(String errMsg) {
+        return isFalseValue(convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> BoolPropertyValidator<DTO> isFalseValue(
+            Supplier<E> exceptionCreator) {
+        return isFalseValue(convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> BoolPropertyValidator<DTO> isFalseValue(
+            Function<Boolean, E> exceptionCreator) {
+        withRule(Boolean.FALSE::equals, exceptionCreator);
+        return this;
+    }
+
+    @Override
+    protected BoolPropertyValidator<DTO> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/CollectionPropertyValidator.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import xyz.zhouxy.plusone.commons.collection.CollectionTools;
+
+public class CollectionPropertyValidator<DTO, T>
+        extends BasePropertyValidator<DTO, Collection<T>, CollectionPropertyValidator<DTO, T>> {
+
+    CollectionPropertyValidator(Function<DTO, Collection<T>> getter) {
+        super(getter);
+    }
+
+    // ====== notEmpty =====
+
+    public CollectionPropertyValidator<DTO, T> notEmpty(String errMsg) {
+        return notEmpty(convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> CollectionPropertyValidator<DTO, T> notEmpty(Supplier<E> exceptionCreator) {
+        return notEmpty(convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> CollectionPropertyValidator<DTO, T> notEmpty(
+            Function<Collection<T>, E> exceptionCreator) {
+        withRule(CollectionTools::isNotEmpty, exceptionCreator);
+        return this;
+    }
+
+    // ====== isEmpty =====
+
+    public CollectionPropertyValidator<DTO, T> isEmpty(String errMsg) {
+        return isEmpty(convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> CollectionPropertyValidator<DTO, T> isEmpty(Supplier<E> exceptionCreator) {
+        return isEmpty(convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> CollectionPropertyValidator<DTO, T> isEmpty(
+            Function<Collection<T>, E> exceptionCreator) {
+        withRule(CollectionTools::isEmpty, exceptionCreator);
+        return this;
+    }
+
+    @Override
+    protected CollectionPropertyValidator<DTO, T> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+
+public class ComparablePropertyValidator<TObj, TProperty extends Comparable<TProperty>>
+        extends BaseComparablePropertyValidator<TObj, TProperty, ComparablePropertyValidator<TObj, TProperty>> {
+
+    ComparablePropertyValidator(Function<TObj, ? extends TProperty> getter) {
+        super(getter);
+    }
+
+    @Override
+    protected ComparablePropertyValidator<TObj, TProperty> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class DoublePropertyValidator<DTO>
+        extends BaseComparablePropertyValidator<DTO, Double, DoublePropertyValidator<DTO>> {
+
+    DoublePropertyValidator(Function<DTO, Double> getter) {
+        super(getter);
+    }
+
+    // ================================
+    // #region - greater than
+    // ================================
+
+    public DoublePropertyValidator<DTO> gt(double min) {
+        return gt(min, String.format("The value should be greater than %s", min));
+    }
+
+    public DoublePropertyValidator<DTO> gt(double min, String errMsg) {
+        return gt(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> gt(
+            double min, Supplier<E> exceptionCreator) {
+        return gt(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> gt(
+            double min, Function<Double, E> exceptionCreator) {
+        withRule(value -> (value != null && value > min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than
+    // ================================
+
+    // ================================
+    // #region - greater than or equal to
+    // ================================
+
+    public DoublePropertyValidator<DTO> ge(double min) {
+        return ge(min, String.format("The value should be greater than or equal to %s", min));
+    }
+
+    public DoublePropertyValidator<DTO> ge(double min, String errMsg) {
+        return ge(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> ge(
+            double min, Supplier<E> exceptionCreator) {
+        return ge(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> ge(
+            double min, Function<Double, E> exceptionCreator) {
+        withRule(value -> (value != null && value >= min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than or equal to
+    // ================================
+
+    // ================================
+    // #region - less than
+    // ================================
+
+    public DoublePropertyValidator<DTO> lt(double max) {
+        return lt(max, String.format("The value should be less than %s", max));
+    }
+
+    public DoublePropertyValidator<DTO> lt(double max, String errMsg) {
+        return lt(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> lt(
+            double max, Supplier<E> exceptionCreator) {
+        return lt(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> lt(
+            double max, Function<Double, E> exceptionCreator) {
+        withRule(value -> (value != null && value < max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than
+    // ================================
+
+    // ================================
+    // #region - less than or equal to
+    // ================================
+
+    public DoublePropertyValidator<DTO> le(double max) {
+        return le(max, String.format("The value should be less than or equal to %s", max));
+    }
+
+    public DoublePropertyValidator<DTO> le(double max, String errMsg) {
+        return le(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> le(
+            double max, Supplier<E> exceptionCreator) {
+        return le(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> DoublePropertyValidator<DTO> le(
+            double max, Function<Double, E> exceptionCreator) {
+        withRule(value -> (value != null && value <= max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than or equal to
+    // ================================
+
+    @Override
+    protected DoublePropertyValidator<DTO> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+/**
+ * 自带校验方法，校验不通过时直接抛异常。
+ *
+ * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
+ *
+ * @see ValidTools
+ * @see BaseValidator
+ */
+public interface IValidateRequired {
+    void validate();
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class IntPropertyValidator<DTO>
+        extends BaseComparablePropertyValidator<DTO, Integer, IntPropertyValidator<DTO>> {
+
+    IntPropertyValidator(Function<DTO, Integer> getter) {
+        super(getter);
+    }
+
+    // ================================
+    // #region - greater than
+    // ================================
+
+    public IntPropertyValidator<DTO> gt(int min) {
+        return gt(min, String.format("The value should be greater than %d", min));
+    }
+
+    public IntPropertyValidator<DTO> gt(int min, String errMsg) {
+        return gt(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> gt(
+            int min, Supplier<E> exceptionCreator) {
+        return gt(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> gt(
+            int min, Function<Integer, E> exceptionCreator) {
+        withRule(value -> (value != null && value > min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than
+    // ================================
+
+    // ================================
+    // #region - greater than or equal to
+    // ================================
+
+    public IntPropertyValidator<DTO> ge(int min) {
+        return ge(min, String.format("The value should be greater than or equal to %d", min));
+    }
+
+    public IntPropertyValidator<DTO> ge(int min, String errMsg) {
+        return ge(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> ge(
+            int min, Supplier<E> exceptionCreator) {
+        return ge(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> ge(
+            int min, Function<Integer, E> exceptionCreator) {
+        withRule(value -> (value != null && value >= min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than or equal to
+    // ================================
+
+    // ================================
+    // #region - less than
+    // ================================
+
+    public IntPropertyValidator<DTO> lt(int max) {
+        return lt(max, String.format("The value should be less than %d", max));
+    }
+
+    public IntPropertyValidator<DTO> lt(int max, String errMsg) {
+        return lt(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> lt(
+            int max, Supplier<E> exceptionCreator) {
+        return lt(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> lt(
+            int max, Function<Integer, E> exceptionCreator) {
+        withRule(value -> (value != null && value < max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than
+    // ================================
+
+    // ================================
+    // #region - less than or equal to
+    // ================================
+
+    public IntPropertyValidator<DTO> le(int max) {
+        return le(max, String.format("The value should be less than or equal to %d", max));
+    }
+
+    public IntPropertyValidator<DTO> le(int max, String errMsg) {
+        return le(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> le(
+            int max, Supplier<E> exceptionCreator) {
+        return le(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> IntPropertyValidator<DTO> le(
+            int max, Function<Integer, E> exceptionCreator) {
+        withRule(value -> (value != null && value <= max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than or equal to
+    // ================================
+
+    @Override
+    protected IntPropertyValidator<DTO> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class LongPropertyValidator<DTO>
+        extends BaseComparablePropertyValidator<DTO, Long, LongPropertyValidator<DTO>> {
+
+    LongPropertyValidator(Function<DTO, Long> getter) {
+        super(getter);
+    }
+
+    // ================================
+    // #region - greater than
+    // ================================
+
+    public LongPropertyValidator<DTO> gt(long min) {
+        return gt(min, String.format("The value should be greater than %d", min));
+    }
+
+    public LongPropertyValidator<DTO> gt(long min, String errMsg) {
+        return gt(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> gt(
+            long min, Supplier<E> exceptionCreator) {
+        return gt(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> gt(
+            long min, Function<Long, E> exceptionCreator) {
+        withRule(value -> (value != null && value > min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than
+    // ================================
+
+    // ================================
+    // #region - greater than or equal to
+    // ================================
+
+    public LongPropertyValidator<DTO> ge(long min) {
+        return ge(min, String.format("The value should be greater than or equal to %d", min));
+    }
+
+    public LongPropertyValidator<DTO> ge(long min, String errMsg) {
+        return ge(min, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> ge(
+            long min, Supplier<E> exceptionCreator) {
+        return ge(min, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> ge(
+            long min, Function<Long, E> exceptionCreator) {
+        withRule(value -> (value != null && value >= min), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - greater than or equal to
+    // ================================
+
+    // ================================
+    // #region - less than
+    // ================================
+
+    public LongPropertyValidator<DTO> lt(long max) {
+        return lt(max, String.format("The value should be less than %d", max));
+    }
+
+    public LongPropertyValidator<DTO> lt(long max, String errMsg) {
+        return lt(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> lt(
+            long max, Supplier<E> exceptionCreator) {
+        return lt(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> lt(
+            long max, Function<Long, E> exceptionCreator) {
+        withRule(value -> (value != null && value < max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than
+    // ================================
+
+    // ================================
+    // #region - less than or equal to
+    // ================================
+
+    public LongPropertyValidator<DTO> le(long max) {
+        return le(max, String.format("The value should be less than or equal to %d", max));
+    }
+
+    public LongPropertyValidator<DTO> le(long max, String errMsg) {
+        return le(max, convertExceptionCreator(errMsg));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> le(
+            long max, Supplier<E> exceptionCreator) {
+        return le(max, convertExceptionCreator(exceptionCreator));
+    }
+
+    public <E extends RuntimeException> LongPropertyValidator<DTO> le(
+            long max, Function<Long, E> exceptionCreator) {
+        withRule(value -> (value != null && value <= max), exceptionCreator);
+        return this;
+    }
+
+    // ================================
+    // #endregion - less than or equal to
+    // ================================
+
+    @Override
+    protected LongPropertyValidator<DTO> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xyz.zhouxy.plusone.validator;
 
 import java.util.Arrays;
@@ -43,31 +59,31 @@ public abstract class MapValidator<K, V> extends BaseValidator<Map<K, V>> {
 
     // ========== ruleFor ==========
 
-    protected final ObjectValidator<Map<K, V>, V> ruleFor(K key) {
+    protected final ObjectPropertyValidator<Map<K, V>, V> ruleFor(K key) {
         return ruleFor(m -> m.get(key));
     }
 
-    protected final IntValidator<Map<K, V>> ruleForInt(K key) {
+    protected final IntPropertyValidator<Map<K, V>> ruleForInt(K key) {
         return ruleForInt(m -> (Integer) m.get(key));
     }
 
-    protected final LongValidator<Map<K, V>> ruleForLong(K key) {
+    protected final LongPropertyValidator<Map<K, V>> ruleForLong(K key) {
         return ruleForLong(m -> (Long) m.get(key));
     }
 
-    protected final DoubleValidator<Map<K, V>> ruleForDouble(K key) {
+    protected final DoublePropertyValidator<Map<K, V>> ruleForDouble(K key) {
         return ruleForDouble(m -> (Double) m.get(key));
     }
 
-    protected final BoolValidator<Map<K, V>> ruleForBool(K key) {
+    protected final BoolPropertyValidator<Map<K, V>> ruleForBool(K key) {
         return ruleForBool(m -> (Boolean) m.get(key));
     }
 
-    protected final StringValidator<Map<K, V>> ruleForString(K key) {
+    protected final StringPropertyValidator<Map<K, V>> ruleForString(K key) {
         return ruleForString(m -> (String) m.get(key));
     }
 
-    protected final <E> CollectionValidator<Map<K, V>, E> ruleForCollection(K key) {
+    protected final <E> CollectionPropertyValidator<Map<K, V>, E> ruleForCollection(K key) {
         @SuppressWarnings("unchecked")
         Function<Map<K, V>, Collection<E>> getter = m -> (Collection<E>) m.get(key);
         return ruleForCollection(getter);

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ObjectPropertyValidator.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.validator;
+
+import java.util.function.Function;
+
+public class ObjectPropertyValidator<DTO, T> extends BasePropertyValidator<DTO, T, ObjectPropertyValidator<DTO, T>> {
+
+    ObjectPropertyValidator(Function<DTO, T> getter) {
+        super(getter);
+    }
+
+    @Override
+    protected ObjectPropertyValidator<DTO, T> thisObject() {
+        return this;
+    }
+}

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xyz.zhouxy.plusone.validator;
 
 import java.util.Collection;
@@ -6,13 +22,15 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
+import com.google.common.base.Strings;
+
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.commons.util.AssertTools;
 import xyz.zhouxy.plusone.commons.util.RegexTools;
 import xyz.zhouxy.plusone.commons.util.StringTools;
 
 /**
- * StringValidator
+ * StringPropertyValidator
  *
  * <p>
  * 针对文本字段的验证器。
@@ -20,9 +38,9 @@ import xyz.zhouxy.plusone.commons.util.StringTools;
  *
  * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
  */
-public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, StringValidator<DTO>> {
+public class StringPropertyValidator<DTO> extends BaseComparablePropertyValidator<DTO, String, StringPropertyValidator<DTO>> {
 
-    StringValidator(Function<DTO, String> getter) {
+    StringPropertyValidator(Function<DTO, String> getter) {
         super(getter);
     }
 
@@ -30,17 +48,17 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - matches
     // ================================
 
-    public StringValidator<DTO> matches(Pattern regex, String errMsg) {
+    public StringPropertyValidator<DTO> matches(Pattern regex, String errMsg) {
         return matches(regex, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matches(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matches(
             Pattern regex,
             Supplier<E> exceptionCreator) {
         return matches(regex, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matches(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matches(
             Pattern regex,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexTools.matches(input, regex), exceptionCreator);
@@ -55,34 +73,34 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - matchesOne
     // ================================
 
-    public StringValidator<DTO> matchesOne(Pattern[] regexs, String errMsg) {
+    public StringPropertyValidator<DTO> matchesOne(Pattern[] regexs, String errMsg) {
         return matchesOne(regexs, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesOne(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesOne(
             Pattern[] regexs,
             Supplier<E> exceptionCreator) {
         return matchesOne(regexs, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesOne(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesOne(
             Pattern[] regexs,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexTools.matchesOne(input, regexs), exceptionCreator);
         return this;
     }
 
-    public StringValidator<DTO> matchesOne(List<Pattern> regexs, String errMsg) {
+    public StringPropertyValidator<DTO> matchesOne(List<Pattern> regexs, String errMsg) {
         return matchesOne(regexs, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesOne(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesOne(
             List<Pattern> regexs,
             Supplier<E> exceptionCreator) {
         return matchesOne(regexs, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesOne(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesOne(
             List<Pattern> regexs,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexTools.matchesOne(input, regexs.toArray(new Pattern[regexs.size()])), exceptionCreator);
@@ -97,34 +115,34 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - matchesAll
     // ================================
 
-    public StringValidator<DTO> matchesAll(Pattern[] regexs, String errMsg) {
+    public StringPropertyValidator<DTO> matchesAll(Pattern[] regexs, String errMsg) {
         return matchesAll(regexs, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesAll(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesAll(
             Pattern[] regexs,
             Supplier<E> exceptionCreator) {
         return matchesAll(regexs, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesAll(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesAll(
             Pattern[] regexs,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexTools.matchesAll(input, regexs), exceptionCreator);
         return this;
     }
 
-    public StringValidator<DTO> matchesAll(Collection<Pattern> regexs, String errMsg) {
+    public StringPropertyValidator<DTO> matchesAll(Collection<Pattern> regexs, String errMsg) {
         return matchesAll(regexs, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesAll(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesAll(
             Collection<Pattern> regexs,
             Supplier<E> exceptionCreator) {
         return matchesAll(regexs, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> matchesAll(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> matchesAll(
             Collection<Pattern> regexs,
             Function<String, E> exceptionCreator) {
         withRule(input -> RegexTools.matchesAll(input, regexs.toArray(new Pattern[regexs.size()])), exceptionCreator);
@@ -139,19 +157,19 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - notBlank
     // ================================
 
-    public StringValidator<DTO> notBlank() {
+    public StringPropertyValidator<DTO> notBlank() {
         return notBlank("This String argument must have text; it must not be null, empty, or blank");
     }
 
-    public StringValidator<DTO> notBlank(String errMsg) {
+    public StringPropertyValidator<DTO> notBlank(String errMsg) {
         return notBlank(convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> notBlank(Supplier<E> exceptionCreator) {
+    public <E extends RuntimeException> StringPropertyValidator<DTO> notBlank(Supplier<E> exceptionCreator) {
         return notBlank(convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> notBlank(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> notBlank(
             Function<String, E> exceptionCreator) {
         withRule(StringTools::isNotBlank, exceptionCreator);
         return this;
@@ -162,43 +180,44 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // ================================
 
     // ================================
-    // #region - email
+    // #region - emailAddress
     // ================================
 
-    public StringValidator<DTO> email() {
+    public StringPropertyValidator<DTO> emailAddress() {
-        return email("The value is not an email address.");
+        return emailAddress("The value is not an email address.");
     }
 
-    public StringValidator<DTO> email(String errMsg) {
+    public StringPropertyValidator<DTO> emailAddress(String errMsg) {
-        return email(convertExceptionCreator(errMsg));
+        return emailAddress(convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> email(Supplier<E> exceptionCreator) {
+    public <E extends RuntimeException> StringPropertyValidator<DTO> emailAddress(
-        return email(convertExceptionCreator(exceptionCreator));
+            Supplier<E> exceptionCreator) {
+        return emailAddress(convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> email(Function<String, E> exceptionCreator) {
+    public <E extends RuntimeException> StringPropertyValidator<DTO> emailAddress(
-        // TODO [优化] 优化 email 校验
+            Function<String, E> exceptionCreator) {
         return matches(PatternConsts.EMAIL, exceptionCreator);
     }
 
     // ================================
-    // #endregion - email
+    // #endregion - emailAddress
     // ================================
 
     // ================================
     // #region - notEmpty
     // ================================
 
-    public StringValidator<DTO> notEmpty(String errMsg) {
+    public StringPropertyValidator<DTO> notEmpty(String errMsg) {
         return notEmpty(convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> notEmpty(Supplier<E> exceptionCreator) {
+    public <E extends RuntimeException> StringPropertyValidator<DTO> notEmpty(Supplier<E> exceptionCreator) {
         return notEmpty(convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> notEmpty(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> notEmpty(
             Function<String, E> exceptionCreator) {
         withRule(s -> s != null && !s.isEmpty(), exceptionCreator);
         return this;
@@ -212,17 +231,17 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - isNullOrEmpty
     // ================================
 
-    public StringValidator<DTO> isNullOrEmpty(String errMsg) {
+    public StringPropertyValidator<DTO> isNullOrEmpty(String errMsg) {
         return isNullOrEmpty(convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> isNullOrEmpty(Supplier<E> exceptionCreator) {
+    public <E extends RuntimeException> StringPropertyValidator<DTO> isNullOrEmpty(Supplier<E> exceptionCreator) {
         return isNullOrEmpty(convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> isNullOrEmpty(
+    public <E extends RuntimeException> StringPropertyValidator<DTO> isNullOrEmpty(
             Function<String, E> exceptionCreator) {
-        withRule(s -> s == null || s.isEmpty(), exceptionCreator);
+        withRule(Strings::isNullOrEmpty, exceptionCreator);
         return this;
     }
 
@@ -234,18 +253,19 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // #region - length
     // ================================
 
-    public StringValidator<DTO> length(int length, String errMsg) {
+    public StringPropertyValidator<DTO> length(int length, String errMsg) {
         return length(length, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> length(int length,
+    public <E extends RuntimeException> StringPropertyValidator<DTO> length(int length,
             Supplier<E> exceptionCreator) {
         return length(length, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> length(int length,
+    public <E extends RuntimeException> StringPropertyValidator<DTO> length(int length,
             Function<String, E> exceptionCreator) {
-        AssertTools.checkArgument(length >= 0, "The minimum value must be less than the maximum value.");
+        AssertTools.checkArgument(length >= 0,
+                "The required length must be greater than or equal to 0.");
         withRule(s -> s != null && s.length() == length, exceptionCreator);
         return this;
     }
@@ -258,16 +278,16 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
         return len >= min && len < max;
     }
 
-    public StringValidator<DTO> length(int min, int max, String errMsg) {
+    public StringPropertyValidator<DTO> length(int min, int max, String errMsg) {
         return length(min, max, convertExceptionCreator(errMsg));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> length(int min, int max,
+    public <E extends RuntimeException> StringPropertyValidator<DTO> length(int min, int max,
             Supplier<E> exceptionCreator) {
         return length(min, max, convertExceptionCreator(exceptionCreator));
     }
 
-    public <E extends RuntimeException> StringValidator<DTO> length(int min, int max,
+    public <E extends RuntimeException> StringPropertyValidator<DTO> length(int min, int max,
             Function<String, E> exceptionCreator) {
         AssertTools.checkArgument(min >= 0, "The minimum value must be greater than equal to 0.");
         AssertTools.checkArgument(min < max, "The minimum value must be less than the maximum value.");
@@ -280,7 +300,7 @@ public class StringValidator<DTO> extends ValidatorOfComparable<DTO, String, Str
     // ================================
 
     @Override
-    protected StringValidator<DTO> thisObject() {
+    protected StringPropertyValidator<DTO> thisObject() {
         return this;
     }
 }

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ValidTools.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xyz.zhouxy.plusone.validator;
 
 /**

plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/Validator.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package xyz.zhouxy.plusone.validator;
 
 import java.util.function.Consumer;

plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/map/test/MapValidatorTests.java

@@ -8,13 +8,12 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
+import xyz.zhouxy.plusone.commons.util.StringTools;
 import xyz.zhouxy.plusone.validator.MapValidator;
 
-public //
 class MapValidatorTests {
 
     private static final MapValidator<String, Object> validator = ParamsValidator.INSTANCE;
@@ -72,15 +71,16 @@ class ParamsValidator extends MapValidator<String, Object> {
 
         ruleForInt(AGE)
                 .withRule(Objects::nonNull)
-                .between(18, 61);
+                .ge(18)
+                .le(60);
 
         ruleForBool(BOOLEAN)
                 .notNull("Boolean property could not be null.")
-                .isTrue("Boolean property must be true.");
+                .isTrueValue("Boolean property must be true.");
 
         this.<String>ruleForCollection(ROLE_LIST)
                 .notEmpty("角色列表不能为空！")
-                .withRule(l -> l.stream().allMatch(StringUtils::isNotBlank),
+                .withRule(l -> l.stream().allMatch(StringTools::isNotBlank),
                         () -> new IllegalArgumentException("角色标识不能为空！"));
     }
 }

plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/BaseValidatorTest.java

@@ -5,7 +5,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Range;
@@ -13,6 +12,7 @@ import com.google.common.collect.Range;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.commons.function.PredicateTools;
 import xyz.zhouxy.plusone.commons.util.RegexTools;
+import xyz.zhouxy.plusone.commons.util.StringTools;
 import xyz.zhouxy.plusone.validator.BaseValidator;
 import xyz.zhouxy.plusone.validator.ValidTools;
 
@@ -37,9 +37,9 @@ class BaseValidatorTest {
            int thisYear = Year.now().getValue();
 
             ruleForString(RegisterCommand::getUsername)
-                    .isTrue(PredicateTools.<String>from(Objects::nonNull)
+                    .must(PredicateTools.<String>from(Objects::nonNull)
-                            .and(StringUtils::isNotEmpty)
+                            .and(StringTools::isNotEmpty)
-                            .and(StringUtils::isNotBlank)
+                            .and(StringTools::isNotBlank)
                             .and(username -> RegexTools.matches(username, PatternConsts.USERNAME)),
                             username -> new IllegalArgumentException(String.format("用户名【%s】不符合规范", username)));
             ruleForString(RegisterCommand::getAccount)
@@ -56,11 +56,11 @@ class BaseValidatorTest {
 
             ruleForComparable(RegisterCommand::getYearOfBirth)
                     .notNull()
-                    .between(Range.closed(thisYear - 60, thisYear - 18));
+                    .inRange(Range.closed(thisYear - 60, thisYear - 18));
 
             ruleForInt(RegisterCommand::getYearOfBirth)
                     .notNull()
-                    .between(Range.closed(thisYear - 60, thisYear - 18));
+                    .inRange(Range.closed(thisYear - 60, thisYear - 18));
 
             withRule(registerCommand -> Objects.equals(registerCommand.getPassword(), registerCommand.getPassword2()),
                     "两次输入的密码不一致");

plusone-validator/src/test/java/xyz/zhouxy/plusone/validator/test/ValidatorTests.java

@@ -7,13 +7,13 @@ import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
 import xyz.zhouxy.plusone.commons.collection.CollectionTools;
 import xyz.zhouxy.plusone.commons.function.PredicateTools;
 import xyz.zhouxy.plusone.commons.util.AssertTools;
 import xyz.zhouxy.plusone.commons.util.RegexTools;
+import xyz.zhouxy.plusone.commons.util.StringTools;
 import xyz.zhouxy.plusone.validator.Validator;
 
 class ValidatorTests {
@@ -29,8 +29,8 @@ class ValidatorTests {
                 .addRule(command -> {
                     String username = command.getUsername();
                     return Objects.nonNull(username)
-                            && StringUtils.isNotEmpty(username)
+                            && StringTools.isNotEmpty(username)
-                            && StringUtils.isNotBlank(username)
+                            && StringTools.isNotBlank(username)
                             && RegexTools.matches(username, USERNAME);
                 }, command -> new IllegalArgumentException(String.format("用户名【%s】不符合规范", command.getUsername())))
                 // 传入 predicate 和 error message
@@ -48,7 +48,7 @@ class ValidatorTests {
                 // 传入 rule
                 .addRule(command -> {
                     String password = command.getPassword();
-                    AssertTools.checkArgument(StringUtils.isNotEmpty(password), "密码不能为空");
+                    AssertTools.checkArgument(StringTools.isNotEmpty(password), "密码不能为空");
                     AssertTools.checkArgument(RegexTools.matches(password, PASSWORD), "密码不符合规范");
                 })
                 // 传入 predicate 和 Supplier<E extends RuntimeException>

pom.xml

@@ -5,37 +5,37 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>xyz.zhouxy.plusone</groupId>
-  <artifactId>plusone-validator</artifactId>
+  <artifactId>plusone-validator-parent</artifactId>
-  <version>0.1.6-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
-  <name>plusone-validator</name>
+  <name>plusone-validator-parent</name>
   <url>http://zhouxy.xyz</url>
 
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>plusone-validator</module>
+  </modules>
+
+  <description>
+    Plusone Validator 是一个校验库，用于构建校验规则对对象（尤其是入参）进行校验。API 参考自 .NET 的 FluentValidation。
+  </description>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
 
+  <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>xyz.zhouxy.plusone</groupId>
-      <artifactId>plusone-commons</artifactId>
+        <artifactId>plusone-dependencies</artifactId>
-      <version>1.0.0-RC3</version>
+        <version>1.1.0-SNAPSHOT</version>
-    </dependency>
+        <type>pom</type>
-    <dependency>
+        <scope>import</scope>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.2</version>
-      <scope>test</scope>
       </dependency>
     </dependencies>
+  </dependencyManagement>
 
   <build>
     <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->

src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java

@@ -1,99 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
-/**
- * BaseValidator
- *
- * <p>
- * 校验器的基类
- * </p>
- *
- * <p>
- * <b>NOTE: content.</b>
- * </p>
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.0.1
- */
-public abstract class BaseValidator<T> {
-    private final List<Consumer<? super T>> rules = new ArrayList<>();
-
-    protected void withRule(final Predicate<? super T> rule, final String errorMessage) {
-        withRule(rule, () -> new IllegalArgumentException(errorMessage));
-    }
-
-    protected <E extends RuntimeException> void withRule(Predicate<? super T> rule, Supplier<E> exceptionBuilder) {
-        withRule(rule, value -> exceptionBuilder.get());
-    }
-
-    protected <E extends RuntimeException> void withRule(
-            Predicate<? super T> condition, Function<T, E> exceptionBuilder) {
-        withRule(value -> {
-            if (!condition.test(value)) {
-                throw exceptionBuilder.apply(value);
-            }
-        });
-    }
-
-    protected void withRule(Consumer<? super T> rule) {
-        this.rules.add(rule);
-    }
-
-    protected final <R> ObjectValidator<T, R> ruleFor(Function<T, R> getter) {
-        ObjectValidator<T, R> validator = new ObjectValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final <R extends Comparable<R>> DefaultValidatorOfComparable<T, R> ruleForComparable(Function<T, R> getter) {
-        DefaultValidatorOfComparable<T, R> validator = new DefaultValidatorOfComparable<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final IntValidator<T> ruleForInt(Function<T, Integer> getter) {
-        IntValidator<T> validator = new IntValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final LongValidator<T> ruleForLong(Function<T, Long> getter) {
-        LongValidator<T> validator = new LongValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final DoubleValidator<T> ruleForDouble(Function<T, Double> getter) {
-        DoubleValidator<T> validator = new DoubleValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final BoolValidator<T> ruleForBool(Function<T, Boolean> getter) {
-        BoolValidator<T> validator = new BoolValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final StringValidator<T> ruleForString(Function<T, String> getter) {
-        StringValidator<T> validator = new StringValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    protected final <E> CollectionValidator<T, E> ruleForCollection(Function<T, Collection<E>> getter) {
-        CollectionValidator<T, E> validator = new CollectionValidator<>(getter);
-        this.rules.add(validator::validate);
-        return validator;
-    }
-
-    public void validate(T obj) {
-        this.rules.forEach(rule -> rule.accept(obj));
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/BoolValidator.java

@@ -1,56 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public class BoolValidator<DTO> extends BasePropertyValidator<DTO, Boolean, BoolValidator<DTO>> {
-
-    BoolValidator(Function<DTO, Boolean> getter) {
-        super(getter);
-    }
-
-    // ====== isTrue ======
-
-    public BoolValidator<DTO> isTrue() {
-        return isTrue("The value must be true.");
-    }
-
-    public BoolValidator<DTO> isTrue(String errMsg) {
-        return isTrue(convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> BoolValidator<DTO> isTrue(Supplier<E> exceptionCreator) {
-        return isTrue(convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> BoolValidator<DTO> isTrue(
-            Function<Boolean, E> exceptionCreator) {
-        withRule(Boolean.TRUE::equals, exceptionCreator);
-        return this;
-    }
-
-    // ====== isFalse ======
-
-    public BoolValidator<DTO> isFalse() {
-        return isFalse("The value must be false.");
-    }
-
-    public BoolValidator<DTO> isFalse(String errMsg) {
-        return isFalse(convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> BoolValidator<DTO> isFalse(Supplier<E> exceptionCreator) {
-        return isFalse(convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> BoolValidator<DTO> isFalse(
-            Function<Boolean, E> exceptionCreator) {
-        withRule(Boolean.FALSE::equals, exceptionCreator);
-        return this;
-    }
-
-    @Override
-    protected BoolValidator<DTO> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/CollectionValidator.java

@@ -1,52 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.Collection;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import xyz.zhouxy.plusone.commons.collection.CollectionTools;
-
-public class CollectionValidator<DTO, T>
-        extends BasePropertyValidator<DTO, Collection<T>, CollectionValidator<DTO, T>> {
-
-    CollectionValidator(Function<DTO, Collection<T>> getter) {
-        super(getter);
-    }
-
-    // ====== notEmpty =====
-
-    public CollectionValidator<DTO, T> notEmpty(String errMsg) {
-        return notEmpty(convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> CollectionValidator<DTO, T> notEmpty(Supplier<E> exceptionCreator) {
-        return notEmpty(convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> CollectionValidator<DTO, T> notEmpty(
-            Function<Collection<T>, E> exceptionCreator) {
-        withRule(CollectionTools::isNotEmpty, exceptionCreator);
-        return this;
-    }
-
-    // ====== isEmpty =====
-
-    public CollectionValidator<DTO, T> isEmpty(String errMsg) {
-        return isEmpty(convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> CollectionValidator<DTO, T> isEmpty(Supplier<E> exceptionCreator) {
-        return isEmpty(convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> CollectionValidator<DTO, T> isEmpty(
-            Function<Collection<T>, E> exceptionCreator) {
-        withRule(CollectionTools::isEmpty, exceptionCreator);
-        return this;
-    }
-
-    @Override
-    protected CollectionValidator<DTO, T> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/DefaultValidatorOfComparable.java

@@ -1,18 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-
-public class DefaultValidatorOfComparable<
-        TObj,
-        TProperty extends Comparable<TProperty>
-    > extends ValidatorOfComparable<TObj, TProperty, DefaultValidatorOfComparable<TObj, TProperty>> {
-
-    DefaultValidatorOfComparable(Function<TObj, ? extends TProperty> getter) {
-        super(getter);
-    }
-
-    @Override
-    protected DefaultValidatorOfComparable<TObj, TProperty> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/DoubleValidator.java

@@ -1,35 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public class DoubleValidator<DTO> extends ValidatorOfComparable<DTO, Double, DoubleValidator<DTO>> {
-
-    DoubleValidator(Function<DTO, Double> getter) {
-        super(getter);
-    }
-
-    public DoubleValidator<DTO> between(double min, double max) {
-        return between(min, max, String.format("数值不在 %s 和 %s 之间", String.valueOf(min), String.valueOf(max)));
-    }
-
-    public DoubleValidator<DTO> between(double min, double max, String errMsg) {
-        return between(min, max, convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> DoubleValidator<DTO> between(double min, double max,
-            Supplier<E> exceptionCreator) {
-        return between(min, max, convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> DoubleValidator<DTO> between(double min, double max,
-            Function<Double, E> exceptionCreator) {
-        withRule(value -> (value >= min && value < max), exceptionCreator);
-        return this;
-    }
-
-    @Override
-    protected DoubleValidator<DTO> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java

@@ -1,13 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-/**
- * 自带校验方法，校验不通过时直接抛异常。
- *
- * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
- *
- * @see ValidTools
- * @see BaseValidator
- */
-public interface IValidateRequired {
-    void validate();
-}

src/main/java/xyz/zhouxy/plusone/validator/IntValidator.java

@@ -1,35 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public class IntValidator<DTO> extends ValidatorOfComparable<DTO, Integer, IntValidator<DTO>> {
-
-    IntValidator(Function<DTO, Integer> getter) {
-        super(getter);
-    }
-
-    public IntValidator<DTO> between(int min, int max) {
-        return between(min, max, String.format("数值不在 %d 和 %d 之间", min, max));
-    }
-
-    public IntValidator<DTO> between(int min, int max, String errMsg) {
-        return between(min, max, convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> IntValidator<DTO> between(int min, int max,
-            Supplier<E> exceptionCreator) {
-        return between(min, max, convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> IntValidator<DTO> between(int min, int max,
-            Function<Integer, E> exceptionCreator) {
-        withRule(value -> (value >= min && value < max), exceptionCreator);
-        return this;
-    }
-
-    @Override
-    protected IntValidator<DTO> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/LongValidator.java

@@ -1,35 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-public class LongValidator<DTO> extends ValidatorOfComparable<DTO, Long, LongValidator<DTO>> {
-
-    LongValidator(Function<DTO, Long> getter) {
-        super(getter);
-    }
-
-    public LongValidator<DTO> between(long min, long max) {
-        return between(min, max, String.format("数值不在 %d 和 %d 之间", min, max));
-    }
-
-    public LongValidator<DTO> between(long min, long max, String errMsg) {
-        return between(min, max, convertExceptionCreator(errMsg));
-    }
-
-    public <E extends RuntimeException> LongValidator<DTO> between(long min, long max,
-            Supplier<E> exceptionCreator) {
-        return between(min, max, convertExceptionCreator(exceptionCreator));
-    }
-
-    public <E extends RuntimeException> LongValidator<DTO> between(long min, long max,
-            Function<Long, E> exceptionCreator) {
-        withRule(value -> (value >= min && value < max), exceptionCreator);
-        return this;
-    }
-
-    @Override
-    protected LongValidator<DTO> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/ObjectValidator.java

@@ -1,15 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-
-public class ObjectValidator<DTO, T> extends BasePropertyValidator<DTO, T, ObjectValidator<DTO, T>> {
-
-    ObjectValidator(Function<DTO, T> getter) {
-        super(getter);
-    }
-
-    @Override
-    protected ObjectValidator<DTO, T> thisObject() {
-        return this;
-    }
-}

src/main/java/xyz/zhouxy/plusone/validator/ValidatorOfComparable.java

@@ -1,49 +0,0 @@
-package xyz.zhouxy.plusone.validator;
-
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import com.google.common.collect.Range;
-
-public abstract class ValidatorOfComparable<
-        TObj,
-        TProperty extends Comparable<TProperty>,
-        TPropertyValidator extends ValidatorOfComparable<TObj, TProperty, TPropertyValidator>
-    > extends BasePropertyValidator<TObj, TProperty, TPropertyValidator> {
-
-    ValidatorOfComparable(Function<TObj, ? extends TProperty> getter) {
-        super(getter);
-    }
-
-    public TPropertyValidator between(Range<TProperty> range) {
-        withRule(range::contains, convertExceptionCreator("The value is not in " + range.toString()));
-        return thisObject();
-    }
-
-    public TPropertyValidator between(Range<TProperty> range, String errMsg) {
-        withRule(range::contains, convertExceptionCreator(errMsg));
-        return thisObject();
-    }
-
-    public <E extends RuntimeException> TPropertyValidator between(
-            Range<TProperty> range,
-            Supplier<E> exceptionCreator) {
-        withRule(range::contains, exceptionCreator);
-        return thisObject();
-    }
-
-    public <E extends RuntimeException> TPropertyValidator between(
-            Range<TProperty> range,
-            Function<TProperty, E> exceptionCreator) {
-        withRule(range::contains, exceptionCreator);
-        return thisObject();
-    }
-
-    static <V> Function<V, IllegalArgumentException> convertExceptionCreator(String errMsg) {
-        return value -> new IllegalArgumentException(errMsg);
-    }
-
-    static <V, E extends RuntimeException> Function<V, E> convertExceptionCreator(Supplier<E> exceptionSupplier) {
-        return value -> exceptionSupplier.get();
-    }
-}