release: 1.0.3

chore: 更新依赖
fix: 修复 JDK17+ 环境下测试用例 PagingAndSortingQueryParamsTests#testGson 不通过的问题
2025-04-19 02:03:11 +08:00 · 2025-04-19 02:02:31 +08:00 · 2025-04-19 02:01:32 +08:00 · 2025-04-19 02:00:52 +08:00 · 2025-04-03 11:55:26 +08:00 · 2025-04-03 11:51:32 +08:00
30 changed files with 57 additions and 46 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>xyz.zhouxy.plusone</groupId>
    <artifactId>plusone-commons</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.3</version>

    <properties>
        <!-- Basic properties -->
@@ -16,18 +16,18 @@
        <maven.compiler.target>1.8</maven.compiler.target>

        <!-- Versions of compile dependencies -->
-        <guava.version>33.4.0-jre</guava.version>
-        <joda-time.version>2.13.0</joda-time.version>
+        <guava.version>33.4.2-jre</guava.version>
+        <joda-time.version>2.14.0</joda-time.version>

        <!-- Versions of test dependencies -->
        <commons-lang3.version>3.17.0</commons-lang3.version>
        <logback.version>1.2.13</logback.version>
-        <junit.version>5.11.4</junit.version>
+        <junit.version>5.12.1</junit.version>
        <lombok.version>1.18.36</lombok.version>
-        <hutool.version>5.8.35</hutool.version>
+        <hutool.version>5.8.37</hutool.version>
        <mybatis.version>3.5.19</mybatis.version>
        <h2.version>2.2.224</h2.version>
-        <jackson.version>2.18.2</jackson.version>
+        <jackson.version>2.18.3</jackson.version>
        <gson.version>2.12.1</gson.version>
    </properties>

--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 * 标识方法是读方法，如 getter。
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 1.0
+ * @since 1.0.0
 * @see WriterMethod
 */
@Target(ElementType.METHOD)
--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
 * <p>标识方法为静态工厂方法
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Documented;
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
 * @version 1.0
- * @since 1.0
+ * @since 1.0.0
 * @see UnsupportedOperationException
 */
@Documented
--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
 * ValueObject - 值对象
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
@Inherited
@Target(ElementType.TYPE)
--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
 * <p>该注解用于提醒、强调父类虽然有默认实现，但子类可以根据自己的需要覆写。</p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.SOURCE)
--- a/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 * 标识方法是写方法，如 setter。
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 1.0
+ * @since 1.0.0
 * @see ReaderMethod
 */
@Target(ElementType.METHOD)
--- a/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java
@@ -34,7 +34,7 @@ import com.google.common.collect.Table;
 * 集合工具类
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class CollectionTools {

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

--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java
@@ -36,7 +36,7 @@ import xyz.zhouxy.plusone.commons.exception.MultiTypesException.ExceptionType;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public final class ParsingFailureException
        extends RuntimeException
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java
@@ -27,7 +27,7 @@ package xyz.zhouxy.plusone.commons.exception.business;
 * <b>NOTE: 通常表示业务中的意外情况。如：用户错误输入、缺失必填字段、用户余额不足等。</b>
 * </p>
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class BizException extends RuntimeException {

--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java
@@ -32,7 +32,7 @@ import xyz.zhouxy.plusone.commons.exception.MultiTypesException;
 * <b>NOTE: 属业务异常</b>
 * </p>
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public final class InvalidInputException
        extends RequestParamsException
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java
@@ -24,7 +24,7 @@ package xyz.zhouxy.plusone.commons.exception.business;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class RequestParamsException extends BizException {

--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java
@@ -29,7 +29,7 @@ package xyz.zhouxy.plusone.commons.exception.system;
 * 后续需要排查原因。
 * </p>
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public final class DataOperationResultException extends SysException {

--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java
@@ -24,7 +24,7 @@ package xyz.zhouxy.plusone.commons.exception.system;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class NoAvailableMacFoundException extends SysException {
    private static final long serialVersionUID = 152827098461071551L;
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java
@@ -24,7 +24,7 @@ package xyz.zhouxy.plusone.commons.exception.system;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class SysException extends RuntimeException {

--- a/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java
@@ -24,9 +24,9 @@ import java.util.function.Supplier;
 *
 * <p>
 * 返回 {@code Optional&lt;T&gt;} 对象。
- * 
+ *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 * @see Optional
 * @see Supplier
 */
--- a/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java
@@ -19,14 +19,14 @@ package xyz.zhouxy.plusone.commons.function;
 import java.util.function.Predicate;

 /**
- * Predicates
+ * PredicateTools
 *
 * <p>
 * {@link Predicate} 相关操作。
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 * @see Predicate
 */
 public class PredicateTools {
@@ -36,12 +36,12 @@ public class PredicateTools {
     * 如将 {@code Objects::nonNull} 明确地指定为 {@code Predicate&lt;String&gt;}，
     * 使之可以链式调用 {@link Predicate#and(Predicate)}、{@link Predicate#or(Predicate)}
     * 等方法，连接其它 {@code Predicate<? super T>} 对象。
-     * 
+     *
     * <pre>
     * Predicate&lt;String&gt; predicate = PredicateTools.&lt;String&gt;from(Objects::nonNull)
     *         .and(StringUtils::isNotEmpty);
     * </pre>
-     * 
+     *
     * @param <T>       目标类型
     * @param predicate Lambda 表达式
     * @return 传入的表达式自动成为 {@link Predicate} 实例
--- a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java
@@ -16,6 +16,7 @@

 package xyz.zhouxy.plusone.commons.function;

+@FunctionalInterface
 public interface ThrowingPredicate<T, E extends Throwable> {

    /**
--- a/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java
@@ -26,7 +26,7 @@ import java.util.function.BiFunction;
 * 接受类型为 T 和 U 的两个参数，返回 {@code Optional&lt;R&gt;} 对象。
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 * @see Optional
 * @see BiFunction
 */
--- a/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java
@@ -26,7 +26,7 @@ import java.util.function.Function;
 * 接受类型为 T 的参数，返回 {@code Optional&lt;R&gt;} 对象。
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 * @see Optional
 * @see Function
 */
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java
@@ -39,7 +39,7 @@ import xyz.zhouxy.plusone.commons.util.StringTools;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 1.0
+ * @since 1.0.0
 * @see xyz.zhouxy.plusone.commons.constant.PatternConsts#CHINESE_2ND_ID_CARD_NUMBER
 */
@ValueObject
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java
@@ -30,7 +30,7 @@ import xyz.zhouxy.plusone.commons.util.AssertTools;
 * 带校验的字符串值对象
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public abstract class ValidatableStringRecord<T extends ValidatableStringRecord<T>>
        implements Comparable<T> {
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
@@ -37,7 +37,7 @@ import javax.annotation.Nullable;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class ArrayTools {

--- a/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java
@@ -31,7 +31,7 @@ import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 * </p>
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 */
 public class BigDecimals {

--- a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -184,7 +184,7 @@ public class DateTimeTools {
    /**
     * 使用指定时区，将 {@link LocalDateTime} 对象转换为 {@link Instant} 对象
     *
-     * @param LocalDateTime {@link LocalDateTime} 对象
+     * @param localDateTime {@link LocalDateTime} 对象
     * @param zone          时区
     * @return {@link Instant} 对象
     */
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java
@@ -42,7 +42,6 @@ import xyz.zhouxy.plusone.commons.exception.system.NoAvailableMacFoundException;
 * <li><a href="https://juejin.cn/post/7265516484029743138">关于若干读者，阅读“改良版雪花算法”后提出的几个共性问题的回复。</a></li>
 * </ul>
 * </p>
- * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
 */
 public class IdWorker {

--- a/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java
@@ -26,13 +26,13 @@ import javax.annotation.Nullable;
 import com.google.common.annotations.Beta;

 /**
- * OptionalUtil
+ * OptionalTools
 *
 * <p>
 * 提供一些 Optional 相关的方法
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 0.1.0
+ * @since 1.0.0
 * @see Optional
 * @see OptionalInt
 * @see OptionalLong
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
@@ -31,7 +31,7 @@ import javax.annotation.Nullable;
 * TreeBuilder
 *
 * @author <a href="http://zhouxy.xyz:3000/ZhouXY108">ZhouXY</a>
- * @since 1.0
+ * @since 1.0.0
 */
 public class TreeBuilder<T, TSubTree extends T, TIdentity> {
    private final Function<T, TIdentity> identityGetter;
--- a/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java
+++ b/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -184,24 +184,34 @@ public class PagingAndSortingQueryParamsTests {
        assertThrows(IllegalArgumentException.class, () -> queryParams.buildPagingParams()); // NOSONAR
    }

-    static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
    @Test
-    void testGson() throws Exception {
+    void testGson() {
        Gson gson = new GsonBuilder()
                .registerTypeAdapter(LocalDate.class, new TypeAdapter<LocalDate>() {

                    @Override
                    public void write(JsonWriter out, LocalDate value) throws IOException {
-                        out.value(dateFormatter.format(value));
+                        out.value(DateTimeFormatter.ISO_DATE.format(value));
                    }

                    @Override
                    public LocalDate read(JsonReader in) throws IOException {
-                        return LocalDate.parse(in.nextString(), dateFormatter);
+                        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);
+                    }
+                })
                .create();
        try (SqlSession session = sqlSessionFactory.openSession()) {
            AccountQueryParams params = gson.fromJson(JSON_STR, AccountQueryParams.class);
@@ -212,6 +222,7 @@ public class PagingAndSortingQueryParamsTests {
            List<AccountVO> list = accountQueries.queryAccountList(params, pagingParams);
            long count = accountQueries.countAccount(params);
            PageResult<AccountVO> accountPageResult = PageResult.of(list, count);
+
            log.info(gson.toJson(accountPageResult));

            assertEquals(Lists.newArrayList(
@@ -226,7 +237,7 @@ public class PagingAndSortingQueryParamsTests {
        }

        AccountQueryParams queryParams = gson.fromJson(WRONG_JSON_STR, AccountQueryParams.class);
-        assertThrows(IllegalArgumentException.class, () -> queryParams.buildPagingParams()); // NOSONAR
+        assertThrows(IllegalArgumentException.class, queryParams::buildPagingParams);
    }
 }
Author	SHA1	Message	Date
ZhouXY108	473e1ce223	release: 1.0.3	2025-04-19 02:03:11 +08:00
ZhouXY108	3b9f0a30c2	chore: 更新依赖	2025-04-19 02:02:31 +08:00
ZhouXY108	34076294a7	fix: 修复 JDK17+ 环境下测试用例 `PagingAndSortingQueryParamsTests#testGson` 不通过的问题该用例在 JDK17+ 环境下使用 gson 进行序列化时，报 `com.google.gson.JsonIOException: Failed making field 'java.time.LocalDateTime#date' accessible; either increase its visibility or write a custom TypeAdapter for its declaring type`。 See: https://github.com/google/gson/blob/main/Troubleshooting.md#reflection-inaccessible	2025-04-19 02:01:32 +08:00
ZhouXY108	c6df5cd925	docs: fix param name	2025-04-19 02:00:52 +08:00
ZhouXY108	91c0c18960	1.0.2	2025-04-03 11:55:26 +08:00
ZhouXY108	bc7b3eefa8	fix: 补充 ThrowingPredicate 缺失的 FunctionalInterface 注解	2025-04-03 11:51:32 +08:00
ZhouXY108	746603f939	1.0.1	2025-03-28 12:10:44 +08:00
ZhouXY108	73a99b630c	doc: 修改 since 信息 1.0.0 之前新增的，其 since 修改为 1.0.0，统一以 1.0.0 作为初始版本 fix plusone/plusone-commons#30	2025-03-28 11:35:12 +08:00
ZhouXY108	f5b04a7ae8	docs: 改正 PredicateTools 的 javadoc (#39 ) Reviewed-on: http://zhouxy.xyz:3000/plusone/plusone-commons/pulls/39	2025-03-28 10:39:56 +08:00
ZhouXY108	dde3d1d172	docs: 删除 IdWorker 的 author 信息 Reviewed-on: http://zhouxy.xyz:3000/plusone/plusone-commons/pulls/37	2025-03-28 09:31:02 +08:00
ZhouXY108	e3d60ffe97	docs: 删除 IdWorker 的 author 信息该工具来自 seata，并非本项目原创，写 javadoc 时忘记修改模板中的 author，而seata 源代码中早就删除了该类的 author 信息，故应先删除。见：https://github.com/apache/incubator-seata/pull/6179 close plusone/plusone-commons#31	2025-03-28 09:22:55 +08:00
ZhouXY108	aadd1857de	docs: 改正 OptionalTools 的 javadoc Reviewed-on: http://zhouxy.xyz:3000/plusone/plusone-commons/pulls/35	2025-03-28 09:08:23 +08:00
ZhouXY108	e98fe66b65	docs: fix javadoc fix issue plusone/plusone-commons#29	2025-03-28 08:55:35 +08:00