diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java index 710d7f53c..525b9bdb2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/BeanCopier.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.bean.copier; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.lang.copier.Copier; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.Map; @@ -38,8 +39,12 @@ import java.util.Map; * @since 3.2.3 */ public class BeanCopier implements Copier, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 拷贝器 + */ private final Copier copier; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java index 3b6eb7888..163eefde4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObjIterator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.cache.impl; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import java.util.NoSuchElementException; @@ -30,9 +31,16 @@ import java.util.NoSuchElementException; * @since 4.0.10 */ public class CacheObjIterator implements Iterator>, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 迭代器 + */ private final Iterator> iterator; + /** + * 下一个值 + */ private CacheObj nextValue; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java index acc3e3afb..3273beb56 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base16Codec.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.codec.Encoder; import cn.hutool.v7.core.exception.HutoolException; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -32,6 +33,7 @@ import java.io.Serializable; * @since 5.7.23 */ public class Base16Codec implements Encoder, Decoder, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java index a72bb1da4..888937e0e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConverterWithRoot.java @@ -27,6 +27,9 @@ import cn.hutool.v7.core.lang.Assert; */ public abstract class ConverterWithRoot implements Converter { + /** + * 根转换器 + */ protected final Converter rootConverter; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java index e31ccd146..fd9501a2e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/IdUtil.java @@ -77,6 +77,11 @@ public class IdUtil { return UUID.fastUUID().toString(true); } + /** + * 获取随机UUID7 + * + * @return 随机UUID7 + */ public static String randomUUID7() { return UUID.randomUUID7().toString(); } @@ -263,7 +268,7 @@ public class IdUtil { } if (null != mac) { id = ((0x000000FF & (long) mac[mac.length - 2]) - | (0x0000FF00 & (((long) mac[mac.length - 1]) << 8))) >> 6; + | (0x0000FF00 & (((long) mac[mac.length - 1]) << 8))) >> 6; id = id % (maxDatacenterId + 1); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java index b82a94d48..d2e29fe68 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LimitedInputStream.java @@ -30,6 +30,9 @@ import java.io.InputStream; */ public class LimitedInputStream extends FilterInputStream { + /** + * 限制最大读取量，单位byte + */ protected long limit; private final boolean throwWhenReachLimit; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java index 16fa36547..6503f7478 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.map.multi; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; import java.util.*; /** @@ -224,11 +225,17 @@ public class DirectedWeightGraph { * @param 点类型 */ public static class Edge { - // 起始点 + /** + * 起始点 + */ protected T fromPoint; - // 目标点 + /** + * 目标点 + */ protected T toPoint; - // 权重 + /** + * 权重 + */ protected long weight; /** @@ -337,6 +344,7 @@ public class DirectedWeightGraph { * 负环异常 */ public static class NegativeRingException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java index 4d08d12f7..2eb7888e7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/spliterators/TakeWhileSpliterator.java @@ -30,6 +30,14 @@ import java.util.function.Predicate; */ public class TakeWhileSpliterator implements Spliterator { + /** + * 创建TakeWhileSpliterator + * + * @param source 源Spliterator + * @param predicate 断言 + * @param 元素类型 + * @return TakeWhileSpliterator + */ public static TakeWhileSpliterator create(final Spliterator source, final Predicate predicate) { return new TakeWhileSpliterator<>(source, predicate); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java index d8edcdb01..3853704d4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/MultiStrFinder.java @@ -37,11 +37,17 @@ public class MultiStrFinder { return new MultiStrFinder(source); } - // 字符索引 + /** + * 字符索引 + */ protected final Map charIndexMap = new HashMap<>(); - // 全部字符数量 + /** + * 全部字符数量 + */ protected final int allCharSize; - // 根节点 + /** + * 根节点 + */ protected final Node root; // 全部节点数量 int nodeSize; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java index b5f876593..6ae16168d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/segment/IndexedPlaceholderSegment.java @@ -40,6 +40,11 @@ public class IndexedPlaceholderSegment extends NamedPlaceholderSegment { this.index = Integer.parseInt(idxStr); } + /** + * 获取下标 + * + * @return 下标 + */ public int getIndex() { return index; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java index 48349ce03..669a56558 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/NamedPlaceholderStrTemplate.java @@ -60,6 +60,17 @@ public class NamedPlaceholderStrTemplate extends StrTemplate { */ protected int indexedSegmentMaxIdx = 0; + /** + * 创建一个有前缀和后缀的模板 + * + * @param template 模板字符串 + * @param prefix 占位符前缀，默认为: {@link #DEFAULT_PREFIX} + * @param suffix 占位符后缀，默认为: {@link #DEFAULT_SUFFIX} + * @param escape 转义符 + * @param defaultValue 默认值 + * @param defaultValueHandler 默认值处理器 + * @param features 模板特性 + */ protected NamedPlaceholderStrTemplate(final String template, final int features, final String prefix, final String suffix, final char escape, final String defaultValue, final UnaryOperator defaultValueHandler) { @@ -576,6 +587,7 @@ public class NamedPlaceholderStrTemplate extends StrTemplate { /** * 构造 + * * @param template 模板 */ protected Builder(final String template) { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java index e54e7b782..4a9fc176b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/placeholder/template/SinglePlaceholderStrTemplate.java @@ -48,6 +48,16 @@ public class SinglePlaceholderStrTemplate extends StrTemplate { */ protected String placeholder; + /** + * 构造 + * + * @param template 模板 + * @param features 策略值 + * @param placeholder 占位符 + * @param escape 转义符 + * @param defaultValue 默认值 + * @param defaultValueHandler 默认值处理器 + */ protected SinglePlaceholderStrTemplate(final String template, final int features, final String placeholder, final char escape, final String defaultValue, final UnaryOperator defaultValueHandler) { super(template, escape, defaultValue, defaultValueHandler, features); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java index e8c9f3b3c..fab7f2239 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/SemaphoreRateLimiter.java @@ -30,10 +30,17 @@ import java.util.concurrent.Semaphore; */ public abstract class SemaphoreRateLimiter implements RateLimiter { + /** + * 限流配置 + */ protected final RateLimiterConfig config; + /** + * 限流许可 + */ protected final Semaphore semaphore; // region ----- Constructor + /** * 构造 * diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java index 0f447830e..23402901c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ratelimiter/TokenBucketRateLimiter.java @@ -42,6 +42,9 @@ import java.util.concurrent.TimeUnit; */ public class TokenBucketRateLimiter extends SemaphoreRateLimiter implements Closeable { + /** + * 定时器 + */ protected final ScheduledExecutorService scheduler; /**