From c17c5bb013d19c702f9a21de6ee2682334fda518 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 27 Jun 2025 11:45:08 +0800 Subject: [PATCH] fix comment --- .../java/cn/hutool/v7/core/data/id/ULID.java | 5 ++ .../java/cn/hutool/v7/core/data/id/UUID.java | 3 + .../v7/core/date/format/FastDateFormat.java | 8 ++ .../v7/core/date/format/FastDatePrinter.java | 5 ++ .../date/format/parser/FastDateParser.java | 6 ++ .../format/parser/PatternsDateParser.java | 8 ++ .../date/format/parser/RegexDateParser.java | 23 ++++-- .../format/parser/RegisterDateParser.java | 5 ++ .../v7/core/exception/StatefulException.java | 7 +- .../hutool/v7/core/func/ComposeFunction.java | 8 ++ .../cn/hutool/v7/core/io/ByteOrderMark.java | 11 ++- .../cn/hutool/v7/core/io/checksum/CRC16.java | 5 ++ .../cn/hutool/v7/core/io/checksum/CRC8.java | 11 +++ .../hutool/v7/core/io/file/FileAppender.java | 5 ++ .../v7/core/io/file/LineReadWatcher.java | 9 +++ .../cn/hutool/v7/core/io/file/PathCopier.java | 7 +- .../cn/hutool/v7/core/io/file/Tailer.java | 78 ++++++++++++------- .../v7/core/io/resource/BytesResource.java | 8 ++ .../core/io/resource/ClassPathResource.java | 9 +++ .../v7/core/io/resource/FileResource.java | 9 +++ .../v7/core/io/resource/HttpResource.java | 8 ++ .../core/io/resource/InputStreamResource.java | 12 ++- .../v7/core/io/resource/MultiResource.java | 8 ++ .../v7/core/io/resource/UrlResource.java | 5 ++ .../hutool/v7/core/io/watch/WatchMonitor.java | 5 ++ .../java/cn/hutool/v7/core/lang/Version.java | 14 ++++ .../v7/core/lang/mutable/MutableBool.java | 5 ++ .../v7/core/lang/mutable/MutableByte.java | 6 ++ .../v7/core/lang/mutable/MutableDouble.java | 6 ++ .../v7/core/lang/mutable/MutableFloat.java | 6 ++ .../v7/core/lang/mutable/MutableInt.java | 6 ++ .../v7/core/lang/mutable/MutableLong.java | 6 ++ .../v7/core/lang/mutable/MutableObj.java | 5 ++ .../v7/core/lang/mutable/MutableShort.java | 6 ++ .../core/lang/selector/IncrementSelector.java | 5 ++ .../lang/selector/WeightRandomSelector.java | 5 ++ .../java/cn/hutool/v7/core/map/BiMap.java | 5 ++ .../cn/hutool/v7/core/map/FuncKeyMap.java | 5 ++ .../java/cn/hutool/v7/core/map/FuncMap.java | 8 ++ .../cn/hutool/v7/core/map/MapBuilder.java | 5 ++ .../java/cn/hutool/v7/core/map/MapProxy.java | 5 ++ .../cn/hutool/v7/core/map/MapWrapper.java | 20 ++++- .../java/cn/hutool/v7/core/map/TableMap.java | 11 +++ .../cn/hutool/v7/core/map/TolerantMap.java | 5 ++ .../cn/hutool/v7/core/map/TripleTable.java | 11 +++ .../concurrent/ConcurrentLinkedHashMap.java | 15 ++++ .../v7/core/map/multi/CollectionValueMap.java | 6 +- .../map/reference/ReferenceConcurrentMap.java | 11 +++ .../cn/hutool/v7/core/math/Arrangement.java | 5 ++ .../cn/hutool/v7/core/math/Combination.java | 5 ++ .../v7/core/net/ssl/SSLContextBuilder.java | 31 +++++++- 51 files changed, 436 insertions(+), 50 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java index e6f1d6e3c..702aa8130 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/ULID.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.util.ByteUtil; import cn.hutool.v7.core.util.RandomUtil; +import java.io.Serial; import java.io.Serializable; import java.nio.ByteOrder; import java.util.Objects; @@ -52,6 +53,7 @@ import java.util.Random; * @since 6.0.0 */ public class ULID implements Comparable, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -174,6 +176,9 @@ public class ULID implements Comparable, Serializable { // endregion + /** + * 16位ID值 + */ private final Number128 idValue; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java index 65f908238..cc25a5d5b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/id/UUID.java @@ -90,6 +90,9 @@ public final class UUID implements java.io.Serializable, Comparable { private static final AtomicLong lastV7time = new AtomicLong(0); private static final long NANOS_PER_MILLI = 1_000_000; + /** + * 16位ID值 + */ private final Number128 idValue; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java index 4e410bae0..68eb85013 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.date.DateFormatPool; import cn.hutool.v7.core.date.format.parser.FastDateParser; import cn.hutool.v7.core.date.format.parser.PositionDateParser; +import java.io.Serial; import java.text.DateFormat; import java.text.FieldPosition; import java.text.Format; @@ -49,6 +50,7 @@ import java.util.TimeZone; * */ public class FastDateFormat extends Format implements PositionDateParser, DatePrinter { + @Serial private static final long serialVersionUID = 8097890768636183236L; /** @@ -75,7 +77,13 @@ public class FastDateFormat extends Format implements PositionDateParser, DatePr } }; + /** + * {@link FastDatePrinter}日期格式生成器 + */ private final FastDatePrinter printer; + /** + * {@link FastDateParser}日期格式解析器 + */ private final FastDateParser parser; // ----------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java index e90ce74a4..e05b10265 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDatePrinter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.date.format; import cn.hutool.v7.core.date.format.parser.FastDateParser; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; @@ -29,8 +30,12 @@ import java.util.concurrent.ConcurrentLinkedQueue; * @see FastDateParser */ public class FastDatePrinter extends SimpleDateBasic implements DatePrinter { + @Serial private static final long serialVersionUID = -6305750172255764887L; + /** + * 日期模式 + */ private final DatePattern datePattern; /** * 缓存的Calendar对象，用于减少对象创建。参考tomcat的ConcurrentDateFormat diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java index b4b700ada..f0aa5b53c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/FastDateParser.java @@ -50,9 +50,15 @@ public class FastDateParser extends SimpleDateBasic implements PositionDateParse * 世纪：2000年前为19， 之后为20 */ private final int century; + /** + * 起始年份 + */ private final int startYear; // derived fields + /** + * 缓存的解析策略 + */ private transient List patterns; // comparator used to sort regex alternatives diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java index 6cd198e37..915d9877c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/PatternsDateParser.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.date.CalendarUtil; import cn.hutool.v7.core.date.DateException; import cn.hutool.v7.core.date.DateTime; +import java.io.Serial; import java.io.Serializable; import java.util.Calendar; import java.util.Locale; @@ -32,6 +33,7 @@ import java.util.Locale; * @since 6.0.0 */ public class PatternsDateParser implements DateParser, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -44,7 +46,13 @@ public class PatternsDateParser implements DateParser, Serializable { return new PatternsDateParser(parsePatterns); } + /** + * 解析格式 + */ private String[] parsePatterns; + /** + * 地区 + */ private Locale locale; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java index 1057a97a1..7cf79b02b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java @@ -28,6 +28,7 @@ import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.dfa.WordTree; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import java.time.OffsetDateTime; @@ -45,6 +46,7 @@ import java.util.regex.Pattern; * @author Looly */ public class RegexDateParser implements DateParser, Serializable { + @Serial private static final long serialVersionUID = 1L; private static final int[] NSS = {100000000, 10000000, 1000000, 100000, 10000, 1000, 100, 10, 1}; @@ -75,7 +77,13 @@ public class RegexDateParser implements DateParser, Serializable { return new RegexDateParser(ListUtil.of(patterns)); } + /** + * 格式列表 + */ private final List patterns; + /** + * {@code true}默认为mm/dd，否则dd/mm + */ private boolean preferMonthFirst; /** @@ -296,15 +304,14 @@ public class RegexDateParser implements DateParser, Serializable { private static int parseYear(final String year) { final int length = year.length(); - switch (length) { - case 4: - return Integer.parseInt(year); - case 2: + return switch (length) { + case 4 -> Integer.parseInt(year); + case 2 -> { final int num = Integer.parseInt(year); - return (num > 50 ? 1900 : 2000) + num; - default: - throw new DateException("Invalid year: [{}]", year); - } + yield (num > 50 ? 1900 : 2000) + num; + } + default -> throw new DateException("Invalid year: [{}]", year); + }; } /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java index fc8ab6780..ccf1df098 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegisterDateParser.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.date.format.parser; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.date.DateException; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -31,6 +32,7 @@ import java.util.List; * @since 6.0.0 */ public class RegisterDateParser implements DateParser, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -38,6 +40,9 @@ public class RegisterDateParser implements DateParser, Serializable { */ public static final RegisterDateParser INSTANCE = new RegisterDateParser(); + /** + * 日期解析器列表 + */ private final List parserList; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java index 07a5ef968..625a3c9f4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/StatefulException.java @@ -16,15 +16,20 @@ package cn.hutool.v7.core.exception; +import java.io.Serial; + /** * 带有状态码的异常 * * @author Looly */ public class StatefulException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; - // 异常状态码 + /** + * 异常状态码 + */ private int status; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java b/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java index 6a093bdee..23e613e1a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/func/ComposeFunction.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.func; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; import java.util.function.Function; @@ -31,6 +32,7 @@ import java.util.function.Function; * @since 6.0.0 */ public class ComposeFunction implements Function, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -47,7 +49,13 @@ public class ComposeFunction implements Function, Serializable { return new ComposeFunction<>(g, f); } + /** + * 函数1 + */ private final Function g; + /** + * 函数2 + */ private final Function f; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java index eca3eb97f..f8f411857 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/ByteOrderMark.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.function.Predicate; @@ -40,6 +41,7 @@ import java.util.function.Predicate; * @author Apache-commons-io */ public class ByteOrderMark implements Predicate, Comparable, Serializable { + @Serial private static final long serialVersionUID = 1L; // region ----- BOMs @@ -85,7 +87,13 @@ public class ByteOrderMark implements Predicate, Comparable, Comparable lineHandler; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java index 7aa5a3642..51eae1b38 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathCopier.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.lang.copier.SrcToTargetCopier; import cn.hutool.v7.core.util.ObjUtil; import java.io.IOException; +import java.io.Serial; import java.nio.file.*; /** @@ -32,6 +33,7 @@ import java.nio.file.*; * @since 6.0.0 */ public class PathCopier extends SrcToTargetCopier { + @Serial private static final long serialVersionUID = 1L; /** @@ -58,6 +60,9 @@ public class PathCopier extends SrcToTargetCopier { return new PathCopier(src, target, options); } + /** + * 复制参数 + */ private final CopyOption[] options; /** @@ -65,7 +70,7 @@ public class PathCopier extends SrcToTargetCopier { * * @param src 源文件或目录，不能为{@code null}且必须存在 * @param target 目标文件或目录 - * @param options 移动参数 + * @param options 复制参数 */ public PathCopier(final Path src, final Path target, final CopyOption[] options) { Assert.notNull(target, "Src path must be not null !"); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java index b6743d019..cdb98f6d9 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/Tailer.java @@ -29,10 +29,7 @@ import cn.hutool.v7.core.lang.Console; import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.util.CharsetUtil; -import java.io.File; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.io.Serializable; +import java.io.*; import java.nio.charset.Charset; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; @@ -46,6 +43,7 @@ import java.util.concurrent.*; * @since 4.5.2 */ public class Tailer implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -53,26 +51,48 @@ public class Tailer implements Serializable { */ public static final SerConsumer CONSOLE_HANDLER = new ConsoleLineHandler(); - /** 编码 */ + /** + * 编码 + */ private final Charset charset; - /** 行处理器 */ + /** + * 行处理器 + */ private final SerConsumer lineHandler; - /** 初始读取的行数 */ + /** + * 初始读取的行数 + */ private final int initReadLine; - /** 定时任务检查间隔时长 */ + /** + * 定时任务检查间隔时长 + */ private final long period; + /** + * 文件路径 + */ private final String filePath; + /** + * 随机访问文件 + */ private final RandomAccessFile randomAccessFile; + /** + * 定时任务执行器 + */ private final ScheduledExecutorService executorService; + /** + * 文件删除监听器 + */ private WatchMonitor fileDeleteWatchMonitor; - + /** + * 删除文件后是否退出并抛出异常 + */ private boolean stopOnDelete; /** * 构造，默认UTF-8编码 * - * @param file 文件 + * @param file 文件 * @param lineHandler 行处理器 */ public Tailer(final File file, final SerConsumer lineHandler) { @@ -82,8 +102,8 @@ public class Tailer implements Serializable { /** * 构造，默认UTF-8编码 * - * @param file 文件 - * @param lineHandler 行处理器 + * @param file 文件 + * @param lineHandler 行处理器 * @param initReadLine 启动时预读取的行数，1表示一行 */ public Tailer(final File file, final SerConsumer lineHandler, final int initReadLine) { @@ -93,8 +113,8 @@ public class Tailer implements Serializable { /** * 构造 * - * @param file 文件 - * @param charset 编码 + * @param file 文件 + * @param charset 编码 * @param lineHandler 行处理器 */ public Tailer(final File file, final Charset charset, final SerConsumer lineHandler) { @@ -104,11 +124,11 @@ public class Tailer implements Serializable { /** * 构造 * - * @param file 文件 - * @param charset 编码 - * @param lineHandler 行处理器 + * @param file 文件 + * @param charset 编码 + * @param lineHandler 行处理器 * @param initReadLine 启动时预读取的行数，1表示一行 - * @param period 检查间隔 + * @param period 检查间隔 */ public Tailer(final File file, final Charset charset, final SerConsumer lineHandler, final int initReadLine, final long period) { checkFile(file); @@ -152,15 +172,16 @@ public class Tailer implements Serializable { final LineReadWatcher lineReadWatcher = new LineReadWatcher(this.randomAccessFile, this.charset, this.lineHandler); final ScheduledFuture scheduledFuture = this.executorService.scheduleAtFixedRate(// - lineReadWatcher, // - 0, // - this.period, TimeUnit.MILLISECONDS// + lineReadWatcher, // + 0, // + this.period, TimeUnit.MILLISECONDS// ); // 监听删除 - if(stopOnDelete){ + if (stopOnDelete) { fileDeleteWatchMonitor = WatchUtil.of(this.filePath, WatchKind.DELETE.getValue()); - fileDeleteWatchMonitor.setWatcher(new SimpleWatcher(){ + fileDeleteWatchMonitor.setWatcher(new SimpleWatcher() { + @Serial private static final long serialVersionUID = 4497160994840060329L; @Override @@ -187,8 +208,8 @@ public class Tailer implements Serializable { /** * 结束，此方法需在异步模式或 */ - public void stop(){ - try{ + public void stop() { + try { this.executorService.shutdown(); } finally { IoUtil.closeQuietly(this.randomAccessFile); @@ -197,6 +218,7 @@ public class Tailer implements Serializable { } // ---------------------------------------------------------------------------------------- Private method start + /** * 预读取行 * @@ -225,7 +247,7 @@ public class Tailer implements Serializable { if (c == CharUtil.LF || c == CharUtil.CR) { // FileUtil.readLine(this.randomAccessFile, this.charset, this.lineHandler); final String line = FileUtil.readLine(this.randomAccessFile, this.charset); - if(null != line) { + if (null != line) { stack.push(line); } currentLine++; @@ -237,7 +259,7 @@ public class Tailer implements Serializable { // 当文件指针退至文件开始处，输出第一行 // FileUtil.readLine(this.randomAccessFile, this.charset, this.lineHandler); final String line = FileUtil.readLine(this.randomAccessFile, this.charset); - if(null != line) { + if (null != line) { stack.push(line); } break; @@ -280,7 +302,9 @@ public class Tailer implements Serializable { * @since 4.5.2 */ public static class ConsoleLineHandler implements SerConsumer { + @Serial private static final long serialVersionUID = 1L; + @Override public void accepting(final String line) { Console.log(line); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java index 3f3d6c01e..4adb831a0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.text.StrUtil; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.io.Serial; import java.io.Serializable; import java.net.URL; import java.nio.charset.Charset; @@ -33,9 +34,16 @@ import java.nio.charset.Charset; * @since 4.0.9 */ public class BytesResource implements Resource, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 字节数据 + */ private final byte[] bytes; + /** + * 资源名称 + */ private final String name; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java index 95c05b05d..f6044180b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ClassPathResource.java @@ -39,8 +39,17 @@ public class ClassPathResource extends UrlResource { @Serial private static final long serialVersionUID = 1L; + /** + * 路径 + */ private final String path; + /** + * 类加载器 + */ private final ClassLoader classLoader; + /** + * 基于的类 + */ private final Class clazz; // -------------------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java index 50f8d272c..af2786fb1 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java @@ -37,8 +37,17 @@ public class FileResource implements Resource, Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 文件 + */ private final File file; + /** + * 文件最后修改时间 + */ private final long lastModified; + /** + * 文件名 + */ private final String name; // ----------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java index bb3224289..a60cc1acf 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.io.resource; import cn.hutool.v7.core.lang.Assert; import java.io.InputStream; +import java.io.Serial; import java.io.Serializable; import java.net.URL; @@ -29,9 +30,16 @@ import java.net.URL; * @since 5.7.17 */ public class HttpResource implements Resource, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 资源 + */ private final Resource resource; + /** + * Content-Type类型 + */ private final String contentType; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java index a5a7b42c5..5f1fc832a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java @@ -19,10 +19,7 @@ package cn.hutool.v7.core.io.resource; import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.io.stream.ReaderInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.io.Serializable; +import java.io.*; import java.net.URL; import java.nio.charset.Charset; @@ -34,9 +31,16 @@ import java.nio.charset.Charset; * @since 4.0.9 */ public class InputStreamResource implements Resource, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * {@link InputStream} + */ private final InputStream in; + /** + * 资源名称 + */ private final String name; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java index 9d8c37931..86d93e0a5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.io.IORuntimeException; import java.io.BufferedReader; import java.io.InputStream; +import java.io.Serial; import java.io.Serializable; import java.net.URL; import java.nio.charset.Charset; @@ -37,9 +38,16 @@ import java.util.List; * @since 4.1.0 */ public class MultiResource implements Resource, Iterable, Iterator, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 资源列表 + */ private final List resources; + /** + * 游标 + */ private int cursor; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java index 8ce88c016..2d25cf24d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.util.ObjUtil; import java.io.File; import java.io.InputStream; +import java.io.Serial; import java.io.Serializable; import java.net.URI; import java.net.URL; @@ -34,6 +35,7 @@ import java.net.URL; * @author Looly */ public class UrlResource implements Resource, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -44,6 +46,9 @@ public class UrlResource implements Resource, Serializable { * 资源名称 */ protected String name; + /** + * 最后修改时间 + */ private long lastModified = 0; //-------------------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java index a89e822f4..85302a5ea 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchMonitor.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.text.StrUtil; import java.io.Closeable; +import java.io.Serial; import java.io.Serializable; import java.nio.file.Path; import java.nio.file.WatchEvent; @@ -37,8 +38,12 @@ import java.nio.file.WatchEvent; * @author Looly */ public class WatchMonitor extends Thread implements Closeable, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 监听服务 + */ private final WatchServiceWrapper watchService; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java index fd441c0d7..9c42d8c5f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Version.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.comparator.CompareUtil; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -31,6 +32,7 @@ import java.util.List; * @author Looly */ public class Version implements Comparable, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -44,10 +46,22 @@ public class Version implements Comparable, Serializable { return new Version(v); } + /** + * 版本 + */ private final String version; + /** + * 主版本号 + */ private final List sequence; + /** + * 次版本号 + */ private final List pre; + /** + * 构建版本 + */ private final List build; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java index 03dfa7678..bfa209dac 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableBool.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.mutable; +import java.io.Serial; import java.io.Serializable; /** @@ -25,8 +26,12 @@ import java.io.Serializable; * @since 3.0.1 */ public class MutableBool implements Comparable, Mutable, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private boolean value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java index 5ee39c694..13fc81438 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableByte.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code byte} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableByte extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private byte value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java index 227158032..24b31cc78 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableDouble.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code double} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableDouble extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private double value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java index 45e2150d8..c5499d822 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableFloat.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code float} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableFloat extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private float value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java index ebb32f549..89b1d75fe 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableInt.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code int} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableInt extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private int value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java index 558905296..93c65481f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableLong.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code long} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableLong extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private long value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java index 692f7c641..a3a33734d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableObj.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.util.Objects; @@ -28,6 +29,7 @@ import java.util.Objects; * @since 3.0.1 */ public class MutableObj implements Mutable, Serializable{ + @Serial private static final long serialVersionUID = 1L; /** @@ -41,6 +43,9 @@ public class MutableObj implements Mutable, Serializable{ return new MutableObj<>(value); } + /** + * 值 + */ private T value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java index 0540fd4df..b35116b94 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableShort.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.comparator.CompareUtil; +import java.io.Serial; + /** * 可变 {@code short} 类型 * @@ -25,8 +27,12 @@ import cn.hutool.v7.core.comparator.CompareUtil; * @since 3.0.1 */ public class MutableShort extends Number implements Comparable, Mutable { + @Serial private static final long serialVersionUID = 1L; + /** + * 值 + */ private short value; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java index 50e7274f0..13736d9f6 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/IncrementSelector.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.selector; +import java.io.Serial; import java.util.ArrayList; /** @@ -26,8 +27,12 @@ import java.util.ArrayList; * @since 6.0.0 */ public class IncrementSelector extends ArrayList implements Selector { + @Serial private static final long serialVersionUID = 1L; + /** + * 值索引 + */ private int position; // region ----- Constructors diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java index 5cd1620e6..4cafac498 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightRandomSelector.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.selector; import cn.hutool.v7.core.collection.CollUtil; +import java.io.Serial; import java.io.Serializable; import java.util.SortedMap; import java.util.TreeMap; @@ -41,6 +42,7 @@ import java.util.TreeMap; * @since 3.3.0 */ public class WeightRandomSelector implements Selector, Serializable { + @Serial private static final long serialVersionUID = -8244697995702786499L; /** @@ -53,6 +55,9 @@ public class WeightRandomSelector implements Selector, Serializable { return new WeightRandomSelector<>(); } + /** + * 权重对象 + */ private final TreeMap weightMap; // region ----- Constructors diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java index 699857dc3..62ff33620 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/BiMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; @@ -31,8 +32,12 @@ import java.util.function.Function; * @since 5.2.6 */ public class BiMap extends MapWrapper { + @Serial private static final long serialVersionUID = 1L; + /** + * 反向Map + */ private Map inverse; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java index c01ef459f..f08e9e06c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncKeyMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.Map; import java.util.function.Function; @@ -28,8 +29,12 @@ import java.util.function.Function; * @since 5.6.0 */ public class FuncKeyMap extends CustomKeyMap { + @Serial private static final long serialVersionUID = 1L; + /** + * 自定义KEY的函数 + */ private final Function keyFunc; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java index 4be6197d6..d137e65ca 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FuncMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; @@ -29,9 +30,16 @@ import java.util.function.Supplier; * @since 5.8.0 */ public class FuncMap extends TransMap { + @Serial private static final long serialVersionUID = 1L; + /** + * 自定义KEY的函数 + */ private final Function keyFunc; + /** + * 自定义value函数 + */ private final Function valueFunc; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java index ac9c6045d..31e03a8e6 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapBuilder.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.map; import cn.hutool.v7.core.lang.builder.Builder; +import java.io.Serial; import java.util.Map; import java.util.function.Supplier; @@ -30,8 +31,12 @@ import java.util.function.Supplier; * @since 3.1.1 */ public class MapBuilder implements Builder> { + @Serial private static final long serialVersionUID = 1L; + /** + * Map + */ private final Map map; // region ----- of diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java index 8bd26052f..9413f25cb 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapProxy.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.util.BooleanUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -38,8 +39,12 @@ import java.util.Set; * @since 3.2.0 */ public class MapProxy implements Map, TypeGetter, InvocationHandler, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * Map + */ @SuppressWarnings("rawtypes") Map map; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java index eca65a5f7..7a9a16c3a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapWrapper.java @@ -20,10 +20,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.lang.wrapper.Wrapper; import cn.hutool.v7.core.util.ObjUtil; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; +import java.io.*; import java.util.*; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -39,6 +36,7 @@ import java.util.function.Supplier; * @since 4.3.3 */ public class MapWrapper implements Map, Iterable>, Wrapper>, Serializable, Cloneable { + @Serial private static final long serialVersionUID = -7524578042008586382L; /** @@ -241,11 +239,25 @@ public class MapWrapper implements Map, Iterable>, W //---------------------------------------------------------------------------- Override default methods end // region 序列化与反序列化重写 + + /** + * 写对象 + * @param out 输出流 + * @throws IOException IO异常 + */ + @Serial private void writeObject(final ObjectOutputStream out) throws IOException { out.defaultWriteObject(); out.writeObject(this.raw); } + /** + * 读对象 + * @param in 输入流 + * @throws IOException IO异常 + * @throws ClassNotFoundException 类未找到异常 + */ + @Serial @SuppressWarnings("unchecked") private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java index 021389af4..ec7be0d64 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.CollUtil; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -43,11 +44,21 @@ import java.util.function.BiFunction; * @author Looly */ public class TableMap implements Map, Iterable>, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 默认初始大小 + */ private static final int DEFAULT_CAPACITY = 10; + /** + * 键列表 + */ private final List keys; + /** + * 值列表 + */ private final List values; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java index 77a8dbd9e..2d686e6ef 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TolerantMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -28,8 +29,12 @@ import java.util.Objects; * @author pantao, Looly */ public class TolerantMap extends MapWrapper { + @Serial private static final long serialVersionUID = -4158133823263496197L; + /** + * 默认值 + */ private final V defaultValue; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java index 4ca139458..4be90c0c1 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TripleTable.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.lang.tuple.Triple; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -36,10 +37,20 @@ import java.util.List; * @since 6.0.0 */ public class TripleTable implements Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 左列表 + */ private final List lefts; + /** + * 中列表 + */ private final List middles; + /** + * 右列表 + */ private final List rights; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java index 078f730b2..d5d84de50 100755 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/ConcurrentLinkedHashMap.java @@ -187,7 +187,13 @@ public final class ConcurrentLinkedHashMap extends AbstractMap final long[] readBufferReadCount; final LinkedDeque> evictionDeque; + /** + * The number of weighted entries in the map. + */ final AtomicLong weightedSize; + /** + * Map容量 + */ final AtomicLong capacity; final Lock evictionLock; @@ -1441,11 +1447,20 @@ public final class ConcurrentLinkedHashMap extends AbstractMap @Serial private static final long serialVersionUID = 1; + /** + * 序列化对象 + * @return 缓存对象 + */ @Serial Object writeReplace() { return new SerializationProxy<>(this); } + /** + * 反序列化对象 + * @param stream 对象流 + * @throws InvalidObjectException 无效对象异常 + */ @Serial private void readObject(final ObjectInputStream stream) throws InvalidObjectException { throw new InvalidObjectException("Proxy required"); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java index 9d7ecb8ed..448369262 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/CollectionValueMap.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.map.multi; import cn.hutool.v7.core.func.SerSupplier; +import java.io.Serial; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -35,9 +36,12 @@ import java.util.function.Supplier; * @since 4.3.3 */ public class CollectionValueMap extends AbsCollValueMap { - + @Serial private static final long serialVersionUID = 9012989578038102983L; + /** + * 值集合工厂方法 + */ private final SerSupplier> collFactory; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java index 6d82444be..617d71fd6 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.lang.ref.Ref; import cn.hutool.v7.core.lang.ref.ReferenceUtil; import cn.hutool.v7.core.map.MapUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -37,10 +38,20 @@ import java.util.function.Function; * @author Looly */ public abstract class ReferenceConcurrentMap implements ConcurrentMap, Iterable>, Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 键值对引用 + */ final ConcurrentMap, Ref> raw; + /** + * 键队列 + */ private final ReferenceQueue lastKeyQueue; + /** + * 值队列 + */ private final ReferenceQueue lastValueQueue; /** * 回收监听 diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java index 6f1cbc955..67843a1be 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Arrangement.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.math; import cn.hutool.v7.core.array.ArrayUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -31,8 +32,12 @@ import java.util.List; * @since 4.0.7 */ public class Arrangement implements Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 用于排列的数据 + */ private final String[] datas; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java index afa0c7f42..e38a7737a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Combination.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.math; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -31,8 +32,12 @@ import java.util.List; * @since 4.0.6 */ public class Combination implements Serializable { + @Serial private static final long serialVersionUID = 1L; + /** + * 用于组合的数据 + */ private final String[] datas; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java index 430d7952b..4cab3aa53 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/ssl/SSLContextBuilder.java @@ -16,14 +16,15 @@ package cn.hutool.v7.core.net.ssl; -import cn.hutool.v7.core.lang.builder.Builder; -import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.array.ArrayUtil; +import cn.hutool.v7.core.io.IORuntimeException; +import cn.hutool.v7.core.lang.builder.Builder; import cn.hutool.v7.core.text.StrUtil; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; +import java.io.Serial; import java.security.*; @@ -42,12 +43,38 @@ import java.security.*; * @since 5.5.2 */ public class SSLContextBuilder implements SSLProtocols, Builder { + @Serial private static final long serialVersionUID = 1L; + //SSL/TLS 协议配置参数 + + /** + * 使用的 SSL/TLS 协议版本，默认为 TLS + */ private String protocol = TLS; + + /** + * 密钥管理器数组，用于管理本地密钥材料（如客户端证书和私钥） + * 在建立安全连接时提供本地身份验证所需的密钥 + */ private KeyManager[] keyManagers; + + /** + * 信任管理器数组，用于管理受信任的 CA 证书 + * 决定哪些远程证书被视为可信（如服务器证书验证） + */ private TrustManager[] trustManagers; + + /** + * 安全随机数生成器，用于生成加密操作所需的高质量随机数 + * 影响密钥生成、握手过程等安全性关键环节 + */ private SecureRandom secureRandom; + + /** + * 安全提供者，指定底层加密算法的实现提供者 + * 如 Bouncy Castle、SunJSSE 等，影响可用算法和性能 + */ private Provider provider;