diff --git a/.gitignore b/.gitignore index 549e00a..033f923 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ target/ !**/src/main/**/target/ !**/src/test/**/target/ +.flattened-pom.xml + ### STS ### .apt_generated .classpath diff --git a/plusone-validator/pom.xml b/plusone-validator/pom.xml index 0f999a6..ddb167b 100644 --- a/plusone-validator/pom.xml +++ b/plusone-validator/pom.xml @@ -8,7 +8,8 @@ xyz.zhouxy.plusone plusone-validator-parent - 1.0.0-SNAPSHOT + 1.0.0-RC4 + ../pom.xml plusone-validator @@ -18,27 +19,6 @@ Plusone Validator 是一个校验库,使用 lambda 表达式(包括方法引用)和流式 API 构建校验规则,对对象进行校验。 - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - - Zhou Xingyi (周兴毅) - https://gitea.zhouxy.xyz/plusone - - - - - scm:git:https://gitea.zhouxy.xyz/plusone/plusone-validator.git - scm:git:ssh://gitea.zhouxy.xyz/plusone/plusone-validator.git - https://gitea.zhouxy.xyz/plusone/plusone-validator - - xyz.zhouxy.plusone diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ArrayPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ArrayPropertyValidator.java index 0611948..511c00d 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ArrayPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ArrayPropertyValidator.java @@ -31,7 +31,7 @@ import xyz.zhouxy.plusone.commons.util.AssertTools; * * @param 待校验对象的类型 * @param 数组元素的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class ArrayPropertyValidator extends BasePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java index d2074e7..906032e 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseComparablePropertyValidator.java @@ -29,7 +29,7 @@ import com.google.common.collect.Range; * @param 待校验属性的类型,必须实现 {@code Comparable} 接口 * @param 具体校验器类型,用于支持链式调用 * @see Range - * @author ZhouXY108 + * @author ZhouXY */ public abstract class BaseComparablePropertyValidator< T, diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java index 15ad45c..6bf2b6c 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BasePropertyValidator.java @@ -33,7 +33,7 @@ import java.util.function.Supplier; * @param 待校验对象的类型 * @param 待校验属性的类型 * @param 具体校验器类型,用于支持链式调用 - * @author ZhouXY108 + * @author ZhouXY */ public abstract class BasePropertyValidator< T, diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java index 13887ee..a08e760 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BaseValidator.java @@ -34,7 +34,7 @@ import xyz.zhouxy.plusone.validator.function.*; * 子类可通过添加不同的校验规则,构建完整的校验逻辑,用于校验对象。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public abstract class BaseValidator implements IValidator { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java index a31c4c0..e76c87d 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/BoolPropertyValidator.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; * 用于构建校验 {@code Boolean} 类型属性的规则链。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class BoolPropertyValidator extends BasePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/CollectionPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/CollectionPropertyValidator.java index 53adf64..895f18b 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/CollectionPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/CollectionPropertyValidator.java @@ -32,7 +32,7 @@ import xyz.zhouxy.plusone.commons.util.AssertTools; * * @param 待校验对象的类型 * @param 集合元素的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class CollectionPropertyValidator extends BasePropertyValidator, CollectionPropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java index 9d66dd0..245f2c6 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ComparablePropertyValidator.java @@ -24,7 +24,7 @@ import java.util.function.Function; * @param 待校验对象的类型 * @param 待校验属性的类型,必须实现 {@code Comparable} 接口 * @see com.google.common.collect.Range - * @author ZhouXY108 + * @author ZhouXY */ public class ComparablePropertyValidator> extends BaseComparablePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java index 43e9f8f..83b45a9 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/DoublePropertyValidator.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; * 用于构建校验 {@code Double} 类型属性的规则链。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class DoublePropertyValidator extends BaseComparablePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java index 331ee6b..7ac4b46 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidateRequired.java @@ -19,7 +19,7 @@ package xyz.zhouxy.plusone.validator; /** * 自带校验方法,校验不通过时直接抛异常。 * - * @author ZhouXY108 + * @author ZhouXY * * @see BaseValidator */ diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidator.java index 5de6d64..2e37540 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IValidator.java @@ -23,7 +23,7 @@ package xyz.zhouxy.plusone.validator; *

* * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public interface IValidator { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java index 75c0cbb..1dda013 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/IntPropertyValidator.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; * 用于构建校验 {@code Integer} 类型属性的规则链。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class IntPropertyValidator extends BaseComparablePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java index 7be7f5c..2fae807 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/LongPropertyValidator.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; * 用于构建校验 {@code Long} 类型属性的规则链。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class LongPropertyValidator extends BaseComparablePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java index 50a22d6..c1a9145 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/MapValidator.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; *

* 校验后拷贝出一个新的 Map 对象,仅保留指定的 key。 * - * @author ZhouXY108 + * @author ZhouXY */ public abstract class MapValidator extends BaseValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ObjectPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ObjectPropertyValidator.java index fcc05b6..86e5133 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ObjectPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ObjectPropertyValidator.java @@ -23,7 +23,7 @@ import java.util.function.Function; * * @param 待校验对象的类型 * @param 待校验属性的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class ObjectPropertyValidator extends BasePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/PairPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/PairPropertyValidator.java index 7f536b5..f1d36ee 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/PairPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/PairPropertyValidator.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; * @param 被验证对象类型 * @param 第一个元素的类型 * @param 第二个元素的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class PairPropertyValidator extends BasePropertyValidator, PairPropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java index e974d61..6b5b833 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/StringPropertyValidator.java @@ -35,7 +35,7 @@ import xyz.zhouxy.plusone.commons.util.StringTools; * 用于构建校验 {@code String} 类型属性的规则链。 * * @param 待校验对象的类型 - * @author ZhouXY108 + * @author ZhouXY */ public class StringPropertyValidator extends BaseComparablePropertyValidator> { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ValidationException.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ValidationException.java index 29bb1ae..c6ccc7a 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ValidationException.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/ValidationException.java @@ -18,7 +18,7 @@ package xyz.zhouxy.plusone.validator; /** * 校验失败异常 * - * @author ZhouXY108 + * @author ZhouXY */ public class ValidationException extends RuntimeException { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToBoolObjectFunction.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToBoolObjectFunction.java index 7824a32..72f1f54 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToBoolObjectFunction.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToBoolObjectFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** * Function<T, Boolean> * - * @author ZhouXY108 + * @author ZhouXY */ @FunctionalInterface public interface ToBoolObjectFunction extends Function, Serializable { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToDoubleObjectFunction.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToDoubleObjectFunction.java index 4c5b219..1398ef4 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToDoubleObjectFunction.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToDoubleObjectFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** * Function<T, Double> * - * @author ZhouXY108 + * @author ZhouXY */ @FunctionalInterface public interface ToDoubleObjectFunction extends Function, Serializable { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToIntegerFunction.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToIntegerFunction.java index 5a23764..5a8ea2d 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToIntegerFunction.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToIntegerFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** * Function<T, Integer> * - * @author ZhouXY108 + * @author ZhouXY */ @FunctionalInterface public interface ToIntegerFunction extends Function, Serializable { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToLongObjectFunction.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToLongObjectFunction.java index 58ee417..85071c1 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToLongObjectFunction.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToLongObjectFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** * Function<T, Long> * - * @author ZhouXY108 + * @author ZhouXY */ @FunctionalInterface public interface ToLongObjectFunction extends Function, Serializable { diff --git a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToStringFunction.java b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToStringFunction.java index f73454c..ebfa483 100644 --- a/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToStringFunction.java +++ b/plusone-validator/src/main/java/xyz/zhouxy/plusone/validator/function/ToStringFunction.java @@ -21,7 +21,7 @@ import java.util.function.Function; /** * Function<T, String> * - * @author ZhouXY108 + * @author ZhouXY */ @FunctionalInterface public interface ToStringFunction extends Function, Serializable { diff --git a/pom.xml b/pom.xml index 79a7c7b..416b2bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ xyz.zhouxy.plusone plusone-validator-parent - 1.0.0-SNAPSHOT + 1.0.0-RC4 plusone-validator-parent https://gitea.zhouxy.xyz/plusone/plusone-validator @@ -47,7 +47,7 @@ 1.8 1.8 - 1.1.0-SNAPSHOT + 1.1.0-RC2 @@ -68,49 +68,68 @@ - - - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - maven-site-plugin - 3.7.1 - - - maven-project-info-reports-plugin - 3.0.0 - - - + + + + org.codehaus.mojo + flatten-maven-plugin + 1.6.0 + + + + oss + + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + + + + + + release + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.central + central-publishing-maven-plugin + true + + central + + + + + +