build: 保持开发分支的版本号为 SNAPSHOT

Co-authored-by: ZhouXY108 <luquanlion@outlook.com>
Co-committed-by: ZhouXY108 <luquanlion@outlook.com>

README.md

@@ -68,16 +68,17 @@ System.out.println(result); // Output: Return string
 `RegexConsts` 包含常见正则表达式；`PatternConsts` 包含对应的 `Pattern` 对象
 
 ## 五、exception - 异常
-### 1. MultiTypesException - 多类型异常
+### 1. IMultiTypesException - 多类型异常
 异常在不同场景下被抛出，可以用不同的枚举值，表示不同的场景类型。
 
-异常实现 `MultiTypesException` 的 `MultiTypesException#getType` 方法，返回对应的场景类型。
+异常实现 `IMultiTypesException` 的 `IMultiTypesException#getType` 方法，返回对应的场景类型。
 
-表示场景类型的枚举实现 `MultiTypesException.ExceptionType`，其中的工厂方法用于创建对应类型的异常。
+表示场景类型的枚举实现 `IMultiTypesException.IExceptionType`，其中的工厂方法用于创建对应类型的异常。
 ```java
 public final class LoginException
         extends RuntimeException
-        implements MultiTypesException<LoginException, LoginException.Type> {
+        implements IMultiTypesException<LoginException, LoginException.Type, String> {
+    private static final long serialVersionUID = 881293090625085616L;
     private final Type type;
     private LoginException(@Nonnull Type type, @Nonnull String message) {
         super(message);
@@ -103,7 +104,7 @@ public final class LoginException
 
     // ...
 
-    public enum Type implements ExceptionType {
+    public enum Type implements IExceptionType<LoginException, String> {
         DEFAULT("00", "当前会话未登录"),
         NOT_TOKEN("10", "未提供token"),
         INVALID_TOKEN("20", "token无效"),
@@ -210,7 +211,7 @@ throw LoginException.Type.TOKEN_TIMEOUT.create();
 #### 2. UnifiedResponse
 UnifiedResponse 对返回给前端的数据进行封装，包含 `code`、`message`、`data。`
 
-可使用 `UnifiedResponses` 快速构建 `UnifiedResponse` 对象。 `UnifiedResponses` 默认的成功代码为 "2000000"， 用户按测试类 `CustomUnifiedResponseFactoryTests` 中所示范的，继承 `UnifiedResponses` 实现自己的工厂类， 自定义 `SUCCESS_CODE` 和 `DEFAULT_SUCCESS_MSG` 和工厂方法。 见 [issue#22](http://zhouxy.xyz:3000/plusone/plusone-commons/issues/22)。
+可使用 `UnifiedResponses` 快速构建 `UnifiedResponse` 对象。 `UnifiedResponses` 默认的成功代码为 "2000000"， 用户按测试类 `CustomUnifiedResponseFactoryTests` 中所示范的，继承 `UnifiedResponses` 实现自己的工厂类， 自定义 `SUCCESS_CODE` 和 `DEFAULT_SUCCESS_MSG` 和工厂方法。 见 [issue#22](http://gitea.zhouxy.xyz/plusone/plusone-commons/issues/22)。
 
 ## 八、time - 时间 API
 ### 1. 季度

plusone-commons/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>xyz.zhouxy.plusone</groupId>
         <artifactId>plusone-parent</artifactId>
-        <version>1.1.0-RC1</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plusone-commons</artifactId>
@@ -17,7 +17,6 @@
     </description>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -28,7 +27,7 @@
             <dependency>
                 <groupId>xyz.zhouxy.plusone</groupId>
                 <artifactId>plusone-dependencies</artifactId>
-                <version>1.1.0-RC1</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
  * <p>
  * 标识方法是读方法，如 getter。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see WriterMethod
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java

@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
  *
  * <p>标识方法为静态工厂方法
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 @Target(ElementType.METHOD)

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java

@@ -27,7 +27,7 @@ import java.lang.annotation.Documented;
  *
  * <p>标识方法为不支持的操作。该方法将抛出 {@link UnsupportedOperationException}。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @version 1.0
  * @since 1.0.0
  * @see UnsupportedOperationException

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java

@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * ValueObject - 值对象
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 @Inherited

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java

@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
  * 标识该方法是虚方法。
  * <p>该注解用于提醒、强调父类虽然有默认实现，但子类可以根据自己的需要覆写。</p>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 @Target(ElementType.METHOD)

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
  * <p>
  * 标识方法是写方法，如 setter。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see ReaderMethod
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java

@@ -54,6 +54,6 @@
  * <p>
  * 标记一个类，表示其作为值对象，区别于 Entity。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.annotation;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java

@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
  * 用于像自定义异常等需要带有 {@code code} 字段的类，
  * 方便其它地方的程序判断该类的是否实现了此接口，以此获取其实例的 {@code code} 字段的值。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public interface IWithCode<T> {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java

@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
  * 用于像自定义异常等需要带有 {@code code} 字段的类，
  * 方便其它地方的程序判断该类的是否实现了此接口，以此获取其实例的 {@code code} 字段的值。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public interface IWithIntCode {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java

@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
  * 用于像自定义异常等需要带有 {@code code} 字段的类，
  * 方便其它地方的程序判断该类的是否实现了此接口，以此获取其实例的 {@code code} 字段的值。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public interface IWithLongCode {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/Ref.java

@@ -67,7 +67,7 @@ import javax.annotation.Nullable;
  * System.out.println(result); // Output: Return string
  * </pre>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public final class Ref<T> {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/package-info.java

@@ -66,7 +66,7 @@
  * 类似于枚举这样的类型，通常需要设置固定的码值表示对应的含义。
  * 可实现 {@link IWithCode}、{@link IWithIntCode}、{@link IWithLongCode}，便于在需要的地方对这些接口的实现进行处理。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @CheckReturnValue
 @ParametersAreNonnullByDefault

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java

@@ -33,7 +33,7 @@ import com.google.common.collect.Table;
 /**
  * 集合工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class CollectionTools {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java

@@ -22,7 +22,7 @@
  * </h3>
  * 集合工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ParametersAreNonnullByDefault
 package xyz.zhouxy.plusone.commons.collection;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java

@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
 /**
  * 正则表达式常量
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @see RegexConsts
  * @see xyz.zhouxy.plusone.commons.util.RegexTools
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java

@@ -19,7 +19,7 @@ package xyz.zhouxy.plusone.commons.constant;
 /**
  * 正则表达式常量
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @see PatternConsts
  */
 public final class RegexConsts {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java

@@ -22,7 +22,7 @@
  * </h3>
  * {@link RegexConsts} 包含常见正则表达式；{@link PatternConsts} 包含对应的 {@link Pattern} 对象。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.constant;
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java

@@ -19,7 +19,7 @@ package xyz.zhouxy.plusone.commons.exception;
 /**
  * 数据不存在异常
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public final class DataNotExistsException extends Exception {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/IExceptionFactory.java

@@ -0,0 +1,61 @@
+/*
+ * 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.commons.exception;
+
+import javax.annotation.Nonnull;
+
+/**
+ * 异常工厂
+ *
+ * @author ZhouXY
+ */
+public interface IExceptionFactory<X extends Exception> {
+    /**
+    * 创建异常
+    *
+    * @return 异常对象
+    */
+    @Nonnull
+    X create();
+
+    /**
+     * 使用指定 {@code message} 创建异常
+     *
+     * @param message 异常信息
+     * @return 异常对象
+     */
+    @Nonnull
+    X create(String message);
+
+    /**
+     * 使用指定 {@code cause} 创建异常
+     *
+     * @param cause 包装的异常
+     * @return 异常对象
+     */
+    @Nonnull
+    X create(Throwable cause);
+
+    /**
+     * 使用指定 {@code message} 和 {@code cause} 创建异常
+     *
+     * @param message 异常信息
+     * @param cause   包装的异常
+     * @return 异常对象
+     */
+    @Nonnull
+    X create(String message, Throwable cause);
+}

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/IMultiTypesException.java

@@ -15,26 +15,31 @@
  */
 package xyz.zhouxy.plusone.commons.exception;
 
+import java.io.Serializable;
+
 import javax.annotation.Nonnull;
 
+import xyz.zhouxy.plusone.commons.annotation.Virtual;
 import xyz.zhouxy.plusone.commons.base.IWithCode;
 
 /**
- * MultiTypesException
+ * IMultiTypesException
  *
  * <p>
  * 异常在不同场景下被抛出，可以用不同的枚举值，表示不同的场景类型。
  *
  * <p>
- * 异常实现 {@link MultiTypesException} 的 {@link #getType} 方法，返回对应的场景类型。
+ * 异常实现 {@link IMultiTypesException} 的 {@link #getType} 方法，返回对应的场景类型。
  *
  * <p>
- * 表示场景类型的枚举实现 {@link ExceptionType}，其中的工厂方法用于创建对应类型的异常。
+ * 表示场景类型的枚举实现 {@link IExceptionType}，各个枚举值本身就是该场景的异常的工厂实例，
+ * 使用其中的工厂方法用于创建对应类型的异常。
  *
  * <pre>
  * public final class LoginException
  *         extends RuntimeException
- *         implements MultiTypesException&lt;LoginException, LoginException.Type&gt; {
+ *         implements IMultiTypesException&lt;LoginException, LoginException.Type, String&gt; {
+ *     private static final long serialVersionUID = 881293090625085616L;
  *     private final Type type;
  *     private LoginException(&#64;Nonnull Type type, &#64;Nonnull String message) {
  *         super(message);
@@ -60,7 +65,7 @@ import xyz.zhouxy.plusone.commons.base.IWithCode;
  *
  *     // ...
  *
- *     public enum Type implements ExceptionType&lt;LoginException&gt; {
+ *     public enum Type implements IExceptionType&lt;LoginException, String&gt; {
  *         DEFAULT("00", "当前会话未登录"),
  *         NOT_TOKEN("10", "未提供token"),
  *         INVALID_TOKEN("20", "token无效"),
@@ -117,15 +122,20 @@ import xyz.zhouxy.plusone.commons.base.IWithCode;
  * throw LoginException.Type.TOKEN_TIMEOUT.create();
  * </pre>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @param <X> 具体异常类
+ * @param <T> 异常场景
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
-public interface MultiTypesException<E extends Exception, T extends MultiTypesException.ExceptionType<E>> {
+public interface IMultiTypesException<
+        X extends Exception,
+        T extends IMultiTypesException.IExceptionType<X, TCode>,
+        TCode extends Serializable> {
 
     /**
      * 异常类型
      *
-     * @return 异常类型。通常是实现了 {@link ExceptionType} 的枚举。
+     * @return 异常类型。通常是实现了 {@link IExceptionType} 的枚举。
      */
     @Nonnull
     T getType();
@@ -135,55 +145,25 @@ public interface MultiTypesException<E extends Exception, T extends MultiTypesEx
      *
      * @return 异常类型编码
      */
-    default @Nonnull String getTypeCode() {
+    default @Nonnull TCode getTypeCode() {
         return getType().getCode();
     }
 
     /**
      * 异常类型
      */
-    public static interface ExceptionType<E extends Exception> extends IWithCode<String> {
+    public static interface IExceptionType<X extends Exception, TCode extends Serializable>
+            extends IWithCode<TCode>, IExceptionFactory<X> {
 
         /**
          * 默认异常信息
          */
         String getDefaultMessage();
 
-        /**
-         * 创建异常
-         *
-         * @return 异常对象
-         */
-        @Nonnull
-        E create();
-
-        /**
-         * 使用指定 {@code message} 创建异常
-         *
-         * @param message 异常信息
-         * @return 异常对象
-         */
-        @Nonnull
-        E create(String message);
-
-        /**
-         * 使用指定 {@code cause} 创建异常
-         *
-         * @param cause 包装的异常
-         * @return 异常对象
-         */
-        @Nonnull
-        E create(Throwable cause);
-
-        /**
-         * 使用指定 {@code message} 和 {@code cause} 创建异常
-         *
-         * @param message 异常信息
-         * @param cause   包装的异常
-         * @return 异常对象
-         */
-        @Nonnull
-        E create(String message, Throwable cause);
+        @Virtual
+        default String getDescription() {
+            return getDefaultMessage();
+        }
 
     }
 }

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java

@@ -21,7 +21,7 @@ import java.time.format.DateTimeParseException;
 import javax.annotation.Nonnull;
 
 import xyz.zhouxy.plusone.commons.exception.business.RequestParamsException;
-import xyz.zhouxy.plusone.commons.exception.MultiTypesException.ExceptionType;
+import xyz.zhouxy.plusone.commons.exception.IMultiTypesException.IExceptionType;
 
 /**
  * 解析失败异常
@@ -31,15 +31,16 @@ import xyz.zhouxy.plusone.commons.exception.MultiTypesException.ExceptionType;
  * 如果表示用户传参造成的解析失败，可使用 {@link RequestParamsException#RequestParamsException(Throwable)}，
  * 将 ParsingFailureException 包装成 {@link RequestParamsException} 再抛出。
  * <pre>
- * throw new RequestParamsException(ParsingFailureException.of(ParsingFailureException.Type.NUMBER_PARSING_FAILURE));
+ * throw new RequestParamsException(ParsingFailureException.Type.NUMBER_PARSING_FAILURE.create());
  * </pre>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public final class ParsingFailureException
-        extends RuntimeException
-        implements MultiTypesException<ParsingFailureException, ParsingFailureException.Type> {
+        extends Exception
+        implements IMultiTypesException<ParsingFailureException, ParsingFailureException.Type, String> {
+    private static final long serialVersionUID = 795996090625132616L;
 
     private final Type type;
 
@@ -170,7 +171,7 @@ public final class ParsingFailureException
     /** XML 解析失败 */
     public static final Type XML_PARSING_FAILURE = Type.XML_PARSING_FAILURE;
 
-    public enum Type implements ExceptionType<ParsingFailureException> {
+    public enum Type implements IExceptionType<ParsingFailureException, String> {
         DEFAULT("00", "解析失败"),
         NUMBER_PARSING_FAILURE("10", "数字转换失败"),
         DATE_TIME_PARSING_FAILURE("20", "时间解析失败"),

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java

@@ -25,10 +25,11 @@ package xyz.zhouxy.plusone.commons.exception.business;
  * <p>
  * <b>NOTE: 通常表示业务中的意外情况。如：用户错误输入、缺失必填字段、用户余额不足等。</b>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class BizException extends RuntimeException {
+    private static final long serialVersionUID = 982585090625482416L;
 
     private static final String DEFAULT_MSG = "业务异常";
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java

@@ -18,8 +18,8 @@ package xyz.zhouxy.plusone.commons.exception.business;
 
 import javax.annotation.Nonnull;
 
-import xyz.zhouxy.plusone.commons.exception.MultiTypesException.ExceptionType;
-import xyz.zhouxy.plusone.commons.exception.MultiTypesException;
+import xyz.zhouxy.plusone.commons.exception.IMultiTypesException.IExceptionType;
+import xyz.zhouxy.plusone.commons.exception.IMultiTypesException;
 
 /**
  * InvalidInputException
@@ -30,12 +30,13 @@ import xyz.zhouxy.plusone.commons.exception.MultiTypesException;
  * <p>
  * <b>NOTE: 属业务异常</b>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public final class InvalidInputException
         extends RequestParamsException
-        implements MultiTypesException<InvalidInputException, InvalidInputException.Type> {
+        implements IMultiTypesException<InvalidInputException, InvalidInputException.Type, String> {
+    private static final long serialVersionUID = -28994090625082516L;
 
     private final Type type;
 
@@ -108,7 +109,7 @@ public final class InvalidInputException
         return this.type;
     }
 
-    public enum Type implements ExceptionType<InvalidInputException> {
+    public enum Type implements IExceptionType<InvalidInputException, String> {
         DEFAULT("00", "用户输入内容非法"),
         CONTAINS_ILLEGAL_AND_MALICIOUS_LINKS("01", "包含非法恶意跳转链接"),
         CONTAINS_ILLEGAL_WORDS("02", "包含违禁敏感词"),

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java

@@ -22,10 +22,11 @@ package xyz.zhouxy.plusone.commons.exception.business;
  * <p>
  * 用户请求参数错误
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class RequestParamsException extends BizException {
+    private static final long serialVersionUID = 448337090625192516L;
 
     private static final String DEFAULT_MSG = "用户请求参数错误";
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java

@@ -17,6 +17,6 @@
 /**
  * 业务异常
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.exception.business;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java

@@ -17,20 +17,22 @@
 /**
  * <h2>异常</h2>
  *
- * <h3>1. {@link MultiTypesException} - 多类型异常</h3>
+ * <h3>1. {@link IMultiTypesException} - 多类型异常</h3>
  * <p>
  * 异常在不同场景下被抛出，可以用不同的枚举值，表示不同的场景类型。
  *
  * <p>
- * 异常实现 {@link MultiTypesException} 的 {@link MultiTypesException#getType} 方法，返回对应的场景类型。
+ * 异常实现 {@link IMultiTypesException} 的 {@link IMultiTypesException#getType} 方法，返回对应的场景类型。
  *
  * <p>
- * 表示场景类型的枚举实现 {@link MultiTypesException.ExceptionType}，其中的工厂方法用于创建对应类型的异常。
+ * 表示场景类型的枚举实现 {@link IMultiTypesException.IExceptionType}，各个枚举值本身就是该场景的异常的工厂实例，
+ * 使用其中的工厂方法用于创建对应类型的异常。
  *
  * <pre>
  * public final class LoginException
  *         extends RuntimeException
- *         implements MultiTypesException&lt;LoginException, LoginException.Type&gt; {
+ *         implements IMultiTypesException&lt;LoginException, LoginException.Type, String&gt; {
+ *     private static final long serialVersionUID = 881293090625085616L;
  *     private final Type type;
  *     private LoginException(&#64;Nonnull Type type, &#64;Nonnull String message) {
  *         super(message);
@@ -56,7 +58,7 @@
  *
  *     // ...
  *
- *     public enum Type implements ExceptionType&lt;LoginException&gt; {
+ *     public enum Type implements IExceptionType&lt;LoginException, String&gt; {
  *         DEFAULT("00", "当前会话未登录"),
  *         NOT_TOKEN("10", "未提供token"),
  *         INVALID_TOKEN("20", "token无效"),
@@ -119,7 +121,7 @@
  * <h3>3. 系统异常</h3>
  * 预设常见的系统异常。可继承 {@link SysException} 自定义系统异常。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.exception;
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java

@@ -27,10 +27,11 @@ package xyz.zhouxy.plusone.commons.exception.system;
  * 当出现这种始料未及的诡异情况时，抛出 {@link DataOperationResultException} 并回滚事务。
  * 后续需要排查原因。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public final class DataOperationResultException extends SysException {
+    private static final long serialVersionUID = 992754090625352516L;
 
     private final long expected;
     private final long actual;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java

@@ -22,7 +22,7 @@ package xyz.zhouxy.plusone.commons.exception.system;
  * <p>
  * 在无法找到可访问的 Mac 地址时抛出
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class NoAvailableMacFoundException extends SysException {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java

@@ -22,10 +22,11 @@ package xyz.zhouxy.plusone.commons.exception.system;
  * <p>
  * 通常表示应用代码存在问题，或因环境问题，引发异常。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class SysException extends RuntimeException {
+    private static final long serialVersionUID = -936435090625482516L;
 
     private static final String DEFAULT_MSG = "系统异常";
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java

@@ -17,6 +17,6 @@
 /**
  * 系统异常
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.exception.system;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java

@@ -25,7 +25,7 @@ import com.google.common.annotations.Beta;
  * 一个特殊的 {@link java.util.function.UnaryOperator}。
  * 表示对 {@code boolean} 值的一元操作。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see java.util.function.UnaryOperator
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java

@@ -25,7 +25,7 @@ import com.google.common.annotations.Beta;
  * 一个特殊的 {@link java.util.function.UnaryOperator}。
  * 表示对 {@code char} 的一元操作。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see java.util.function.UnaryOperator
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/Executable.java

@@ -24,7 +24,7 @@ package xyz.zhouxy.plusone.commons.function;
  *
  * @param <E> 可抛出的异常类型
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 @FunctionalInterface

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java

@@ -25,7 +25,7 @@ import java.util.function.Supplier;
  * <p>
  * 返回 {@code Optional&lt;T&gt;} 对象。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see Optional
  * @see Supplier

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java

@@ -24,7 +24,7 @@ import java.util.function.Predicate;
  * <p>
  * {@link Predicate} 相关操作。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see Predicate
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java

@@ -22,7 +22,7 @@ package xyz.zhouxy.plusone.commons.function;
  * <p>
  * 允许抛出异常的消费操作。是一个特殊的 {@link java.util.function.Consumer}。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see java.util.function.Consumer
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java

@@ -25,7 +25,7 @@ package xyz.zhouxy.plusone.commons.function;
  * @param <R> 返回结果类型
  * @param <E> 异常类型
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0
  * @see java.util.function.Function
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java

@@ -22,7 +22,7 @@ package xyz.zhouxy.plusone.commons.function;
  * <p>
  * 接收一个参数，返回一个布尔值，可抛出异常。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see java.util.function.Predicate
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java

@@ -25,7 +25,7 @@ package xyz.zhouxy.plusone.commons.function;
  * @param <T> 结果类型
  * @param <E> 异常类型
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see java.util.function.Supplier
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java

@@ -25,7 +25,7 @@ import java.util.function.BiFunction;
  * <p>
  * 接受类型为 T 和 U 的两个参数，返回 {@code Optional&lt;R&gt;} 对象。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see Optional
  * @see BiFunction

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java

@@ -25,7 +25,7 @@ import java.util.function.Function;
  * <p>
  * 接受类型为 T 的参数，返回 {@code Optional&lt;R&gt;} 对象。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see Optional
  * @see Function

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java

@@ -39,6 +39,6 @@
  * | Optional      | ToOptionalFunction   | Optional<R> apply(T)             |
  * </pre>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 package xyz.zhouxy.plusone.commons.function;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/gson/adapter/JSR310TypeAdapters.java

@@ -15,23 +15,25 @@
  */
 package xyz.zhouxy.plusone.commons.gson.adapter;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgumentNotNull;
+
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQuery;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
-import xyz.zhouxy.plusone.commons.util.AssertTools;
-
 /**
  * 包含 JSR-310 相关数据类型的 {@code TypeAdapter}
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.1.0
  * @see TypeAdapter
  * @see com.google.gson.GsonBuilder
@@ -42,16 +44,15 @@ public class JSR310TypeAdapters {
      * {@code LocalDate} 的 {@code TypeAdapter}，
      * 用于 Gson 对 {@code LocalDate} 进行相互转换。
      */
-    public static final class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
-
-        private final DateTimeFormatter dateTimeFormatter;
+    public static final class LocalDateTypeAdapter
+            extends TemporalAccessorTypeAdapter<LocalDate, LocalDateTypeAdapter> {
 
         /**
          * 默认构造函数，
          * 使用 {@link DateTimeFormatter#ISO_LOCAL_DATE} 进行 {@link LocalDate} 的序列化与反序列化。
          */
         public LocalDateTypeAdapter() {
-            this.dateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE;
+            this(DateTimeFormatter.ISO_LOCAL_DATE);
         }
 
         /**
@@ -61,20 +62,7 @@ public class JSR310TypeAdapters {
          * @param formatter 用于序列化 {@link LocalDate} 的格式化器，不可为 {@code null}。
          */
         public LocalDateTypeAdapter(DateTimeFormatter formatter) {
-            AssertTools.checkArgumentNotNull(formatter, "formatter can not be null.");
-            this.dateTimeFormatter = formatter;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void write(JsonWriter out, LocalDate value) throws IOException {
-            out.value(dateTimeFormatter.format(value));
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public LocalDate read(JsonReader in) throws IOException {
-            return LocalDate.parse(in.nextString(), dateTimeFormatter);
+            super(LocalDate::from, formatter);
         }
     }
 
@@ -82,16 +70,15 @@ public class JSR310TypeAdapters {
      * {@code LocalDateTime} 的 {@code TypeAdapter}，
      * 用于 Gson 对 {@code LocalDateTime} 进行相互转换。
      */
-    public static final class LocalDateTimeTypeAdapter extends TypeAdapter<LocalDateTime> {
-
-        private final DateTimeFormatter dateTimeFormatter;
+    public static final class LocalDateTimeTypeAdapter
+            extends TemporalAccessorTypeAdapter<LocalDateTime, LocalDateTimeTypeAdapter> {
 
         /**
          * 默认构造函数，
          * 使用 {@link DateTimeFormatter#ISO_LOCAL_DATE_TIME} 进行 {@link LocalDateTime} 的序列化与反序列化。
          */
         public LocalDateTimeTypeAdapter() {
-            this.dateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+            this(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
         }
 
         /**
@@ -101,20 +88,7 @@ public class JSR310TypeAdapters {
          * @param formatter 用于序列化 {@link LocalDateTime} 的格式化器，不可为 {@code null}。
          */
         public LocalDateTimeTypeAdapter(DateTimeFormatter formatter) {
-            AssertTools.checkArgumentNotNull(formatter, "formatter can not be null.");
-            this.dateTimeFormatter = formatter;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void write(JsonWriter out, LocalDateTime value) throws IOException {
-            out.value(dateTimeFormatter.format(value));
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public LocalDateTime read(JsonReader in) throws IOException {
-            return LocalDateTime.parse(in.nextString(), dateTimeFormatter);
+            super(LocalDateTime::from, formatter);
         }
     }
 
@@ -122,16 +96,15 @@ public class JSR310TypeAdapters {
      * {@code ZonedDateTime} 的 {@code TypeAdapter}，
      * 用于 Gson 对 {@code ZonedDateTime} 进行相互转换。
      */
-    public static final class ZonedDateTimeTypeAdapter extends TypeAdapter<ZonedDateTime> {
-
-        private final DateTimeFormatter dateTimeFormatter;
+    public static final class ZonedDateTimeTypeAdapter
+            extends TemporalAccessorTypeAdapter<ZonedDateTime, ZonedDateTimeTypeAdapter> {
 
         /**
          * 默认构造函数，
          * 使用 {@link DateTimeFormatter#ISO_ZONED_DATE_TIME} 进行 {@link ZonedDateTime} 的序列化与反序列化。
          */
         public ZonedDateTimeTypeAdapter() {
-            this.dateTimeFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME;
+            this(DateTimeFormatter.ISO_ZONED_DATE_TIME);
         }
 
         /**
@@ -141,20 +114,7 @@ public class JSR310TypeAdapters {
          * @param formatter 用于序列化 {@link ZonedDateTime} 的格式化器，不可为 {@code null}。
          */
         public ZonedDateTimeTypeAdapter(DateTimeFormatter formatter) {
-            AssertTools.checkArgumentNotNull(formatter, "formatter can not be null.");
-            this.dateTimeFormatter = formatter;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void write(JsonWriter out, ZonedDateTime value) throws IOException {
-            out.value(dateTimeFormatter.format(value));
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public ZonedDateTime read(JsonReader in) throws IOException {
-            return ZonedDateTime.parse(in.nextString(), dateTimeFormatter);
+            super(ZonedDateTime::from, formatter);
         }
     }
 
@@ -166,18 +126,40 @@ public class JSR310TypeAdapters {
     * 使用 {@link DateTimeFormatter#ISO_INSTANT} 进行 {@link Instant} 的序列化与反序列化。
     *
     */
-    public static final class InstantTypeAdapter extends TypeAdapter<Instant> {
+    public static final class InstantTypeAdapter
+            extends TemporalAccessorTypeAdapter<Instant, InstantTypeAdapter> {
 
-        /** {@inheritDoc} */
-        @Override
-        public void write(JsonWriter out, Instant value) throws IOException {
-            out.value(DateTimeFormatter.ISO_INSTANT.format(value));
+        public InstantTypeAdapter() {
+            super(Instant::from, DateTimeFormatter.ISO_INSTANT);
+        }
+    }
+
+    private abstract static class TemporalAccessorTypeAdapter<
+            T extends TemporalAccessor,
+            TTypeAdapter extends TemporalAccessorTypeAdapter<T, TTypeAdapter>>
+        extends TypeAdapter<T> {
+
+        private final TemporalQuery<T> temporalQuery;
+
+        private final DateTimeFormatter dateTimeFormatter;
+
+        protected TemporalAccessorTypeAdapter(
+                TemporalQuery<T> temporalQuery, DateTimeFormatter dateTimeFormatter) {
+            checkArgumentNotNull(dateTimeFormatter, "formatter must not be null.");
+            this.temporalQuery = temporalQuery;
+            this.dateTimeFormatter = dateTimeFormatter;
         }
 
         /** {@inheritDoc} */
         @Override
-        public Instant read(JsonReader in) throws IOException {
-            return Instant.parse(in.nextString());
+        public void write(JsonWriter out, T value) throws IOException {
+            out.value(dateTimeFormatter.format(value));
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public T read(JsonReader in) throws IOException {
+            return dateTimeFormatter.parse(in.nextString(), temporalQuery);
         }
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.model;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -32,7 +34,6 @@ import com.google.errorprone.annotations.Immutable;
 import xyz.zhouxy.plusone.commons.annotation.ReaderMethod;
 import xyz.zhouxy.plusone.commons.annotation.ValueObject;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 import xyz.zhouxy.plusone.commons.util.StringTools;
 
 /**
@@ -41,7 +42,7 @@ import xyz.zhouxy.plusone.commons.util.StringTools;
  * <p>
  * 中国第二代居民身份证号
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see xyz.zhouxy.plusone.commons.constant.PatternConsts#CHINESE_2ND_ID_CARD_NUMBER
  */
@@ -86,13 +87,13 @@ public class Chinese2ndGenIDCardNumber
      */
     public static Chinese2ndGenIDCardNumber of(final String idCardNumber) {
         try {
-            AssertTools.checkArgument(StringTools.isNotBlank(idCardNumber), "二代居民身份证校验失败：号码为空");
+            checkArgument(StringTools.isNotBlank(idCardNumber), "二代居民身份证校验失败：号码为空");
             final String value = idCardNumber.toUpperCase();
             final Matcher matcher = PatternConsts.CHINESE_2ND_ID_CARD_NUMBER.matcher(value);
-            AssertTools.checkArgument(matcher.matches(), () -> "二代居民身份证校验失败：" + value);
+            checkArgument(matcher.matches(), () -> "二代居民身份证校验失败：" + value);
 
             final String provinceCode = matcher.group("province");
-            AssertTools.checkArgument(Chinese2ndGenIDCardNumber.PROVINCE_CODES.containsKey(provinceCode));
+            checkArgument(Chinese2ndGenIDCardNumber.PROVINCE_CODES.containsKey(provinceCode));
 
             final String cityCode = matcher.group("city");
             final String countyCode = matcher.group("county");

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java

@@ -16,13 +16,14 @@
 
 package xyz.zhouxy.plusone.commons.model;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkCondition;
+
 import xyz.zhouxy.plusone.commons.base.IWithIntCode;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 
 /**
  * 性别
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public enum Gender implements IWithIntCode {
     UNKNOWN(0, "Unknown", "未知"),
@@ -50,7 +51,7 @@ public enum Gender implements IWithIntCode {
      * @return 枚举值
      */
     public static Gender of(int value) {
-        AssertTools.checkCondition(0 <= value && value < VALUES.length,
+        checkCondition(0 <= value && value < VALUES.length,
                 () -> new EnumConstantNotPresentException(Gender.class, String.valueOf(value)));
         return VALUES[value];
     }

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java

@@ -24,7 +24,7 @@ import xyz.zhouxy.plusone.commons.util.StringTools;
 /**
  * 身份证号
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public interface IDCardNumber {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.model;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.util.Objects;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
@@ -25,12 +27,11 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import xyz.zhouxy.plusone.commons.annotation.ReaderMethod;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 
 /**
  * 带校验的字符串值对象
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  *
  * @deprecated 弃用。使用工厂方法创建对象，并在其中进行校验即可。
@@ -74,10 +75,10 @@ public abstract class ValidatableStringRecord<T extends ValidatableStringRecord<
      * @param errorMessage 正则不匹配时的错误信息
      */
     protected ValidatableStringRecord(String value, Pattern pattern, String errorMessage) {
-        AssertTools.checkArgument(Objects.nonNull(value), "The value cannot be null.");
-        AssertTools.checkArgument(Objects.nonNull(pattern), "The pattern cannot be null.");
+        checkArgument(Objects.nonNull(value), "The value cannot be null.");
+        checkArgument(Objects.nonNull(pattern), "The pattern cannot be null.");
         this.matcher = pattern.matcher(value);
-        AssertTools.checkArgument(this.matcher.matches(), errorMessage);
+        checkArgument(this.matcher.matches(), errorMessage);
         this.value = value;
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java

@@ -29,7 +29,7 @@ import xyz.zhouxy.plusone.commons.collection.CollectionTools;
  *
  * @param <T> 内容列表的元素类型
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @see PagingAndSortingQueryParams
  */
 public class PageResult<T> {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.model.dto;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -27,7 +29,6 @@ import com.google.common.collect.ImmutableMap;
 
 import xyz.zhouxy.plusone.commons.annotation.Virtual;
 import xyz.zhouxy.plusone.commons.collection.CollectionTools;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 import xyz.zhouxy.plusone.commons.util.RegexTools;
 import xyz.zhouxy.plusone.commons.util.StringTools;
 
@@ -38,7 +39,7 @@ import xyz.zhouxy.plusone.commons.util.StringTools;
  * 根据传入的 {@code size} 和 {@code pageNum}，
  * 提供 {@code getOffset} 方法计算 SQL 语句中 {@code offset} 的值。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @see PagingParams
  * @see PageResult
  */
@@ -60,10 +61,10 @@ public class PagingAndSortingQueryParams {
      * @param sortableProperties 可排序的属性。不可为空。
      */
     public PagingAndSortingQueryParams(Map<String, String> sortableProperties) {
-        AssertTools.checkArgument(CollectionTools.isNotEmpty(sortableProperties),
+        checkArgument(CollectionTools.isNotEmpty(sortableProperties),
                 "Sortable properties can not be empty.");
         sortableProperties.forEach((k, v) ->
-                AssertTools.checkArgument(StringTools.isNotBlank(k) && StringTools.isNotBlank(v),
+                checkArgument(StringTools.isNotBlank(k) && StringTools.isNotBlank(v),
                 "Property name must not be blank."));
         this.sortableProperties = ImmutableMap.copyOf(sortableProperties);
     }
@@ -107,7 +108,7 @@ public class PagingAndSortingQueryParams {
     public final PagingParams buildPagingParams() {
         final int sizeValue = this.size != null ? this.size : defaultSizeInternal();
         final long pageNumValue = this.pageNum != null ? this.pageNum : 1L;
-        AssertTools.checkArgument(CollectionTools.isNotEmpty(this.orderBy),
+        checkArgument(CollectionTools.isNotEmpty(this.orderBy),
                 "The 'orderBy' cannot be empty");
         final List<SortableProperty> propertiesToSort = this.orderBy.stream()
                 .map(this::generateSortableProperty)
@@ -138,13 +139,13 @@ public class PagingAndSortingQueryParams {
     }
 
     private SortableProperty generateSortableProperty(String orderByStr) {
-        AssertTools.checkArgument(StringTools.isNotBlank(orderByStr));
-        AssertTools.checkArgument(RegexTools.matches(orderByStr, SORT_STR_PATTERN));
+        checkArgument(StringTools.isNotBlank(orderByStr));
+        checkArgument(RegexTools.matches(orderByStr, SORT_STR_PATTERN));
         String[] propertyNameAndOrderType = orderByStr.split("-");
-        AssertTools.checkArgument(propertyNameAndOrderType.length == 2);
+        checkArgument(propertyNameAndOrderType.length == 2);
 
         String propertyName = propertyNameAndOrderType[0];
-        AssertTools.checkArgument(sortableProperties.containsKey(propertyName),
+        checkArgument(sortableProperties.containsKey(propertyName),
                 "The property name must be in the set of sortable properties.");
         String columnName = sortableProperties.get(propertyName);
         String orderType = propertyNameAndOrderType[1];
@@ -164,7 +165,7 @@ public class PagingAndSortingQueryParams {
         SortableProperty(String propertyName, String columnName, String orderType) {
             this.propertyName = propertyName;
             this.columnName = columnName;
-            AssertTools.checkArgument("ASC".equalsIgnoreCase(orderType) || "DESC".equalsIgnoreCase(orderType));
+            checkArgument("ASC".equalsIgnoreCase(orderType) || "DESC".equalsIgnoreCase(orderType));
             this.orderType = orderType.toUpperCase();
 
             this.sqlSnippet = this.propertyName + " " + this.orderType;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java

@@ -24,7 +24,7 @@ import xyz.zhouxy.plusone.commons.model.dto.PagingAndSortingQueryParams.Sortable
 /**
  * 分页参数
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @see PagingAndSortingQueryParams
  */
 public class PagingParams {

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java

@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
 /**
  * 统一结果，对返回给前端的数据进行封装。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public class UnifiedResponse<T> {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java

@@ -21,7 +21,7 @@ import javax.annotation.Nullable;
 /**
  * UnifiedResponse 工厂
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see UnifiedResponse
  */

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java

@@ -60,7 +60,7 @@
  * 自定义 SUCCESS_CODE 和 DEFAULT_SUCCESS_MSG 和工厂方法。
  * 见 <a href="http://zhouxy.xyz:3000/plusone/plusone-commons/issues/22">issue#22</a>。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ParametersAreNonnullByDefault
 package xyz.zhouxy.plusone.commons.model.dto;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/package-info.java

@@ -19,7 +19,7 @@
  * <p>
  * 包含业务建模可能用到的性别、身份证等元素，也包含 DTO 相关类，如分页查询参数，响应结果，分页结果等。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ParametersAreNonnullByDefault
 package xyz.zhouxy.plusone.commons.model;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java

@@ -16,6 +16,9 @@
 
 package xyz.zhouxy.plusone.commons.time;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkCondition;
+
 import java.time.DateTimeException;
 import java.time.Month;
 import java.time.MonthDay;
@@ -25,12 +28,11 @@ import com.google.common.collect.Range;
 
 import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.base.IWithIntCode;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 
 /**
  * 季度
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public enum Quarter implements IWithIntCode {
     /** 第一季度 */
@@ -89,7 +91,7 @@ public enum Quarter implements IWithIntCode {
      */
     @StaticFactoryMethod(Quarter.class)
     public static Quarter fromMonth(Month month) {
-        AssertTools.checkNotNull(month);
+        checkNotNull(month);
         final int monthValue = month.getValue();
         return of(computeQuarterValueInternal(monthValue));
     }
@@ -246,7 +248,7 @@ public enum Quarter implements IWithIntCode {
      * @throws DateTimeException 如果给定的季度值不在有效范围内（1到4），将抛出异常
      */
     public static int checkValidIntValue(int value) {
-        AssertTools.checkCondition(value >= 1 && value <= 4,
+        checkCondition(value >= 1 && value <= 4,
                 () -> new DateTimeException("Invalid value for Quarter: " + value));
         return value;
     }

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java

@@ -17,6 +17,7 @@
 package xyz.zhouxy.plusone.commons.time;
 
 import static java.time.temporal.ChronoField.YEAR;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -32,12 +33,11 @@ import javax.annotation.Nullable;
 import com.google.errorprone.annotations.Immutable;
 
 import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 
 /**
  * 表示年份与季度
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @Immutable
 public final class YearQuarter implements Comparable<YearQuarter>, Serializable {
@@ -93,7 +93,7 @@ public final class YearQuarter implements Comparable<YearQuarter>, Serializable
      */
     @StaticFactoryMethod(YearQuarter.class)
     public static YearQuarter of(LocalDate date) {
-        AssertTools.checkNotNull(date);
+        checkNotNull(date);
         return new YearQuarter(date.getYear(), Quarter.fromMonth(date.getMonth()));
     }
 
@@ -105,7 +105,7 @@ public final class YearQuarter implements Comparable<YearQuarter>, Serializable
      */
     @StaticFactoryMethod(YearQuarter.class)
     public static YearQuarter of(Date date) {
-        AssertTools.checkNotNull(date);
+        checkNotNull(date);
         @SuppressWarnings("deprecation")
         final int yearValue = YEAR.checkValidIntValue(date.getYear() + 1900L);
         @SuppressWarnings("deprecation")
@@ -121,7 +121,7 @@ public final class YearQuarter implements Comparable<YearQuarter>, Serializable
      */
     @StaticFactoryMethod(YearQuarter.class)
     public static YearQuarter of(Calendar date) {
-        AssertTools.checkNotNull(date);
+        checkNotNull(date);
         final int yearValue = ChronoField.YEAR.checkValidIntValue(date.get(Calendar.YEAR));
         final int monthValue = date.get(Calendar.MONTH) + 1;
         return new YearQuarter(yearValue, Quarter.fromMonth(monthValue));
@@ -135,7 +135,7 @@ public final class YearQuarter implements Comparable<YearQuarter>, Serializable
      */
     @StaticFactoryMethod(YearQuarter.class)
     public static YearQuarter of(YearMonth yearMonth) {
-        AssertTools.checkNotNull(yearMonth);
+        checkNotNull(yearMonth);
         return of(yearMonth.getYear(), Quarter.fromMonth(yearMonth.getMonth()));
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/package-info.java

@@ -22,7 +22,7 @@
  * 模仿 JDK 的 {@link java.time.Month} 和 {@link java.time.YearMonth}，
  * 实现 {@link Quarter}，{@link YearQuarter}，对季度进行建模。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ParametersAreNonnullByDefault
 package xyz.zhouxy.plusone.commons.time;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java

@@ -16,6 +16,9 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +37,7 @@ import javax.annotation.Nullable;
  * <p>
  * 数组工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class ArrayTools {
@@ -258,7 +261,7 @@ public class ArrayTools {
      * @throws IllegalArgumentException 当参数为空时抛出
      */
     public static <T> boolean isAllElementsNotNull(final T[] arr) {
-        AssertTools.checkArgument(arr != null, "The array cannot be null.");
+        checkArgument(arr != null, "The array cannot be null.");
         return Arrays.stream(arr).allMatch(Objects::nonNull);
     }
 
@@ -488,10 +491,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static char[] repeat(char[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_CHAR_ARRAY;
@@ -523,10 +526,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static byte[] repeat(byte[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_BYTE_ARRAY;
@@ -558,10 +561,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static short[] repeat(short[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_SHORT_ARRAY;
@@ -593,10 +596,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static int[] repeat(int[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_INT_ARRAY;
@@ -628,10 +631,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static long[] repeat(long[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_LONG_ARRAY;
@@ -663,10 +666,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static float[] repeat(float[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_FLOAT_ARRAY;
@@ -698,10 +701,10 @@ public class ArrayTools {
      * @return 重复后的数组
      */
     public static double[] repeat(double[] arr, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(arr));
-        AssertTools.checkArgument(times >= 0,
+        checkArgument(Objects.nonNull(arr));
+        checkArgument(times >= 0,
                 "The number of times must be greater than or equal to zero");
-        AssertTools.checkArgument(maxLength >= 0,
+        checkArgument(maxLength >= 0,
                 "The max length must be greater than or equal to zero");
         if (times == 0) {
             return EMPTY_DOUBLE_ARRAY;
@@ -747,7 +750,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(char[] a, int fromIndex, int toIndex, @Nullable char[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -790,7 +793,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(byte[] a, int fromIndex, int toIndex, @Nullable byte[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -833,7 +836,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(short[] a, int fromIndex, int toIndex, @Nullable short[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -876,7 +879,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(int[] a, int fromIndex, int toIndex, @Nullable int[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -919,7 +922,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(long[] a, int fromIndex, int toIndex, @Nullable long[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -962,7 +965,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(float[] a, int fromIndex, int toIndex, @Nullable float[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -1005,7 +1008,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     public static void fill(double[] a, int fromIndex, int toIndex, @Nullable double[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -1060,7 +1063,7 @@ public class ArrayTools {
      * @param values    填充内容
      */
     private static <T> void fillInternal(T[] a, int fromIndex, int toIndex, @Nullable T[] values) {
-        AssertTools.checkArgument(Objects.nonNull(a));
+        checkArgument(Objects.nonNull(a));
         if (values == null || values.length == 0) {
             return;
         }
@@ -1087,7 +1090,7 @@ public class ArrayTools {
     // #region - indexOf
 
     public static <T> int indexOf(@Nullable T[] arr, Predicate<? super T> predicate) {
-        AssertTools.checkNotNull(predicate);
+        checkNotNull(predicate);
         if (arr == null || arr.length == 0) {
             return NOT_FOUND_INDEX;
         }
@@ -1192,7 +1195,7 @@ public class ArrayTools {
     // #region - lastIndexOf
 
     public static <T> int lastIndexOf(@Nullable T[] arr, Predicate<? super T> predicate) {
-        AssertTools.checkNotNull(predicate);
+        checkNotNull(predicate);
         if (arr == null || arr.length == 0) {
             return NOT_FOUND_INDEX;
         }

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java

@@ -31,15 +31,15 @@ import xyz.zhouxy.plusone.commons.exception.system.DataOperationResultException;
  * 本工具类不封装过多判断逻辑，鼓励充分使用项目中的工具类进行逻辑判断。
  *
  * <pre>
- * AssertTools.checkArgument(StringUtils.hasText(str), "The argument cannot be blank.");
- * AssertTools.checkState(ArrayUtils.isNotEmpty(result), "The result cannot be empty.");
- * AssertTools.checkCondition(!CollectionUtils.isEmpty(roles),
+ * checkArgument(StringUtils.hasText(str), "The argument cannot be blank.");
+ * checkState(ArrayUtils.isNotEmpty(result), "The result cannot be empty.");
+ * checkCondition(!CollectionUtils.isEmpty(roles),
  *     () -> new InvalidInputException("The roles cannot be empty."));
- * AssertTools.checkCondition(RegexTools.matches(email, PatternConsts.EMAIL),
+ * checkCondition(RegexTools.matches(email, PatternConsts.EMAIL),
  *     "must be a well-formed email address");
  * </pre>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public class AssertTools {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+
 import java.math.BigDecimal;
 
 import javax.annotation.Nonnull;
@@ -29,7 +31,7 @@ import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
  * <p>
  * BigDecimal 工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class BigDecimals {
@@ -53,8 +55,8 @@ public class BigDecimals {
      * @return 当 {@code a} 大于 {@code b} 时返回 {@code true}
      */
     public static boolean gt(BigDecimal a, BigDecimal b) {
-        AssertTools.checkNotNull(a, "Parameter could not be null.");
-        AssertTools.checkNotNull(b, "Parameter could not be null.");
+        checkNotNull(a, "Parameter could not be null.");
+        checkNotNull(b, "Parameter could not be null.");
         return (a != b) && (a.compareTo(b) > 0);
     }
 
@@ -66,8 +68,8 @@ public class BigDecimals {
      * @return 当 {@code a} 大于等于 {@code b} 时返回 {@code true}
      */
     public static boolean ge(BigDecimal a, BigDecimal b) {
-        AssertTools.checkNotNull(a, "Parameter could not be null.");
-        AssertTools.checkNotNull(b, "Parameter could not be null.");
+        checkNotNull(a, "Parameter could not be null.");
+        checkNotNull(b, "Parameter could not be null.");
         return (a == b) || (a.compareTo(b) >= 0);
     }
 
@@ -79,8 +81,8 @@ public class BigDecimals {
      * @return 当 {@code a} 小于 {@code b} 时返回 {@code true}
      */
     public static boolean lt(BigDecimal a, BigDecimal b) {
-        AssertTools.checkNotNull(a, "Parameter could not be null.");
-        AssertTools.checkNotNull(b, "Parameter could not be null.");
+        checkNotNull(a, "Parameter could not be null.");
+        checkNotNull(b, "Parameter could not be null.");
         return (a != b) && (a.compareTo(b) < 0);
     }
 
@@ -92,8 +94,8 @@ public class BigDecimals {
      * @return 当 {@code a} 小于等于 {@code b} 时返回 {@code true}
      */
     public static boolean le(BigDecimal a, BigDecimal b) {
-        AssertTools.checkNotNull(a, "Parameter could not be null.");
-        AssertTools.checkNotNull(b, "Parameter could not be null.");
+        checkNotNull(a, "Parameter could not be null.");
+        checkNotNull(b, "Parameter could not be null.");
         return (a == b) || (a.compareTo(b) <= 0);
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java

@@ -40,7 +40,7 @@ import xyz.zhouxy.plusone.commons.time.YearQuarter;
 /**
  * 日期时间工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public class DateTimeTools {
 
@@ -374,258 +374,6 @@ public class DateTimeTools {
     // #endregion
     // ================================
 
-    // ================================
-    // #region - toJodaInstant
-    // ================================
-
-    /**
-     * 将 {@link java.time.Instant} 转换为 {@link org.joda.time.Instant}
-     *
-     * @param instant {@link java.time.Instant} 对象
-     * @return {@link org.joda.time.Instant} 对象
-     */
-    public static org.joda.time.Instant toJodaInstant(java.time.Instant instant) {
-        return new org.joda.time.Instant(instant.toEpochMilli());
-    }
-
-    /**
-     * 将 {@link java.time.ZonedDateTime} 转换为 {@link org.joda.time.Instant}
-     *
-     * @param zonedDateTime {@link java.time.ZonedDateTime} 对象
-     * @return {@link org.joda.time.Instant} 对象
-     */
-    public static org.joda.time.Instant toJodaInstant(java.time.ZonedDateTime zonedDateTime) {
-        return toJodaInstant(zonedDateTime.toInstant());
-    }
-
-    /**
-     * 计算指定时区的地区时间，对应的时间戳。结果为 {@link org.joda.time.Instant} 对象
-     *
-     * @param localDateTime {@link java.time.LocalDateTime} 对象
-     * @param zone          时区
-     * @return {@link org.joda.time.Instant} 对象
-     */
-    public static org.joda.time.Instant toJodaInstant(java.time.LocalDateTime localDateTime, java.time.ZoneId zone) {
-        return toJodaInstant(java.time.ZonedDateTime.of(localDateTime, zone));
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - toJavaInstant
-    // ================================
-
-    /**
-     * 将 {@link org.joda.time.Instant} 对象转换为 {@link java.time.Instant} 对象
-     *
-     * @param instant {@link org.joda.time.Instant} 对象
-     * @return {@link java.time.Instant} 对象
-     */
-    public static java.time.Instant toJavaInstant(org.joda.time.Instant instant) {
-        return toInstant(instant.getMillis());
-    }
-
-    /**
-     * 将 joda-time 中的 {@link org.joda.time.DateTime} 对象转换为 Java 的
-     * {@link java.time.Instant} 对象
-     *
-     * @param dateTime joda-time 中表示日期时间的 {@link org.joda.time.DateTime} 对象
-     * @return Java 表示时间戳的 {@link java.time.Instant} 对象
-     */
-    public static java.time.Instant toJavaInstant(org.joda.time.DateTime dateTime) {
-        return toInstant(dateTime.getMillis());
-    }
-
-    /**
-     * 将 joda-time 中的 {@link org.joda.time.LocalDateTime} 对象和
-     * {@link org.joda.time.DateTimeZone} 对象
-     * 转换为 Java 中的 {@link java.time.Instant} 对象
-     *
-     * @param localDateTime
-     * @param zone
-     * @return
-     */
-    public static java.time.Instant toJavaInstant(
-            org.joda.time.LocalDateTime localDateTime,
-            org.joda.time.DateTimeZone zone) {
-        return toJavaInstant(localDateTime.toDateTime(zone));
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - toJodaDateTime
-    // ================================
-
-    /**
-     * 将 Java 中表示日期时间的 {@link java.time.ZonedDateTime} 对象
-     * 转换为 joda-time 的 {@link org.joda.time.DateTime} 对象
-     *
-     * @param zonedDateTime 日期时间
-     * @return joda-time 中对应的 {@link org.joda.time.DateTime} 对象
-     */
-    public static org.joda.time.DateTime toJodaDateTime(java.time.ZonedDateTime zonedDateTime) {
-        org.joda.time.DateTimeZone zone = org.joda.time.DateTimeZone.forID(zonedDateTime.getZone().getId());
-        return toJodaInstant(zonedDateTime.toInstant()).toDateTime(zone);
-    }
-
-    /**
-     * 将 java.time 中表示日期时间的 {@link java.time.LocalDateTime} 对象和表示时区的
-     * {@link java.time.ZoneId} 对象转换为 joda-time 中对应的 {@link org.joda.time.DateTime}
-     * 对象
-     * 转换为 joda-time 中对应的 {@link org.joda.time.DateTime} 对象
-     *
-     * @param localDateTime 日期时间
-     * @param zone          时区
-     * @return joda-time 中对应的 {@link org.joda.time.DateTime} 对象
-     */
-    public static org.joda.time.DateTime toJodaDateTime(
-            java.time.LocalDateTime localDateTime,
-            java.time.ZoneId zone) {
-        org.joda.time.DateTimeZone dateTimeZone = toJodaZone(zone);
-        return toJodaInstant(ZonedDateTime.of(localDateTime, zone).toInstant()).toDateTime(dateTimeZone);
-    }
-
-    /**
-     * 计算时间戳在指定时区对应的时间，结果使用 {@link org.joda.time.DateTime} 表示
-     *
-     * @param instant java.time 中的时间戳
-     * @param zone    java.time 中的时区
-     * @return joda-time 中带时区的日期时间
-     */
-    public static org.joda.time.DateTime toJodaDateTime(
-            java.time.Instant instant,
-            java.time.ZoneId zone) {
-        org.joda.time.DateTimeZone dateTimeZone = toJodaZone(zone);
-        return toJodaInstant(instant).toDateTime(dateTimeZone);
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - toZonedDateTime
-    // ================================
-
-    /**
-     * 将 joda-time 中带时区的日期时间，转换为 java.time 中带时区的日期时间
-     *
-     * @param dateTime joda-time 中带时区的日期时间
-     * @return java.time 中带时区的日期时间
-     */
-    public static java.time.ZonedDateTime toZonedDateTime(org.joda.time.DateTime dateTime) {
-        java.time.ZoneId zone = dateTime.getZone().toTimeZone().toZoneId();
-        return toJavaInstant(dateTime.toInstant()).atZone(zone);
-    }
-
-    /**
-     * 将 joda-time 中的 {@link org.joda.time.LocalDateTime} 和
-     * {@link org.joda.time.DateTimeZone}
-     * 转换为 java.time 中的 {@link java.time.ZonedDateTime}
-     *
-     * @param localDateTime joda-time 中的地区时间
-     * @param dateTimeZone  joda-time 中的时区
-     * @return java.time 中带时区的日期时间
-     */
-    public static java.time.ZonedDateTime toZonedDateTime(
-            org.joda.time.LocalDateTime localDateTime,
-            org.joda.time.DateTimeZone dateTimeZone) {
-        java.time.ZoneId zone = toJavaZone(dateTimeZone);
-        return toJavaInstant(localDateTime, dateTimeZone).atZone(zone);
-    }
-
-    /**
-     * 获取 joda-time 中的 {@link org.joda.time.Instant} 在指定时区的时间，用 Java 8+ 的
-     * {@link java.time.ZonedDateTime} 表示
-     *
-     * @param instant      joda-time 中的时间戳
-     * @param dateTimeZone joda-time 中的时区
-     * @return
-     */
-    public static java.time.ZonedDateTime toZonedDateTime(
-            org.joda.time.Instant instant,
-            org.joda.time.DateTimeZone dateTimeZone) {
-        java.time.ZoneId zone = toJavaZone(dateTimeZone);
-        return toJavaInstant(instant).atZone(zone);
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - toJodaLocalDateTime
-    // ================================
-
-    /**
-     * 将 {@link java.time.LocalDateTime} 转换为 {@link org.joda.time.LocalDateTime}
-     *
-     * @param localDateTime Java 8 LocalDateTime
-     * @return joda-time LocalDateTime
-     */
-    public static org.joda.time.LocalDateTime toJodaLocalDateTime(java.time.LocalDateTime localDateTime) {
-        java.time.ZoneId javaZone = java.time.ZoneId.systemDefault();
-        org.joda.time.DateTimeZone jodaZone = toJodaZone(javaZone);
-        return toJodaInstant(localDateTime, javaZone).toDateTime(jodaZone).toLocalDateTime();
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - toJavaLocalDateTime
-    // ================================
-
-    /**
-     * 将 {@link org.joda.time.LocalDateTime} 转换为 {@link java.time.LocalDateTime}
-     *
-     * @param localDateTime joda-time LocalDateTime
-     * @return Java 8 LocalDateTime
-     */
-    public static java.time.LocalDateTime toJavaLocalDateTime(org.joda.time.LocalDateTime localDateTime) {
-        org.joda.time.DateTimeZone jodaZone = org.joda.time.DateTimeZone.getDefault();
-        java.time.ZoneId javaZone = toJavaZone(jodaZone);
-        return toJavaInstant(localDateTime, jodaZone).atZone(javaZone).toLocalDateTime();
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
-    // ================================
-    // #region - ZoneId <--> DateTimeZone
-    // ================================
-
-    /**
-     * 转换 Java API 和 joda-time API 表示时区的对象
-     *
-     * @param jodaZone joda-time API 中表示时区的对象
-     * @return Java API 中表示时区的对象
-     */
-    public static java.time.ZoneId toJavaZone(org.joda.time.DateTimeZone jodaZone) {
-        return jodaZone.toTimeZone().toZoneId();
-    }
-
-    /**
-     * 转换 Java API 和 joda-time API 表示时区的对象
-     *
-     * @param zone Java API 中表示时区的对象
-     * @return joda-time API 中表示时区的对象
-     */
-    public static org.joda.time.DateTimeZone toJodaZone(java.time.ZoneId zone) {
-        return org.joda.time.DateTimeZone.forID(zone.getId());
-    }
-
-    // ================================
-    // #endregion
-    // ================================
-
     // ================================
     // #region - YearQuarter & Quarter
     // ================================

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java

@@ -16,6 +16,9 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkCondition;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+
 import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
@@ -23,7 +26,7 @@ import javax.annotation.Nullable;
 /**
  * 枚举工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public final class EnumTools {
 
@@ -43,7 +46,7 @@ public final class EnumTools {
     @Deprecated
     private static <E extends Enum<?>> E valueOfInternal(Class<E> enumType, int ordinal) { // NOSONAR 该方法弃用，但不删掉
         E[] values = enumType.getEnumConstants();
-        AssertTools.checkCondition((ordinal >= 0 && ordinal < values.length),
+        checkCondition((ordinal >= 0 && ordinal < values.length),
                 () -> new EnumConstantNotPresentException(enumType, Integer.toString(ordinal)));
         return values[ordinal];
     }
@@ -59,7 +62,7 @@ public final class EnumTools {
      */
     @Deprecated
     public static <E extends Enum<?>> E valueOf(Class<E> enumType, int ordinal) { // NOSONAR 该方法弃用，但不删掉
-        AssertTools.checkNotNull(enumType, "Enum type must not be null.");
+        checkNotNull(enumType, "Enum type must not be null.");
         return valueOfInternal(enumType, ordinal);
     }
 
@@ -76,7 +79,7 @@ public final class EnumTools {
     @Deprecated
     public static <E extends Enum<?>> E valueOf(Class<E> enumType, // NOSONAR 该方法弃用，但不删掉
             @Nullable Integer ordinal, @Nullable E defaultValue) {
-        AssertTools.checkNotNull(enumType);
+        checkNotNull(enumType);
         return null == ordinal ? defaultValue : valueOfInternal(enumType, ordinal);
     }
 
@@ -95,8 +98,8 @@ public final class EnumTools {
             Class<E> enumType,
             @Nullable Integer ordinal,
             Supplier<E> defaultValue) {
-        AssertTools.checkNotNull(enumType);
-        AssertTools.checkNotNull(defaultValue);
+        checkNotNull(enumType);
+        checkNotNull(defaultValue);
         return null == ordinal ? defaultValue.get() : valueOfInternal(enumType, ordinal);
     }
 
@@ -112,7 +115,7 @@ public final class EnumTools {
     @Deprecated
     public static <E extends Enum<?>> E getValueOrDefault(Class<E> enumType, @Nullable Integer ordinal) { // NOSONAR 该方法弃用，但不删掉
         return getValueOrDefault(enumType, ordinal, () -> {
-            AssertTools.checkNotNull(enumType, "Enum type must not be null.");
+            checkNotNull(enumType, "Enum type must not be null.");
             E[] values = enumType.getEnumConstants();
             return values[0];
         });
@@ -133,10 +136,10 @@ public final class EnumTools {
     }
 
     public static <E extends Enum<?>> Integer checkOrdinal(Class<E> enumType, Integer ordinal) {
-        AssertTools.checkNotNull(enumType, "Enum type must not be null.");
-        AssertTools.checkNotNull(ordinal, "Ordinal must not be null.");
+        checkNotNull(enumType, "Enum type must not be null.");
+        checkNotNull(ordinal, "Ordinal must not be null.");
         E[] values = enumType.getEnumConstants();
-        AssertTools.checkCondition(ordinal >= 0 && ordinal < values.length,
+        checkCondition(ordinal >= 0 && ordinal < values.length,
                 () -> new EnumConstantNotPresentException(enumType, Integer.toString(ordinal)));
         return ordinal;
     }
@@ -180,7 +183,7 @@ public final class EnumTools {
             Class<E> enumType,
             @Nullable Integer ordinal,
             @Nullable Integer defaultValue) {
-        AssertTools.checkNotNull(enumType);
+        checkNotNull(enumType);
         return checkOrdinalOrGetInternal(enumType, ordinal, () -> checkOrdinalOrDefaultInternal(enumType, defaultValue, null));
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -33,7 +35,7 @@ import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
  *
  * 参考 <a href="https://lostechies.com/jimmybogard/2008/08/12/enumeration-classes/">Enumeration classes</a>
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @deprecated 设计 Enumeration 的灵感来自于 .net 社区，因为 C&num; 的枚举不带行为。
  * 但 Java 的枚举可以带行为，故大多数情况下不需要这种设计。
  */
@@ -44,7 +46,7 @@ public abstract class Enumeration<T extends Enumeration<T>> // NOSONAR 暂不移
     protected final String name;
 
     protected Enumeration(final int id, final String name) {
-        AssertTools.checkArgument(StringTools.isNotBlank(name), "Name of enumeration must has text.");
+        checkArgument(StringTools.isNotBlank(name), "Name of enumeration must has text.");
         this.id = id;
         this.name = name;
     }
@@ -126,7 +128,7 @@ public abstract class Enumeration<T extends Enumeration<T>> // NOSONAR 暂不移
          * @return 枚举对象
          */
         public T get(int id) {
-            AssertTools.checkArgument(this.valueMap.containsKey(id), "[%s] 对应的值不存在", id);
+            checkArgument(this.valueMap.containsKey(id), "[%s] 对应的值不存在", id);
             return this.valueMap.get(id);
         }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java

@@ -16,8 +16,9 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgumentNotNull;
+
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -29,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
  *
  * @see UUID
  * @see IdWorker
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public class IdGenerator {
 
@@ -69,7 +70,7 @@ public class IdGenerator {
      * @return UUID 字符串
      */
     public static String toSimpleString(UUID uuid) {
-        AssertTools.checkArgument(Objects.nonNull(uuid));
+        checkArgumentNotNull(uuid);
         return (uuidDigits(uuid.getMostSignificantBits() >> 32, 8) +
                 uuidDigits(uuid.getMostSignificantBits() >> 16, 4) +
                 uuidDigits(uuid.getMostSignificantBits(), 4) +

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/JodaTimeTools.java

@@ -0,0 +1,284 @@
+/*
+ * 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.commons.util;
+
+/**
+ * Joda-Time 工具类
+ *
+ * @author ZhouXY108 <luquanlion@outlook.com>
+ */
+public class JodaTimeTools {
+
+    // ================================
+    // #region - toJodaInstant
+    // ================================
+
+    /**
+     * 将 {@link java.time.Instant} 转换为 {@link org.joda.time.Instant}
+     *
+     * @param instant {@link java.time.Instant} 对象
+     * @return {@link org.joda.time.Instant} 对象
+     */
+    public static org.joda.time.Instant toJodaInstant(java.time.Instant instant) {
+        return new org.joda.time.Instant(instant.toEpochMilli());
+    }
+
+    /**
+     * 将 {@link java.time.ZonedDateTime} 转换为 {@link org.joda.time.Instant}
+     *
+     * @param zonedDateTime {@link java.time.ZonedDateTime} 对象
+     * @return {@link org.joda.time.Instant} 对象
+     */
+    public static org.joda.time.Instant toJodaInstant(java.time.ZonedDateTime zonedDateTime) {
+        return toJodaInstant(zonedDateTime.toInstant());
+    }
+
+    /**
+     * 计算指定时区的地区时间，对应的时间戳。结果为 {@link org.joda.time.Instant} 对象
+     *
+     * @param localDateTime {@link java.time.LocalDateTime} 对象
+     * @param zone          时区
+     * @return {@link org.joda.time.Instant} 对象
+     */
+    public static org.joda.time.Instant toJodaInstant(java.time.LocalDateTime localDateTime, java.time.ZoneId zone) {
+        return toJodaInstant(java.time.ZonedDateTime.of(localDateTime, zone));
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - toJavaInstant
+    // ================================
+
+    /**
+     * 将 {@link org.joda.time.Instant} 对象转换为 {@link java.time.Instant} 对象
+     *
+     * @param instant {@link org.joda.time.Instant} 对象
+     * @return {@link java.time.Instant} 对象
+     */
+    public static java.time.Instant toJavaInstant(org.joda.time.Instant instant) {
+        return DateTimeTools.toInstant(instant.getMillis());
+    }
+
+    /**
+     * 将 joda-time 中的 {@link org.joda.time.DateTime} 对象转换为 Java 的
+     * {@link java.time.Instant} 对象
+     *
+     * @param dateTime joda-time 中表示日期时间的 {@link org.joda.time.DateTime} 对象
+     * @return Java 表示时间戳的 {@link java.time.Instant} 对象
+     */
+    public static java.time.Instant toJavaInstant(org.joda.time.DateTime dateTime) {
+        return DateTimeTools.toInstant(dateTime.getMillis());
+    }
+
+    /**
+     * 将 joda-time 中的 {@link org.joda.time.LocalDateTime} 对象和
+     * {@link org.joda.time.DateTimeZone} 对象
+     * 转换为 Java 中的 {@link java.time.Instant} 对象
+     *
+     * @param localDateTime
+     * @param zone
+     * @return
+     */
+    public static java.time.Instant toJavaInstant(
+            org.joda.time.LocalDateTime localDateTime,
+            org.joda.time.DateTimeZone zone) {
+        return toJavaInstant(localDateTime.toDateTime(zone));
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - toJodaDateTime
+    // ================================
+
+    /**
+     * 将 Java 中表示日期时间的 {@link java.time.ZonedDateTime} 对象
+     * 转换为 joda-time 的 {@link org.joda.time.DateTime} 对象
+     *
+     * @param zonedDateTime 日期时间
+     * @return joda-time 中对应的 {@link org.joda.time.DateTime} 对象
+     */
+    public static org.joda.time.DateTime toJodaDateTime(java.time.ZonedDateTime zonedDateTime) {
+        org.joda.time.DateTimeZone zone = org.joda.time.DateTimeZone.forID(zonedDateTime.getZone().getId());
+        return toJodaInstant(zonedDateTime.toInstant()).toDateTime(zone);
+    }
+
+    /**
+     * 将 java.time 中表示日期时间的 {@link java.time.LocalDateTime} 对象和表示时区的
+     * {@link java.time.ZoneId} 对象转换为 joda-time 中对应的 {@link org.joda.time.DateTime}
+     * 对象
+     * 转换为 joda-time 中对应的 {@link org.joda.time.DateTime} 对象
+     *
+     * @param localDateTime 日期时间
+     * @param zone          时区
+     * @return joda-time 中对应的 {@link org.joda.time.DateTime} 对象
+     */
+    public static org.joda.time.DateTime toJodaDateTime(
+            java.time.LocalDateTime localDateTime,
+            java.time.ZoneId zone) {
+        org.joda.time.DateTimeZone dateTimeZone = toJodaZone(zone);
+        return toJodaInstant(java.time.ZonedDateTime.of(localDateTime, zone).toInstant()).toDateTime(dateTimeZone);
+    }
+
+    /**
+     * 计算时间戳在指定时区对应的时间，结果使用 {@link org.joda.time.DateTime} 表示
+     *
+     * @param instant java.time 中的时间戳
+     * @param zone    java.time 中的时区
+     * @return joda-time 中带时区的日期时间
+     */
+    public static org.joda.time.DateTime toJodaDateTime(
+            java.time.Instant instant,
+            java.time.ZoneId zone) {
+        org.joda.time.DateTimeZone dateTimeZone = toJodaZone(zone);
+        return toJodaInstant(instant).toDateTime(dateTimeZone);
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - toZonedDateTime
+    // ================================
+
+    /**
+     * 将 joda-time 中带时区的日期时间，转换为 java.time 中带时区的日期时间
+     *
+     * @param dateTime joda-time 中带时区的日期时间
+     * @return java.time 中带时区的日期时间
+     */
+    public static java.time.ZonedDateTime toZonedDateTime(org.joda.time.DateTime dateTime) {
+        java.time.ZoneId zone = dateTime.getZone().toTimeZone().toZoneId();
+        return toJavaInstant(dateTime.toInstant()).atZone(zone);
+    }
+
+    /**
+     * 将 joda-time 中的 {@link org.joda.time.LocalDateTime} 和
+     * {@link org.joda.time.DateTimeZone}
+     * 转换为 java.time 中的 {@link java.time.ZonedDateTime}
+     *
+     * @param localDateTime joda-time 中的地区时间
+     * @param dateTimeZone  joda-time 中的时区
+     * @return java.time 中带时区的日期时间
+     */
+    public static java.time.ZonedDateTime toZonedDateTime(
+            org.joda.time.LocalDateTime localDateTime,
+            org.joda.time.DateTimeZone dateTimeZone) {
+        java.time.ZoneId zone = toJavaZone(dateTimeZone);
+        return toJavaInstant(localDateTime, dateTimeZone).atZone(zone);
+    }
+
+    /**
+     * 获取 joda-time 中的 {@link org.joda.time.Instant} 在指定时区的时间，用 Java 8+ 的
+     * {@link java.time.ZonedDateTime} 表示
+     *
+     * @param instant      joda-time 中的时间戳
+     * @param dateTimeZone joda-time 中的时区
+     * @return
+     */
+    public static java.time.ZonedDateTime toZonedDateTime(
+            org.joda.time.Instant instant,
+            org.joda.time.DateTimeZone dateTimeZone) {
+        java.time.ZoneId zone = toJavaZone(dateTimeZone);
+        return toJavaInstant(instant).atZone(zone);
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - toJodaLocalDateTime
+    // ================================
+
+    /**
+     * 将 {@link java.time.LocalDateTime} 转换为 {@link org.joda.time.LocalDateTime}
+     *
+     * @param localDateTime Java 8 LocalDateTime
+     * @return joda-time LocalDateTime
+     */
+    public static org.joda.time.LocalDateTime toJodaLocalDateTime(java.time.LocalDateTime localDateTime) {
+        java.time.ZoneId javaZone = java.time.ZoneId.systemDefault();
+        org.joda.time.DateTimeZone jodaZone = toJodaZone(javaZone);
+        return toJodaInstant(localDateTime, javaZone).toDateTime(jodaZone).toLocalDateTime();
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - toJavaLocalDateTime
+    // ================================
+
+    /**
+     * 将 {@link org.joda.time.LocalDateTime} 转换为 {@link java.time.LocalDateTime}
+     *
+     * @param localDateTime joda-time LocalDateTime
+     * @return Java 8 LocalDateTime
+     */
+    public static java.time.LocalDateTime toJavaLocalDateTime(org.joda.time.LocalDateTime localDateTime) {
+        org.joda.time.DateTimeZone jodaZone = org.joda.time.DateTimeZone.getDefault();
+        java.time.ZoneId javaZone = toJavaZone(jodaZone);
+        return toJavaInstant(localDateTime, jodaZone).atZone(javaZone).toLocalDateTime();
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    // ================================
+    // #region - ZoneId <--> DateTimeZone
+    // ================================
+
+    /**
+     * 转换 Java API 和 joda-time API 表示时区的对象
+     *
+     * @param jodaZone joda-time API 中表示时区的对象
+     * @return Java API 中表示时区的对象
+     */
+    public static java.time.ZoneId toJavaZone(org.joda.time.DateTimeZone jodaZone) {
+        return jodaZone.toTimeZone().toZoneId();
+    }
+
+    /**
+     * 转换 Java API 和 joda-time API 表示时区的对象
+     *
+     * @param zone Java API 中表示时区的对象
+     * @return joda-time API 中表示时区的对象
+     */
+    public static org.joda.time.DateTimeZone toJodaZone(java.time.ZoneId zone) {
+        return org.joda.time.DateTimeZone.forID(zone.getId());
+    }
+
+    // ================================
+    // #endregion
+    // ================================
+
+    /**
+     * 私有构造方法
+     */
+    private JodaTimeTools() {
+        throw new IllegalStateException("Utility class");
+    }
+}

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java

@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
 /**
  * 数字工具类
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public class Numbers {
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java

@@ -31,7 +31,7 @@ import com.google.common.annotations.Beta;
  * <p>
  * 提供一些 Optional 相关的方法
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  * @see Optional
  * @see OptionalInt

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Objects;
@@ -27,7 +29,7 @@ import java.util.concurrent.ThreadLocalRandom;
  * <p>
  * 建议调用方自行维护 Random 对象
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public final class RandomTools {
 
@@ -67,21 +69,21 @@ public final class RandomTools {
      * @return 随机字符串
      */
     public static String randomStr(Random random, char[] sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(random), "Random cannot be null.");
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(random), "Random cannot be null.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(random, sourceCharacters, length);
     }
 
     public static String randomStr(char[] sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(ThreadLocalRandom.current(), sourceCharacters, length);
     }
 
     public static String secureRandomStr(char[] sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(DEFAULT_SECURE_RANDOM, sourceCharacters, length);
     }
 
@@ -96,21 +98,21 @@ public final class RandomTools {
      * @return 随机字符串
      */
     public static String randomStr(Random random, String sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(random), "Random cannot be null.");
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(random), "Random cannot be null.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(random, sourceCharacters, length);
     }
 
     public static String randomStr(String sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(ThreadLocalRandom.current(), sourceCharacters, length);
     }
 
     public static String secureRandomStr(String sourceCharacters, int length) {
-        AssertTools.checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
-        AssertTools.checkArgument(length >= 0, "The length should be greater than or equal to zero.");
+        checkArgument(Objects.nonNull(sourceCharacters), "Source characters cannot be null.");
+        checkArgument(length >= 0, "The length should be greater than or equal to zero.");
         return randomStrInternal(DEFAULT_SECURE_RANDOM, sourceCharacters, length);
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java

@@ -16,6 +16,9 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
@@ -32,7 +35,7 @@ import com.google.common.cache.LoadingCache;
 /**
  * 封装一些常用的正则操作，并可以缓存 {@link Pattern} 实例以复用。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 public final class RegexTools {
 
@@ -72,7 +75,7 @@ public final class RegexTools {
      * @return {@link Pattern} 实例
      */
     public static Pattern getPattern(final String pattern, final int flags, final boolean cachePattern) {
-        AssertTools.checkNotNull(pattern);
+        checkNotNull(pattern);
         return cachePattern ? cacheAndGetPatternInternal(pattern, flags) : getPatternInternal(pattern, flags);
     }
 
@@ -95,7 +98,7 @@ public final class RegexTools {
      */
     @Nonnull
     public static Pattern getPattern(final String pattern, final int flags) {
-        AssertTools.checkNotNull(pattern);
+        checkNotNull(pattern);
         return getPatternInternal(pattern, flags);
     }
 
@@ -115,7 +118,7 @@ public final class RegexTools {
      * @return 判断结果
      */
     public static boolean matches(@Nullable final CharSequence input, final Pattern pattern) {
-        AssertTools.checkNotNull(pattern);
+        checkNotNull(pattern);
         return matchesInternal(input, pattern);
     }
 
@@ -127,7 +130,7 @@ public final class RegexTools {
      * @return 判断结果
      */
     public static boolean matchesAny(@Nullable final CharSequence input, final Pattern[] patterns) {
-        AssertTools.checkArgument(ArrayTools.isAllElementsNotNull(patterns));
+        checkArgument(ArrayTools.isAllElementsNotNull(patterns));
         return matchesAnyInternal(input, patterns);
     }
 
@@ -139,7 +142,7 @@ public final class RegexTools {
      * @return 判断结果
      */
     public static boolean matchesAll(@Nullable final CharSequence input, final Pattern[] patterns) {
-        AssertTools.checkArgument(ArrayTools.isAllElementsNotNull(patterns));
+        checkArgument(ArrayTools.isAllElementsNotNull(patterns));
         return matchesAllInternal(input, patterns);
     }
 
@@ -210,8 +213,8 @@ public final class RegexTools {
      * @return 结果
      */
     public static Matcher getMatcher(final CharSequence input, final Pattern pattern) {
-        AssertTools.checkNotNull(input);
-        AssertTools.checkNotNull(pattern);
+        checkNotNull(input);
+        checkNotNull(pattern);
         return pattern.matcher(input);
     }
 
@@ -261,8 +264,8 @@ public final class RegexTools {
      * @return 结果
      */
     public static Matcher getMatcher(final CharSequence input, final String pattern, final int flags) {
-        AssertTools.checkNotNull(input);
-        AssertTools.checkNotNull(pattern);
+        checkNotNull(input);
+        checkNotNull(pattern);
         return getPatternInternal(pattern, flags).matcher(input);
     }
 

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -73,9 +75,9 @@ public class SnowflakeIdGenerator {
      * @param datacenterId 数据中心ID (0~31)
      */
     public SnowflakeIdGenerator(final long workerId, final long datacenterId) {
-        AssertTools.checkArgument((workerId <= MAX_WORKER_ID && workerId >= 0),
+        checkArgument((workerId <= MAX_WORKER_ID && workerId >= 0),
                 "WorkerId can't be greater than %s or less than 0.", MAX_WORKER_ID);
-        AssertTools.checkArgument((datacenterId <= MAX_DATACENTER_ID && datacenterId >= 0),
+        checkArgument((datacenterId <= MAX_DATACENTER_ID && datacenterId >= 0),
                 "DatacenterId can't be greater than %s or less than 0.", MAX_DATACENTER_ID);
         this.datacenterIdAndWorkerId
                 = (datacenterId << DATACENTER_ID_SHIFT) | (workerId << WORKER_ID_SHIFT);

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkArgument;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
@@ -32,7 +34,7 @@ import xyz.zhouxy.plusone.commons.constant.PatternConsts;
  * <p>
  * 字符串工具类。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class StringTools {
@@ -110,7 +112,7 @@ public class StringTools {
      * @return 结果
      */
     public static String repeat(final String str, int times, int maxLength) {
-        AssertTools.checkArgument(Objects.nonNull(str));
+        checkArgument(Objects.nonNull(str));
         return String.valueOf(ArrayTools.repeat(str.toCharArray(), times, maxLength));
     }
 
@@ -210,8 +212,8 @@ public class StringTools {
         if (src == null || src.isEmpty()) {
             return EMPTY_STRING;
         }
-        AssertTools.checkArgument(front >= 0 && end >= 0);
-        AssertTools.checkArgument((front + end) <= src.length(), "需要截取的长度不能大于原字符串长度");
+        checkArgument(front >= 0 && end >= 0);
+        checkArgument((front + end) <= src.length(), "需要截取的长度不能大于原字符串长度");
         final char[] charArray = src.toCharArray();
         for (int i = front; i < charArray.length - end; i++) {
             charArray[i] = replacedChar;

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java

@@ -16,6 +16,8 @@
 
 package xyz.zhouxy.plusone.commons.util;
 
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
+
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -30,7 +32,7 @@ import javax.annotation.Nullable;
 /**
  * TreeBuilder
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  * @since 1.0.0
  */
 public class TreeBuilder<T, TSubTree extends T, TIdentity> {
@@ -76,7 +78,7 @@ public class TreeBuilder<T, TSubTree extends T, TIdentity> {
      * @param nodes 平铺的节点列表
      */
     public List<T> buildTree(Collection<T> nodes) {
-        AssertTools.checkNotNull(nodes);
+        checkNotNull(nodes);
         return buildTreeInternal(nodes, this.defaultComparator);
     }
 
@@ -93,7 +95,7 @@ public class TreeBuilder<T, TSubTree extends T, TIdentity> {
      *                   <b>仅影响调用 addChild 的顺序，如果操作对象本身对应的控制了子节点的顺序，无法影响其相关逻辑。</b>
      */
     public List<T> buildTree(Collection<T> nodes, @Nullable Comparator<? super T> comparator) {
-        AssertTools.checkNotNull(nodes);
+        checkNotNull(nodes);
         final Comparator<? super T> c = (comparator != null) ? comparator : this.defaultComparator;
         return buildTreeInternal(nodes, c);
     }

plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/package-info.java

@@ -19,7 +19,7 @@
  * <p>
  * 包含树构建器（{@link TreeBuilder}）、断言工具（{@link AssertTools}）、ID 生成器（{@link IdGenerator}）及其它实用工具类。
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ParametersAreNonnullByDefault
 package xyz.zhouxy.plusone.commons.util;

plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java

@@ -17,12 +17,12 @@
 package xyz.zhouxy.plusone.commons.base;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static xyz.zhouxy.plusone.commons.util.AssertTools.checkNotNull;
 
 import javax.annotation.Nonnull;
 
 import org.junit.jupiter.api.Test;
 
-import xyz.zhouxy.plusone.commons.util.AssertTools;
 
 class IWithCodeTests {
 
@@ -91,7 +91,7 @@ class IWithCodeTests {
         private final String code;
 
         WithCode(String code) {
-            AssertTools.checkNotNull(code);
+            checkNotNull(code);
             this.code = code;
         }
 

plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java

@@ -19,14 +19,12 @@ package xyz.zhouxy.plusone.commons.model.dto.test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.Statement;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -45,9 +43,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -57,6 +52,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
+
+import xyz.zhouxy.plusone.commons.gson.adapter.JSR310TypeAdapters.LocalDateTimeTypeAdapter;
+import xyz.zhouxy.plusone.commons.gson.adapter.JSR310TypeAdapters.LocalDateTypeAdapter;
 import xyz.zhouxy.plusone.commons.model.dto.PageResult;
 import xyz.zhouxy.plusone.commons.model.dto.PagingAndSortingQueryParams;
 import xyz.zhouxy.plusone.commons.model.dto.PagingParams;
@@ -187,31 +185,8 @@ public class PagingAndSortingQueryParamsTests {
     @Test
     void testGson() {
         Gson gson = new GsonBuilder()
-                .registerTypeAdapter(LocalDate.class, new TypeAdapter<LocalDate>() {
-
-                    @Override
-                    public void write(JsonWriter out, LocalDate value) throws IOException {
-                        out.value(DateTimeFormatter.ISO_DATE.format(value));
-                    }
-
-                    @Override
-                    public LocalDate read(JsonReader in) throws IOException {
-                        return LocalDate.parse(in.nextString(), DateTimeFormatter.ISO_DATE);
-                    }
-
-                })
-                .registerTypeAdapter(LocalDateTime.class, new TypeAdapter<LocalDateTime>() {
-
-                    @Override
-                    public void write(JsonWriter out, LocalDateTime value) throws IOException {
-                        out.value(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value));
-                    }
-
-                    @Override
-                    public LocalDateTime read(JsonReader in) throws IOException {
-                        return LocalDateTime.parse(in.nextString(), DateTimeFormatter.ISO_LOCAL_DATE_TIME);
-                    }
-                })
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter().nullSafe())
+                .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeTypeAdapter().nullSafe())
                 .create();
         try (SqlSession session = sqlSessionFactory.openSession()) {
             AccountQueryParams params = gson.fromJson(JSON_STR, AccountQueryParams.class);
@@ -245,7 +220,7 @@ public class PagingAndSortingQueryParamsTests {
 /**
  * 账号信息查询参数
  *
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
+ * @author ZhouXY108 <luquanlion@outlook.com>
  */
 @ToString(callSuper = true)
 class AccountQueryParams extends PagingAndSortingQueryParams {

plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java

@@ -277,144 +277,6 @@ class DateTimeToolsTests {
     // #endregion - toLocalDateTime
     // ================================
 
-    // ================================
-    // #region - toJodaInstant
-    // ================================
-
-    @Test
-    void toJodaInstant_JavaInstant() {
-        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, DateTimeTools.toJodaInstant(INSTANT_WITH_SYS_ZONE));
-        assertEquals(JODA_INSTANT, DateTimeTools.toJodaInstant(INSTANT));
-    }
-
-    @Test
-    void toJodaInstant_ZonedDateTime() {
-        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, DateTimeTools.toJodaInstant(ZONED_DATE_TIME_WITH_SYS_ZONE));
-        assertEquals(JODA_INSTANT, DateTimeTools.toJodaInstant(ZONED_DATE_TIME));
-    }
-
-    @Test
-    void toJodaInstant_LocalDateTimeAndZoneId() {
-        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, DateTimeTools.toJodaInstant(LOCAL_DATE_TIME, SYS_ZONE_ID));
-        assertEquals(JODA_INSTANT, DateTimeTools.toJodaInstant(LOCAL_DATE_TIME, ZONE_ID));
-    }
-
-    // ================================
-    // #endregion - toJodaInstant
-    // ================================
-
-    // ================================
-    // #region - toJavaInstant
-    // ================================
-
-    @Test
-    void toJavaInstant_JodaInstant() {
-        assertEquals(INSTANT_WITH_SYS_ZONE, DateTimeTools.toJavaInstant(JODA_INSTANT_WITH_SYS_ZONE));
-        assertEquals(INSTANT, DateTimeTools.toJavaInstant(JODA_INSTANT));
-    }
-
-    @Test
-    void toJavaInstant_JodaDateTime() {
-        assertEquals(INSTANT_WITH_SYS_ZONE, DateTimeTools.toJavaInstant(JODA_DATE_TIME_WITH_SYS_ZONE));
-        assertEquals(INSTANT, DateTimeTools.toJavaInstant(JODA_DATE_TIME));
-    }
-
-    @Test
-    void toJavaInstant_JodaLocalDateTimeAndJodaDateTimeZone() {
-        assertEquals(INSTANT_WITH_SYS_ZONE, DateTimeTools.toJavaInstant(JODA_LOCAL_DATE_TIME, JODA_SYS_ZONE));
-        assertEquals(INSTANT, DateTimeTools.toJavaInstant(JODA_LOCAL_DATE_TIME, JODA_ZONE));
-    }
-
-    // ================================
-    // #endregion - toJavaInstant
-    // ================================
-
-    // ================================
-    // #region - toJodaDateTime
-    // ================================
-
-    @Test
-    void toJodaDateTime_ZonedDateTime() {
-        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toJodaDateTime(ZONED_DATE_TIME_WITH_SYS_ZONE));
-        assertEquals(JODA_DATE_TIME, DateTimeTools.toJodaDateTime(ZONED_DATE_TIME));
-    }
-
-    @Test
-    void toJodaDateTime_LocalDateTimeAndZoneId() {
-        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toJodaDateTime(LOCAL_DATE_TIME, SYS_ZONE_ID));
-        assertEquals(JODA_DATE_TIME, DateTimeTools.toJodaDateTime(LOCAL_DATE_TIME, ZONE_ID));
-    }
-
-    @Test
-    void toJodaDateTime_InstantAndZoneId() {
-        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toJodaDateTime(INSTANT_WITH_SYS_ZONE, SYS_ZONE_ID));
-        assertEquals(JODA_DATE_TIME, DateTimeTools.toJodaDateTime(INSTANT, ZONE_ID));
-    }
-
-    // ================================
-    // #endregion - toJodaDateTime
-    // ================================
-
-    // ================================
-    // #region - toZonedDateTime
-    // ================================
-
-    @Test
-    void toZonedDateTime_JodaDateTime() {
-        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toZonedDateTime(JODA_DATE_TIME_WITH_SYS_ZONE));
-        assertEquals(ZONED_DATE_TIME, DateTimeTools.toZonedDateTime(JODA_DATE_TIME));
-    }
-
-    @Test
-    void toZonedDateTime_JodaLocalDateTimeAndJodaDateTimeZone() {
-        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toZonedDateTime(JODA_LOCAL_DATE_TIME, JODA_SYS_ZONE));
-        assertEquals(ZONED_DATE_TIME, DateTimeTools.toZonedDateTime(JODA_LOCAL_DATE_TIME, JODA_ZONE));
-    }
-
-    @Test
-    void toZonedDateTime_JodaInstantAndJodaDateTimeZone() {
-        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, DateTimeTools.toZonedDateTime(JODA_INSTANT_WITH_SYS_ZONE, JODA_SYS_ZONE));
-        assertEquals(ZONED_DATE_TIME, DateTimeTools.toZonedDateTime(JODA_INSTANT, JODA_ZONE));
-    }
-
-    // ================================
-    // #endregion - toZonedDateTime
-    // ================================
-
-    // ================================
-    // #region - toJodaLocalDateTime
-    // ================================
-
-    @Test
-    void toJodaLocalDateTime_JavaLocalDateTime() {
-        assertEquals(JODA_LOCAL_DATE_TIME, DateTimeTools.toJodaLocalDateTime(LOCAL_DATE_TIME));
-    }
-
-    @Test
-    void toJavaLocalDateTime_JodaLocalDateTime() {
-        assertEquals(LOCAL_DATE_TIME, DateTimeTools.toJavaLocalDateTime(JODA_LOCAL_DATE_TIME));
-    }
-
-    // ================================
-    // #endregion - toJodaLocalDateTime
-    // ================================
-
-    // ================================
-    // #region - ZoneId <--> DateTimeZone
-    // ================================
-
-    @Test
-    void convertJavaZoneIdAndJodaDateTimeZone() {
-        assertEquals(SYS_ZONE_ID, DateTimeTools.toJavaZone(JODA_SYS_ZONE));
-        assertEquals(ZONE_ID, DateTimeTools.toJavaZone(JODA_ZONE));
-        assertEquals(JODA_SYS_ZONE, DateTimeTools.toJodaZone(SYS_ZONE_ID));
-        assertEquals(JODA_ZONE, DateTimeTools.toJodaZone(ZONE_ID));
-    }
-
-    // ================================
-    // #endregion - ZoneId <--> DateTimeZone
-    // ================================
-
     // ================================
     // #region - YearQuarter & Quarter
     // ================================

plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/JodaTimeToolsTests.java

@@ -0,0 +1,223 @@
+/*
+ * 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.commons.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.junit.jupiter.api.Test;
+
+public class JodaTimeToolsTests {
+
+    // Java
+    static final LocalDateTime LOCAL_DATE_TIME = LocalDateTime.of(2024, 12, 29, 12, 58, 30, 333000000);
+    static final LocalDate LOCAL_DATE = LOCAL_DATE_TIME.toLocalDate();
+    static final LocalTime LOCAL_TIME = LOCAL_DATE_TIME.toLocalTime();
+
+    // Java - 2024-12-29 12:58:30.333333333 SystemDefaultZone
+    static final ZoneId SYS_ZONE_ID = ZoneId.systemDefault();
+    static final ZonedDateTime ZONED_DATE_TIME_WITH_SYS_ZONE = LOCAL_DATE_TIME.atZone(SYS_ZONE_ID);
+    static final Instant INSTANT_WITH_SYS_ZONE = ZONED_DATE_TIME_WITH_SYS_ZONE.toInstant();
+    static final long INSTANT_MILLIS = INSTANT_WITH_SYS_ZONE.toEpochMilli();
+
+    static final TimeZone SYS_TIME_ZONE = TimeZone.getDefault();
+    static final Date SYS_DATE = Date.from(INSTANT_WITH_SYS_ZONE);
+    static final Calendar SYS_CALENDAR = Calendar.getInstance(SYS_TIME_ZONE);
+    static {
+        SYS_CALENDAR.setTime(SYS_DATE);
+    }
+
+    // Java - 2024-12-29 12:58:30.333333333 GMT+04:00
+    static final ZoneId ZONE_ID = ZoneId.of("GMT+04:00");
+    static final ZonedDateTime ZONED_DATE_TIME = LOCAL_DATE_TIME.atZone(ZONE_ID);
+    static final Instant INSTANT = ZONED_DATE_TIME.toInstant();
+    static final long MILLIS = INSTANT.toEpochMilli();
+
+    static final TimeZone TIME_ZONE = TimeZone.getTimeZone(ZONE_ID);
+    static final Date DATE = Date.from(INSTANT);
+    static final Calendar CALENDAR = Calendar.getInstance(TIME_ZONE);
+    static {
+        CALENDAR.setTime(DATE);
+    }
+
+    // Joda
+    static final org.joda.time.LocalDateTime JODA_LOCAL_DATE_TIME
+            = new org.joda.time.LocalDateTime(2024, 12, 29, 12, 58, 30, 333);
+    static final org.joda.time.LocalDate JODA_LOCAL_DATE = JODA_LOCAL_DATE_TIME.toLocalDate();
+    static final org.joda.time.LocalTime JODA_LOCAL_TIME = JODA_LOCAL_DATE_TIME.toLocalTime();
+
+    // Joda - 2024-12-29 12:58:30.333 SystemDefaultZone
+    static final org.joda.time.DateTimeZone JODA_SYS_ZONE = org.joda.time.DateTimeZone.getDefault();
+    static final org.joda.time.DateTime JODA_DATE_TIME_WITH_SYS_ZONE = JODA_LOCAL_DATE_TIME.toDateTime(JODA_SYS_ZONE);
+    static final org.joda.time.Instant JODA_INSTANT_WITH_SYS_ZONE = JODA_DATE_TIME_WITH_SYS_ZONE.toInstant();
+    static final long JODA_INSTANT_MILLIS = JODA_INSTANT_WITH_SYS_ZONE.getMillis();
+
+    // Joda - 2024-12-29 12:58:30.333 GMT+04:00
+    static final org.joda.time.DateTimeZone JODA_ZONE = org.joda.time.DateTimeZone.forID("GMT+04:00");
+    static final org.joda.time.DateTime JODA_DATE_TIME = JODA_LOCAL_DATE_TIME.toDateTime(JODA_ZONE);
+    static final org.joda.time.Instant JODA_INSTANT = JODA_DATE_TIME.toInstant();
+    static final long JODA_MILLIS = JODA_INSTANT.getMillis();
+
+
+    // ================================
+    // #region - toJodaInstant
+    // ================================
+
+    @Test
+    void toJodaInstant_JavaInstant() {
+        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJodaInstant(INSTANT_WITH_SYS_ZONE));
+        assertEquals(JODA_INSTANT, JodaTimeTools.toJodaInstant(INSTANT));
+    }
+
+    @Test
+    void toJodaInstant_ZonedDateTime() {
+        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJodaInstant(ZONED_DATE_TIME_WITH_SYS_ZONE));
+        assertEquals(JODA_INSTANT, JodaTimeTools.toJodaInstant(ZONED_DATE_TIME));
+    }
+
+    @Test
+    void toJodaInstant_LocalDateTimeAndZoneId() {
+        assertEquals(JODA_INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJodaInstant(LOCAL_DATE_TIME, SYS_ZONE_ID));
+        assertEquals(JODA_INSTANT, JodaTimeTools.toJodaInstant(LOCAL_DATE_TIME, ZONE_ID));
+    }
+
+    // ================================
+    // #endregion - toJodaInstant
+    // ================================
+
+    // ================================
+    // #region - toJavaInstant
+    // ================================
+
+    @Test
+    void toJavaInstant_JodaInstant() {
+        assertEquals(INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJavaInstant(JODA_INSTANT_WITH_SYS_ZONE));
+        assertEquals(INSTANT, JodaTimeTools.toJavaInstant(JODA_INSTANT));
+    }
+
+    @Test
+    void toJavaInstant_JodaDateTime() {
+        assertEquals(INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJavaInstant(JODA_DATE_TIME_WITH_SYS_ZONE));
+        assertEquals(INSTANT, JodaTimeTools.toJavaInstant(JODA_DATE_TIME));
+    }
+
+    @Test
+    void toJavaInstant_JodaLocalDateTimeAndJodaDateTimeZone() {
+        assertEquals(INSTANT_WITH_SYS_ZONE, JodaTimeTools.toJavaInstant(JODA_LOCAL_DATE_TIME, JODA_SYS_ZONE));
+        assertEquals(INSTANT, JodaTimeTools.toJavaInstant(JODA_LOCAL_DATE_TIME, JODA_ZONE));
+    }
+
+    // ================================
+    // #endregion - toJavaInstant
+    // ================================
+
+    // ================================
+    // #region - toJodaDateTime
+    // ================================
+
+    @Test
+    void toJodaDateTime_ZonedDateTime() {
+        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toJodaDateTime(ZONED_DATE_TIME_WITH_SYS_ZONE));
+        assertEquals(JODA_DATE_TIME, JodaTimeTools.toJodaDateTime(ZONED_DATE_TIME));
+    }
+
+    @Test
+    void toJodaDateTime_LocalDateTimeAndZoneId() {
+        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toJodaDateTime(LOCAL_DATE_TIME, SYS_ZONE_ID));
+        assertEquals(JODA_DATE_TIME, JodaTimeTools.toJodaDateTime(LOCAL_DATE_TIME, ZONE_ID));
+    }
+
+    @Test
+    void toJodaDateTime_InstantAndZoneId() {
+        assertEquals(JODA_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toJodaDateTime(INSTANT_WITH_SYS_ZONE, SYS_ZONE_ID));
+        assertEquals(JODA_DATE_TIME, JodaTimeTools.toJodaDateTime(INSTANT, ZONE_ID));
+    }
+
+    // ================================
+    // #endregion - toJodaDateTime
+    // ================================
+
+    // ================================
+    // #region - toZonedDateTime
+    // ================================
+
+    @Test
+    void toZonedDateTime_JodaDateTime() {
+        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toZonedDateTime(JODA_DATE_TIME_WITH_SYS_ZONE));
+        assertEquals(ZONED_DATE_TIME, JodaTimeTools.toZonedDateTime(JODA_DATE_TIME));
+    }
+
+    @Test
+    void toZonedDateTime_JodaLocalDateTimeAndJodaDateTimeZone() {
+        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toZonedDateTime(JODA_LOCAL_DATE_TIME, JODA_SYS_ZONE));
+        assertEquals(ZONED_DATE_TIME, JodaTimeTools.toZonedDateTime(JODA_LOCAL_DATE_TIME, JODA_ZONE));
+    }
+
+    @Test
+    void toZonedDateTime_JodaInstantAndJodaDateTimeZone() {
+        assertEquals(ZONED_DATE_TIME_WITH_SYS_ZONE, JodaTimeTools.toZonedDateTime(JODA_INSTANT_WITH_SYS_ZONE, JODA_SYS_ZONE));
+        assertEquals(ZONED_DATE_TIME, JodaTimeTools.toZonedDateTime(JODA_INSTANT, JODA_ZONE));
+    }
+
+    // ================================
+    // #endregion - toZonedDateTime
+    // ================================
+
+    // ================================
+    // #region - toJodaLocalDateTime
+    // ================================
+
+    @Test
+    void toJodaLocalDateTime_JavaLocalDateTime() {
+        assertEquals(JODA_LOCAL_DATE_TIME, JodaTimeTools.toJodaLocalDateTime(LOCAL_DATE_TIME));
+    }
+
+    @Test
+    void toJavaLocalDateTime_JodaLocalDateTime() {
+        assertEquals(LOCAL_DATE_TIME, JodaTimeTools.toJavaLocalDateTime(JODA_LOCAL_DATE_TIME));
+    }
+
+    // ================================
+    // #endregion - toJodaLocalDateTime
+    // ================================
+
+    // ================================
+    // #region - ZoneId <--> DateTimeZone
+    // ================================
+
+    @Test
+    void convertJavaZoneIdAndJodaDateTimeZone() {
+        assertEquals(SYS_ZONE_ID, JodaTimeTools.toJavaZone(JODA_SYS_ZONE));
+        assertEquals(ZONE_ID, JodaTimeTools.toJavaZone(JODA_ZONE));
+        assertEquals(JODA_SYS_ZONE, JodaTimeTools.toJodaZone(SYS_ZONE_ID));
+        assertEquals(JODA_ZONE, JodaTimeTools.toJodaZone(ZONE_ID));
+    }
+
+    // ================================
+    // #endregion - ZoneId <--> DateTimeZone
+    // ================================
+
+}

plusone-dependencies/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>xyz.zhouxy.plusone</groupId>
         <artifactId>plusone-parent</artifactId>
-        <version>1.1.0-RC1</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>plusone-dependencies</artifactId>
@@ -18,11 +18,6 @@
     </description>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-
         <guava.version>33.4.8-jre</guava.version>
         <joda-time.version>2.14.0</joda-time.version>
 
@@ -214,7 +209,7 @@
                 <version>${junit.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
-              </dependency>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -223,7 +218,7 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -231,31 +226,31 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.13.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
                     <version>3.3.0</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.4.2</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.1.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M7</version>
+                    <version>3.12.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.4.2</version>
+                    <version>3.6.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

pom.xml

@@ -6,9 +6,13 @@
 
     <groupId>xyz.zhouxy.plusone</groupId>
     <artifactId>plusone-parent</artifactId>
-    <version>1.1.0-RC1</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <modules>
         <module>plusone-commons</module>
         <module>plusone-dependencies</module>