From 3cd7435541bef677285aaab5b567319b42dccc5f Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 27 Oct 2025 00:05:19 +0800 Subject: [PATCH] add @Serial --- .../cn/hutool/v7/core/bean/BeanException.java | 3 ++ .../hutool/v7/core/bean/RecordBeanDesc.java | 2 ++ .../v7/core/bean/copier/CopyOptions.java | 2 ++ .../v7/core/cache/file/AbstractFileCache.java | 2 ++ .../v7/core/cache/file/LFUFileCache.java | 3 ++ .../v7/core/cache/file/LRUFileCache.java | 3 ++ .../hutool/v7/core/cache/impl/CacheObj.java | 2 ++ .../hutool/v7/core/cache/impl/FIFOCache.java | 2 ++ .../hutool/v7/core/cache/impl/LFUCache.java | 2 ++ .../hutool/v7/core/cache/impl/LRUCache.java | 2 ++ .../cn/hutool/v7/core/codec/Number128.java | 2 ++ .../v7/core/codec/binary/Base32Codec.java | 10 ++++--- .../v7/core/codec/binary/Base58Codec.java | 4 ++- .../hutool/v7/core/codec/binary/Z85Codec.java | 2 ++ .../v7/core/collection/iter/ArrayIter.java | 4 ++- .../core/collection/iter/PartitionIter.java | 2 ++ .../set/ConcurrentLinkedHashSet.java | 2 ++ .../v7/core/comparator/ComparatorChain.java | 14 +++++---- .../core/comparator/ComparatorException.java | 3 ++ .../v7/core/comparator/FieldComparator.java | 2 ++ .../v7/core/comparator/FieldsComparator.java | 2 ++ .../v7/core/comparator/FuncComparator.java | 2 ++ .../v7/core/comparator/LocaleComparator.java | 2 ++ .../v7/core/comparator/NullComparator.java | 2 ++ .../v7/core/comparator/PinyinComparator.java | 2 ++ .../core/comparator/PropertyComparator.java | 3 ++ .../v7/core/comparator/VersionComparator.java | 2 ++ .../v7/core/convert/AbstractConverter.java | 2 ++ .../v7/core/convert/ConvertException.java | 3 ++ .../v7/core/convert/SpecialConverter.java | 2 ++ .../v7/core/convert/impl/ArrayConverter.java | 8 ++--- .../convert/impl/AtomicBooleanConverter.java | 2 ++ .../impl/AtomicIntegerArrayConverter.java | 2 ++ .../impl/AtomicLongArrayConverter.java | 2 ++ .../core/convert/impl/BooleanConverter.java | 3 ++ .../core/convert/impl/CalendarConverter.java | 2 ++ .../v7/core/convert/impl/CastConverter.java | 2 ++ .../core/convert/impl/CharacterConverter.java | 3 ++ .../core/convert/impl/CharsetConverter.java | 2 ++ .../core/convert/impl/CurrencyConverter.java | 2 ++ .../v7/core/convert/impl/DateConverter.java | 2 ++ .../core/convert/impl/DurationConverter.java | 2 ++ .../core/convert/impl/EmptyBeanConverter.java | 2 ++ .../v7/core/convert/impl/EntryConverter.java | 2 ++ .../v7/core/convert/impl/EnumConverter.java | 2 ++ .../v7/core/convert/impl/KBeanConverter.java | 2 ++ .../v7/core/convert/impl/LocaleConverter.java | 2 ++ .../v7/core/convert/impl/MapConverter.java | 2 ++ .../v7/core/convert/impl/NumberConverter.java | 2 ++ .../v7/core/convert/impl/OptConverter.java | 3 ++ .../core/convert/impl/OptionalConverter.java | 2 ++ .../v7/core/convert/impl/PairConverter.java | 2 ++ .../v7/core/convert/impl/PathConverter.java | 2 ++ .../v7/core/convert/impl/PeriodConverter.java | 2 ++ .../core/convert/impl/PrimitiveConverter.java | 2 ++ .../impl/StackTraceElementConverter.java | 2 ++ .../impl/TemporalAccessorConverter.java | 2 ++ .../core/convert/impl/TimeZoneConverter.java | 2 ++ .../v7/core/convert/impl/TripleConverter.java | 2 ++ .../v7/core/convert/impl/URIConverter.java | 2 ++ .../v7/core/convert/impl/URLConverter.java | 2 ++ .../v7/core/convert/impl/UUIDConverter.java | 2 ++ .../v7/core/convert/impl/ZoneIdConverter.java | 2 ++ .../hutool/v7/core/data/CoordinateUtil.java | 2 ++ .../hutool/v7/core/date/BetweenFormatter.java | 2 ++ .../cn/hutool/v7/core/date/DateBetween.java | 2 ++ .../cn/hutool/v7/core/date/DateException.java | 3 ++ .../cn/hutool/v7/core/date/DateRange.java | 2 ++ .../v7/core/date/format/DefaultDateBasic.java | 2 ++ .../v7/core/date/format/SimpleDateBasic.java | 2 ++ .../core/date/format/parser/TimeParser.java | 2 ++ .../v7/core/exception/CloneException.java | 3 ++ .../core/exception/DependencyException.java | 3 ++ .../v7/core/exception/HutoolException.java | 3 ++ .../v7/core/exception/ValidateException.java | 3 ++ .../hutool/v7/core/io/IORuntimeException.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16Ansi.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16CCITT.java | 3 ++ .../io/checksum/crc16/CRC16CCITTFalse.java | 3 ++ .../core/io/checksum/crc16/CRC16Checksum.java | 2 ++ .../v7/core/io/checksum/crc16/CRC16DNP.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16IBM.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16Maxim.java | 3 ++ .../core/io/checksum/crc16/CRC16Modbus.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16USB.java | 3 ++ .../v7/core/io/checksum/crc16/CRC16X25.java | 3 ++ .../core/io/checksum/crc16/CRC16XModem.java | 3 ++ .../cn/hutool/v7/core/io/file/FileWriter.java | 1 + .../io/resource/CharSequenceResource.java | 2 ++ .../v7/core/io/resource/JarResource.java | 2 ++ .../core/io/resource/MultiFileResource.java | 2 ++ .../core/io/resource/NoResourceException.java | 3 ++ .../v7/core/io/resource/StringResource.java | 2 ++ .../v7/core/io/resource/WebAppResource.java | 2 ++ .../v7/core/io/watch/WatchException.java | 3 ++ .../v7/core/io/watch/WatchServiceWrapper.java | 2 ++ .../core/io/watch/watchers/SimpleWatcher.java | 2 ++ .../v7/core/lang/builder/GenericBuilder.java | 2 ++ .../v7/core/lang/caller/StackTraceCaller.java | 2 ++ .../core/lang/copier/SrcToTargetCopier.java | 2 ++ .../v7/core/lang/event/SourceEvent.java | 2 ++ .../v7/core/lang/loader/AtomicLoader.java | 2 ++ .../v7/core/lang/loader/LazyFunLoader.java | 2 ++ .../v7/core/lang/loader/LazyLoader.java | 2 ++ .../v7/core/lang/mutable/MutableEntry.java | 2 ++ .../v7/core/lang/mutable/MutablePair.java | 3 ++ .../v7/core/lang/mutable/MutableTriple.java | 3 ++ .../v7/core/lang/range/BoundedRange.java | 2 ++ .../cn/hutool/v7/core/lang/range/Range.java | 2 ++ .../selector/WeightListRandomSelector.java | 2 ++ .../cn/hutool/v7/core/lang/tuple/Pair.java | 2 ++ .../v7/core/map/CamelCaseLinkedMap.java | 2 ++ .../cn/hutool/v7/core/map/CamelCaseMap.java | 2 ++ .../v7/core/map/CaseInsensitiveLinkedMap.java | 2 ++ .../v7/core/map/CaseInsensitiveMap.java | 2 ++ .../v7/core/map/CaseInsensitiveTreeMap.java | 2 ++ .../cn/hutool/v7/core/map/CustomKeyMap.java | 2 ++ .../main/java/cn/hutool/v7/core/map/Dict.java | 2 ++ .../v7/core/map/FixedLinkedHashMap.java | 2 ++ .../java/cn/hutool/v7/core/map/TransMap.java | 2 ++ .../v7/core/map/concurrent/Weighers.java | 2 ++ .../v7/core/map/multi/AbsCollValueMap.java | 2 ++ .../cn/hutool/v7/core/map/multi/AbsTable.java | 2 ++ .../v7/core/map/multi/ListValueMap.java | 2 ++ .../hutool/v7/core/map/multi/SetValueMap.java | 2 ++ .../java/cn/hutool/v7/core/math/Fraction.java | 2 ++ .../v7/core/net/LocalPortGenerator.java | 2 ++ .../cn/hutool/v7/core/net/url/UrlBuilder.java | 2 ++ .../cn/hutool/v7/core/net/url/UrlDecoder.java | 2 ++ .../cn/hutool/v7/core/pool/PoolConfig.java | 2 ++ .../cn/hutool/v7/core/pool/PoolException.java | 3 ++ .../pool/partition/PartitionObjectPool.java | 2 ++ .../pool/partition/PartitionPoolConfig.java | 3 ++ .../v7/core/pool/partition/PoolPartition.java | 2 ++ .../hutool/v7/core/reflect/ClassScanner.java | 2 ++ .../core/reflect/ParameterizedTypeImpl.java | 2 ++ .../cn/hutool/v7/core/spi/SpiException.java | 3 ++ .../cn/hutool/v7/core/text/StrJoiner.java | 2 ++ .../hutool/v7/core/text/StrRegionMatcher.java | 2 ++ .../cn/hutool/v7/core/text/StrStripper.java | 2 ++ .../cn/hutool/v7/core/text/StrTrimer.java | 2 ++ .../v7/core/text/bloom/AbstractFilter.java | 2 ++ .../core/text/bloom/CombinedBloomFilter.java | 5 +++- .../hutool/v7/core/text/bloom/FuncFilter.java | 2 ++ .../v7/core/text/escape/Html4Escape.java | 3 ++ .../v7/core/text/escape/Html4Unescape.java | 3 ++ .../text/escape/NumericEntityUnescaper.java | 3 ++ .../hutool/v7/core/text/escape/XmlEscape.java | 3 ++ .../v7/core/text/escape/XmlUnescape.java | 3 ++ .../v7/core/text/finder/CharFinder.java | 3 ++ .../core/text/finder/CharMatcherFinder.java | 2 ++ .../v7/core/text/finder/LengthFinder.java | 3 ++ .../v7/core/text/finder/PatternFinder.java | 2 ++ .../hutool/v7/core/text/finder/StrFinder.java | 3 ++ .../v7/core/text/finder/TextFinder.java | 2 ++ .../core/text/replacer/HighMultiReplacer.java | 2 ++ .../v7/core/text/replacer/LookupReplacer.java | 2 ++ .../text/replacer/RangeReplacerByChar.java | 3 ++ .../text/replacer/RangeReplacerByStr.java | 3 ++ .../v7/core/text/replacer/ReplacerChain.java | 2 ++ .../v7/core/text/replacer/SearchReplacer.java | 3 ++ .../v7/core/text/replacer/StrReplacer.java | 2 ++ .../hutool/v7/core/text/split/SplitIter.java | 2 ++ .../v7/core/thread/ThreadException.java | 3 ++ .../v7/core/thread/ThreadFactoryBuilder.java | 2 ++ .../v7/core/tree/LambdaTreeNodeConfig.java | 2 ++ .../java/cn/hutool/v7/core/tree/MapTree.java | 2 ++ .../java/cn/hutool/v7/core/tree/TreeNode.java | 2 ++ .../hutool/v7/core/tree/TreeNodeConfig.java | 2 ++ .../cn/hutool/v7/core/bean/Issue1687Test.java | 3 ++ .../hutool/v7/core/convert/ConvertTest.java | 10 ++++--- .../v7/core/io/watch/TestConsoleWatcher.java | 2 ++ .../v7/core/lang/test/bean/ExamInfoDict.java | 2 ++ .../v7/core/lang/test/bean/UserInfoDict.java | 2 ++ .../lang/test/bean/UserInfoRedundCount.java | 2 ++ .../hutool/v7/core/stream/EasyStreamTest.java | 3 ++ .../v7/core/stream/EntryStreamTest.java | 7 +++++ .../cn/hutool/v7/core/util/ObjUtilTest.java | 2 ++ .../v7/cron/pattern/builder/PartBuilder.java | 6 ++++ .../cron/pattern/builder/PatternBuilder.java | 3 ++ .../cn/hutool/v7/crypto/CryptoException.java | 3 ++ .../asymmetric/AbstractAsymmetricCrypto.java | 2 ++ .../crypto/asymmetric/AsymmetricCrypto.java | 2 ++ .../v7/crypto/asymmetric/BaseAsymmetric.java | 18 +++++++----- .../cn/hutool/v7/crypto/asymmetric/ECIES.java | 2 ++ .../cn/hutool/v7/crypto/asymmetric/RSA.java | 2 ++ .../cn/hutool/v7/crypto/asymmetric/SM2.java | 2 ++ .../cn/hutool/v7/crypto/asymmetric/Sign.java | 2 ++ .../asymmetric/paillier/PaillierCrypto.java | 2 ++ .../asymmetric/paillier/PaillierKey.java | 2 ++ .../paillier/PaillierPrivateKey.java | 2 ++ .../paillier/PaillierPublicKey.java | 2 ++ .../cn/hutool/v7/crypto/digest/Digester.java | 6 ++-- .../java/cn/hutool/v7/crypto/digest/MD5.java | 2 ++ .../java/cn/hutool/v7/crypto/digest/SM3.java | 3 ++ .../cn/hutool/v7/crypto/digest/mac/HMac.java | 2 ++ .../cn/hutool/v7/crypto/digest/mac/Mac.java | 6 ++-- .../cn/hutool/v7/crypto/symmetric/AES.java | 2 ++ .../hutool/v7/crypto/symmetric/ChaCha20.java | 2 ++ .../cn/hutool/v7/crypto/symmetric/DES.java | 2 ++ .../cn/hutool/v7/crypto/symmetric/DESede.java | 2 ++ .../cn/hutool/v7/crypto/symmetric/FPE.java | 2 ++ .../cn/hutool/v7/crypto/symmetric/SM4.java | 2 ++ .../v7/crypto/symmetric/SymmetricCrypto.java | 6 ++-- .../cn/hutool/v7/crypto/symmetric/XXTEA.java | 2 ++ .../cn/hutool/v7/crypto/symmetric/ZUC.java | 2 ++ .../java/cn/hutool/v7/db/ActiveEntity.java | 3 ++ .../java/cn/hutool/v7/db/DbException.java | 3 ++ .../src/main/java/cn/hutool/v7/db/Entity.java | 2 ++ .../src/main/java/cn/hutool/v7/db/Page.java | 2 ++ .../main/java/cn/hutool/v7/db/PageResult.java | 2 ++ .../main/java/cn/hutool/v7/db/Session.java | 2 ++ .../cn/hutool/v7/db/ds/AbstractDSFactory.java | 2 ++ .../hutool/v7/db/ds/c3p0/C3p0DSFactory.java | 2 ++ .../hutool/v7/db/ds/dbcp/DbcpDSFactory.java | 2 ++ .../hutool/v7/db/ds/druid/DruidDSFactory.java | 2 ++ .../v7/db/ds/hikari/HikariDSFactory.java | 2 ++ .../hutool/v7/db/ds/jndi/JndiDSFactory.java | 2 ++ .../v7/db/ds/pooled/PooledDSFactory.java | 2 ++ .../v7/db/ds/simple/SimpleDSFactory.java | 2 ++ .../v7/db/ds/tomcat/TomcatDSFactory.java | 2 ++ .../cn/hutool/v7/db/handler/BeanHandler.java | 2 ++ .../hutool/v7/db/handler/BeanListHandler.java | 2 ++ .../hutool/v7/db/handler/EntityHandler.java | 2 ++ .../v7/db/handler/EntityListHandler.java | 2 ++ .../v7/db/handler/EntitySetHandler.java | 2 ++ .../hutool/v7/db/handler/NumberHandler.java | 2 ++ .../v7/db/handler/PageResultHandler.java | 2 ++ .../hutool/v7/db/handler/StringHandler.java | 2 ++ .../v7/db/handler/ValueListHandler.java | 2 ++ .../java/cn/hutool/v7/db/meta/Column.java | 2 ++ .../java/cn/hutool/v7/db/meta/IndexInfo.java | 2 ++ .../main/java/cn/hutool/v7/db/meta/Table.java | 2 ++ .../cn/hutool/v7/db/sql/ConditionBuilder.java | 2 ++ .../cn/hutool/v7/db/sql/ConditionGroup.java | 2 ++ .../main/java/cn/hutool/v7/db/sql/Order.java | 2 ++ .../cn/hutool/v7/db/sql/QueryBuilder.java | 2 ++ .../cn/hutool/v7/db/sql/QuoteWrapper.java | 2 ++ .../v7/extra/aop/SimpleInterceptor.java | 2 ++ .../v7/extra/aop/aspects/SimpleAspect.java | 2 ++ .../extra/aop/aspects/TimeIntervalAspect.java | 2 ++ .../extra/aop/engine/jdk/JdkInterceptor.java | 2 ++ .../engine/spring/SpringCglibInterceptor.java | 2 ++ .../v7/extra/compress/CompressException.java | 3 ++ .../cn/hutool/v7/extra/ftp/FtpConfig.java | 2 ++ .../cn/hutool/v7/extra/ftp/FtpException.java | 3 ++ .../hutool/v7/extra/mail/MailException.java | 3 ++ .../v7/extra/management/JavaSpecInfo.java | 2 ++ .../hutool/v7/extra/management/JvmInfo.java | 2 ++ .../v7/extra/management/JvmSpecInfo.java | 2 ++ .../extra/management/ManagementException.java | 3 ++ .../v7/extra/management/RuntimeInfo.java | 2 ++ .../hutool/v7/extra/management/UserInfo.java | 2 ++ .../v7/extra/pinyin/PinyinException.java | 3 ++ .../cn/hutool/v7/extra/ssh/SshException.java | 3 ++ .../v7/extra/template/TemplateException.java | 3 ++ .../template/engine/beetl/BeetlTemplate.java | 2 ++ .../template/engine/enjoy/EnjoyTemplate.java | 2 ++ .../engine/jetbrick/JetbrickTemplate.java | 2 ++ .../template/engine/jte/JteTemplate.java | 1 + .../template/engine/rythm/RythmTemplate.java | 2 ++ .../engine/thymeleaf/ThymeleafTemplate.java | 2 ++ .../engine/velocity/VelocityTemplate.java | 2 ++ .../template/engine/wit/WitTemplate.java | 2 ++ .../extra/tokenizer/TokenizerException.java | 3 ++ .../extra/tokenizer/engine/ansj/AnsjWord.java | 3 ++ .../tokenizer/engine/hanlp/HanLPWord.java | 3 ++ .../engine/ikanalyzer/IKAnalyzerWord.java | 3 ++ .../tokenizer/engine/jcseg/JcsegWord.java | 3 ++ .../tokenizer/engine/jieba/JiebaWord.java | 3 ++ .../tokenizer/engine/mmseg/MmsegWord.java | 3 ++ .../tokenizer/engine/mynlp/MynlpWord.java | 3 ++ .../extra/tokenizer/engine/word/WordWord.java | 3 ++ .../java/cn/hutool/v7/http/HttpException.java | 3 ++ .../httpclient5/TlsSocketStrategyBuilder.java | 2 ++ .../cn/hutool/v7/http/html/HtmlFilter.java | 15 +++++----- .../cn/hutool/v7/http/useragent/Browser.java | 2 ++ .../v7/http/useragent/BrowserEngine.java | 2 ++ .../java/cn/hutool/v7/http/useragent/OS.java | 2 ++ .../cn/hutool/v7/http/useragent/Platform.java | 2 ++ .../hutool/v7/http/useragent/UserAgent.java | 2 ++ .../v7/http/useragent/UserAgentInfo.java | 2 ++ .../http/webservice/SoapRuntimeException.java | 3 ++ .../java/cn/hutool/v7/json/JSONConfig.java | 2 ++ .../java/cn/hutool/v7/json/JSONException.java | 3 ++ .../v7/json/engine/JSONEngineConfig.java | 2 ++ .../v7/json/engine/jackson/HutoolModule.java | 3 ++ .../cn/hutool/v7/json/jwt/JWTException.java | 3 ++ .../java/cn/hutool/v7/json/jwt/JWTHeader.java | 2 ++ .../cn/hutool/v7/json/jwt/JWTPayload.java | 2 ++ .../cn/hutool/v7/json/xml/ParseConfig.java | 2 ++ .../java/cn/hutool/v7/json/JSONUtilTest.java | 2 ++ .../hutool/v7/json/issues/Issue3058Test.java | 2 ++ .../v7/json/issues/IssueI1AU86Test.java | 2 ++ .../hutool/v7/json/issues/Issues1881Test.java | 2 ++ .../java/cn/hutool/v7/json/jwt/JWTTest.java | 2 ++ .../cn/hutool/v7/json/jwt/JWTUtilTest.java | 2 ++ .../v7/json/test/bean/ExamInfoDict.java | 2 ++ .../cn/hutool/v7/json/test/bean/JsonNode.java | 2 ++ .../bean/PerfectEvaluationProductResVo.java | 3 ++ .../v7/json/test/bean/ProductResBase.java | 2 ++ .../hutool/v7/json/test/bean/ResultDto.java | 2 ++ .../v7/json/test/bean/TokenAuthWarp.java | 3 ++ .../v7/json/test/bean/TokenAuthWarp2.java | 3 ++ .../cn/hutool/v7/json/test/bean/UUMap.java | 2 ++ .../v7/json/test/bean/UserInfoDict.java | 2 ++ .../json/test/bean/UserInfoRedundCount.java | 2 ++ .../java/cn/hutool/v7/log/AbstractLog.java | 29 +++++++++---------- .../engine/commons/ApacheCommonsLog4JLog.java | 3 ++ .../log/engine/console/ConsoleColorLog.java | 22 +++++--------- .../hutool/v7/log/engine/jboss/JbossLog.java | 3 ++ .../v7/log/engine/log4j2/Log4j2Log.java | 3 ++ .../hutool/v7/log/engine/slf4j/Slf4jLog.java | 3 ++ .../java/cn/hutool/v7/poi/POIException.java | 3 ++ .../java/cn/hutool/v7/poi/csv/CsvConfig.java | 2 ++ .../cn/hutool/v7/poi/csv/CsvReadConfig.java | 2 ++ .../cn/hutool/v7/poi/csv/CsvWriteConfig.java | 2 ++ .../java/cn/hutool/v7/poi/csv/CsvWriter.java | 1 + .../v7/poi/excel/sax/StopReadException.java | 3 ++ .../v7/poi/excel/style/DefaultStyleSet.java | 2 ++ .../v7/poi/excel/style/ShapeConfig.java | 2 ++ .../v7/poi/excel/reader/CellEditorTest.java | 2 ++ .../poi/excel/writer/BigExcelWriteTest.java | 21 +++++++++----- .../java/cn/hutool/v7/setting/AbsSetting.java | 2 ++ .../java/cn/hutool/v7/setting/GroupedMap.java | 2 ++ .../java/cn/hutool/v7/setting/GroupedSet.java | 6 ++-- .../hutool/v7/setting/SettingException.java | 3 ++ .../cn/hutool/v7/setting/props/Props.java | 3 ++ .../cn/hutool/v7/socket/SocketConfig.java | 2 ++ .../v7/socket/SocketRuntimeException.java | 3 ++ .../v7/swing/captcha/CircleCaptcha.java | 2 ++ .../hutool/v7/swing/captcha/GifCaptcha.java | 2 ++ .../hutool/v7/swing/captcha/LineCaptcha.java | 2 ++ .../hutool/v7/swing/captcha/ShearCaptcha.java | 2 ++ .../captcha/generator/AbstractGenerator.java | 3 ++ .../captcha/generator/RandomGenerator.java | 3 ++ .../v7/swing/clipboard/ImageSelection.java | 2 ++ .../swing/clipboard/StrClipboardListener.java | 2 ++ .../cn/hutool/v7/swing/img/DisplayText.java | 2 ++ .../main/java/cn/hutool/v7/swing/img/Img.java | 1 + .../v7/swing/img/RenderingHintsBuilder.java | 2 ++ .../v7/swing/qrcode/QrCodeException.java | 3 ++ .../v7/swing/captcha/CaptchaUtilTest.java | 2 ++ 343 files changed, 841 insertions(+), 89 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java index aee2a4ed6..851a06062 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/BeanException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.bean; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * Bean异常 * * @author Looly */ public class BeanException extends HutoolException { + @Serial private static final long serialVersionUID = -8096998667745023423L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java index 812407629..7ea77d1e1 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/RecordBeanDesc.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.reflect.FieldUtil; import cn.hutool.v7.core.reflect.ModifierUtil; import cn.hutool.v7.core.reflect.method.MethodUtil; +import java.io.Serial; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Map; @@ -33,6 +34,7 @@ import java.util.Map; * @since 3.1.2 */ public class RecordBeanDesc extends AbstractBeanDesc { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java index 02badfa60..67ce4bc09 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/bean/copier/CopyOptions.java @@ -26,6 +26,7 @@ import cn.hutool.v7.core.lang.mutable.MutableEntry; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Type; @@ -44,6 +45,7 @@ import java.util.function.UnaryOperator; * @author Looly */ public class CopyOptions implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java index 722345e32..ef61caff5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/AbstractFileCache.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.io.file.FileUtil; import cn.hutool.v7.core.io.IORuntimeException; import java.io.File; +import java.io.Serial; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; * */ public abstract class AbstractFileCache implements Serializable{ + @Serial private static final long serialVersionUID = 1L; /** 容量 */ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java index 6ece59b2d..770ac8b77 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LFUFileCache.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.cache.Cache; import cn.hutool.v7.core.cache.impl.LFUCache; import java.io.File; +import java.io.Serial; /** * 使用LFU缓存文件，以解决频繁读取文件引起的性能问题 @@ -27,6 +28,7 @@ import java.io.File; * */ public class LFUFileCache extends AbstractFileCache{ + @Serial private static final long serialVersionUID = 1L; /** @@ -62,6 +64,7 @@ public class LFUFileCache extends AbstractFileCache{ @Override protected Cache initCache() { return new LFUCache(LFUFileCache.this.capacity, LFUFileCache.this.timeout) { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java index 95c76994f..5256bb66e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/file/LRUFileCache.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.cache.Cache; import cn.hutool.v7.core.cache.impl.LRUCache; import java.io.File; +import java.io.Serial; /** * 使用LRU缓存文件，以解决频繁读取文件引起的性能问题 @@ -27,6 +28,7 @@ import java.io.File; * */ public class LRUFileCache extends AbstractFileCache{ + @Serial private static final long serialVersionUID = 1L; /** @@ -62,6 +64,7 @@ public class LRUFileCache extends AbstractFileCache{ @Override protected Cache initCache() { return new LRUCache(LRUFileCache.this.capacity, super.timeout) { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java index c15d66b02..70034b7ee 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/CacheObj.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.cache.impl; import cn.hutool.v7.core.date.DateUtil; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.concurrent.atomic.AtomicLong; @@ -30,6 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; * @author Looly */ public class CacheObj implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java index 410558ea5..14ce1ed9e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/FIFOCache.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.cache.impl; +import java.io.Serial; import java.util.Iterator; import java.util.LinkedHashMap; @@ -35,6 +36,7 @@ import java.util.LinkedHashMap; * @author Looly */ public class FIFOCache extends LockedCache { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java index e38175ec3..de34c3b99 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LFUCache.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.cache.impl; import cn.hutool.v7.core.thread.lock.NoLock; +import java.io.Serial; import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; @@ -34,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; * @param 值类型 */ public class LFUCache extends LockedCache { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java index 4680527ca..cdb0cc55b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/LRUCache.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.cache.impl; import cn.hutool.v7.core.lang.mutable.Mutable; import cn.hutool.v7.core.map.FixedLinkedHashMap; +import java.io.Serial; import java.util.Iterator; import java.util.concurrent.locks.ReentrantLock; @@ -35,6 +36,7 @@ import java.util.concurrent.locks.ReentrantLock; * @param 值类型 */ public class LRUCache extends LockedCache { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java index 9ea82765e..528521da8 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/Number128.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.codec; +import java.io.Serial; import java.nio.ByteOrder; import java.util.Objects; @@ -30,6 +31,7 @@ import java.util.Objects; * @since 5.2.5 */ public class Number128 extends Number implements Comparable{ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java index 455053ceb..6b0ba2012 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base32Codec.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.codec.binary; import cn.hutool.v7.core.codec.Decoder; import cn.hutool.v7.core.codec.Encoder; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; @@ -37,6 +38,7 @@ import java.util.Arrays; * @since 5.8.0 */ public class Base32Codec implements Encoder, Decoder, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -227,23 +229,23 @@ public class Base32Codec implements Encoder, Decoder= bytes.length) { break; } } else { - bytes[offset] |= digit << (8 - index); + bytes[offset] |= (byte) (digit << (8 - index)); } } else { index = (index + 5) % 8; - bytes[offset] |= (digit >>> index); + bytes[offset] |= (byte) (digit >>> index); offset++; if (offset >= bytes.length) { break; } - bytes[offset] |= digit << (8 - index); + bytes[offset] |= (byte) (digit << (8 - index)); } } return bytes; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java index 3439ec4d7..8b4d8e9b7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/binary/Base58Codec.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.codec.Decoder; import cn.hutool.v7.core.codec.Encoder; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; @@ -31,6 +32,7 @@ import java.util.Arrays; * @since 5.7.22 */ public class Base58Codec implements Encoder, Decoder, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -154,7 +156,7 @@ public class Base58Codec implements Encoder, Decoder, Decoder, Serializable { + @Serial private static final long serialVersionUID = 1L; private static final char[] encodeTable = new char[]{ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java index a4d209ad2..e2a463c43 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/ArrayIter.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.collection.iter; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Array; import java.util.NoSuchElementException; @@ -29,6 +30,7 @@ import java.util.Objects; * @since 4.1.1 */ public class ArrayIter implements IterableIter, ResettableIter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -112,7 +114,7 @@ public class ArrayIter implements IterableIter, ResettableIter, Seriali @Override @SuppressWarnings("unchecked") public E next() { - if (hasNext() == false) { + if (!hasNext()) { throw new NoSuchElementException(); } return (E) Array.get(array, index++); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java index e51b7546d..d5cc6ba94 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/iter/PartitionIter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.collection.iter; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; @@ -37,6 +38,7 @@ import java.util.Objects; * @since 5.7.10 */ public class PartitionIter implements IterableIter>, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java index ee75a0281..579aed142 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/ConcurrentLinkedHashSet.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.collection.set; import cn.hutool.v7.core.map.concurrent.ConcurrentLinkedHashMap; +import java.io.Serial; import java.util.Collection; /** @@ -28,6 +29,7 @@ import java.util.Collection; * @since 3.1.0 */ public class ConcurrentLinkedHashSet extends SetFromMap { + @Serial private static final long serialVersionUID = 7997886765361607470L; // ----------------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java index f19ff8264..50b60fe08 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorChain.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.comparator; import cn.hutool.v7.core.lang.Chain; +import java.io.Serial; import java.io.Serializable; import java.util.*; @@ -31,6 +32,7 @@ import java.util.*; * @param 被比较的对象 */ public class ComparatorChain implements Chain, ComparatorChain>, Comparator, Serializable { + @Serial private static final long serialVersionUID = -2426725788913962429L; /** @@ -138,7 +140,7 @@ public class ComparatorChain implements Chain, ComparatorChain< chain = new ArrayList<>(1); chain.add(comparator); orderingBits = new BitSet(1); - if (reverse == true) { + if (reverse) { orderingBits.set(0); } } @@ -186,7 +188,7 @@ public class ComparatorChain implements Chain, ComparatorChain< checkLocked(); chain.add(comparator); - if (reverse == true) { + if (reverse) { orderingBits.set(chain.size() - 1); } return this; @@ -216,7 +218,7 @@ public class ComparatorChain implements Chain, ComparatorChain< checkLocked(); chain.set(index, comparator); - if (reverse == true) { + if (reverse) { orderingBits.set(index); } else { orderingBits.clear(index); @@ -287,7 +289,7 @@ public class ComparatorChain implements Chain, ComparatorChain< */ @Override public int compare(final E o1, final E o2) throws UnsupportedOperationException { - if (lock == false) { + if (!lock) { checkChainIntegrity(); lock = true; } @@ -300,7 +302,7 @@ public class ComparatorChain implements Chain, ComparatorChain< retval = comparator.compare(o1, o2); if (retval != 0) { // invert the order if it is a reverse sort - if (true == orderingBits.get(comparatorIndex)) { + if (orderingBits.get(comparatorIndex)) { retval = (retval > 0) ? -1 : 1; } return retval; @@ -348,7 +350,7 @@ public class ComparatorChain implements Chain, ComparatorChain< * @throws UnsupportedOperationException 被锁定抛出此异常 */ private void checkLocked() { - if (lock == true) { + if (lock) { throw new UnsupportedOperationException("Comparator ordering cannot be changed after the first comparison is performed"); } } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java index 1c1ec7821..8e112b1dc 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/ComparatorException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.comparator; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 比较异常 * * @author Looly */ public class ComparatorException extends HutoolException { + @Serial private static final long serialVersionUID = 4475602435485521971L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java index 622556104..dfed1b53f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldComparator.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.reflect.FieldUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.lang.reflect.Field; /** @@ -30,6 +31,7 @@ import java.lang.reflect.Field; * @author Looly */ public class FieldComparator extends FuncComparator { + @Serial private static final long serialVersionUID = 9157326766723846313L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java index d6749686c..7154aef92 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FieldsComparator.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.comparator; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.reflect.FieldUtil; +import java.io.Serial; import java.lang.reflect.Field; /** @@ -29,6 +30,7 @@ import java.lang.reflect.Field; * @author Looly */ public class FieldsComparator extends NullComparator { + @Serial private static final long serialVersionUID = 8649196282886500803L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java index 94de5e268..0d178c7ac 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/FuncComparator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.comparator; +import java.io.Serial; import java.util.function.Function; /** @@ -25,6 +26,7 @@ import java.util.function.Function; * @author Looly */ public class FuncComparator extends NullComparator { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java index a1d4d4728..44b086d75 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/LocaleComparator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.comparator; +import java.io.Serial; import java.text.Collator; import java.util.Locale; @@ -25,6 +26,7 @@ import java.util.Locale; * @author Looly */ public class LocaleComparator extends NullComparator { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java index 1f7100d36..f6bc797b2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/NullComparator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.comparator; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; import java.util.Objects; @@ -32,6 +33,7 @@ import java.util.Objects; * @since 5.7.10 */ public class NullComparator implements Comparator, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java index ef48ca331..1ef876088 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PinyinComparator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.comparator; +import java.io.Serial; import java.util.Locale; /** @@ -25,6 +26,7 @@ import java.util.Locale; * @since 4.0.8 */ public class PinyinComparator extends LocaleComparator { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java index 81afeb1ca..560ccc4b3 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/PropertyComparator.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.comparator; import cn.hutool.v7.core.bean.BeanUtil; +import java.io.Serial; + /** * Bean属性排序器
* 支持读取Bean多层次下的属性 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.bean.BeanUtil; * @param 被比较的Bean */ public class PropertyComparator extends FuncComparator { + @Serial private static final long serialVersionUID = 9157326766723846313L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java index e6f970104..f0567a482 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/comparator/VersionComparator.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.comparator; import cn.hutool.v7.core.lang.Version; +import java.io.Serial; import java.io.Serializable; /** @@ -31,6 +32,7 @@ import java.io.Serializable; * @since 4.0.2 */ public class VersionComparator extends NullComparator implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java index 6f2ef69c2..97089493e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/AbstractConverter.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.reflect.TypeUtil; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; @@ -37,6 +38,7 @@ import java.lang.reflect.Type; * @author Looly */ public abstract class AbstractConverter implements Converter, Serializable { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java index 7503fc487..9405d3c4a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/ConvertException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.convert; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 转换异常 * * @author Looly */ public class ConvertException extends HutoolException { + @Serial private static final long serialVersionUID = 4730597402855274362L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java index 678ba3ba1..48a41e012 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/SpecialConverter.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.reflect.TypeUtil; import cn.hutool.v7.core.stream.StreamUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.LinkedHashSet; @@ -35,6 +36,7 @@ import java.util.Set; * @since 6.0.0 */ public class SpecialConverter extends ConverterWithRoot implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java index 2080f5013..f3b15dd68 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ArrayConverter.java @@ -28,6 +28,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.split.SplitUtil; import cn.hutool.v7.core.util.ByteUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.Type; @@ -41,6 +42,7 @@ import java.util.List; * @author Looly */ public class ArrayConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** @@ -180,17 +182,15 @@ public class ArrayConverter extends AbstractConverter implements MatcherConverte */ private Object convertIterableToArray(final Class targetComponentType, final Iterable value) { final Object result; - if (value instanceof List) { + if (value instanceof List list) { // List转数组 - final List list = (List) value; final int size = list.size(); result = Array.newInstance(targetComponentType, size); for (int i = 0; i < size; i++) { Array.set(result, i, convertComponentType(targetComponentType, list.get(i))); } - } else if (value instanceof Collection) { + } else if (value instanceof Collection collection) { // 集合转数组 - final Collection collection = (Collection) value; result = Array.newInstance(targetComponentType, collection.size()); int i = 0; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java index a4fbf02fc..d8bc7a500 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicBooleanConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.util.BooleanUtil; +import java.io.Serial; import java.util.concurrent.atomic.AtomicBoolean; /** @@ -28,6 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * @since 3.0.8 */ public class AtomicBooleanConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java index d5b2285e6..0c343a757 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicIntegerArrayConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.convert.ConvertUtil; +import java.io.Serial; import java.util.concurrent.atomic.AtomicIntegerArray; /** @@ -28,6 +29,7 @@ import java.util.concurrent.atomic.AtomicIntegerArray; * @since 5.4.5 */ public class AtomicIntegerArrayConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java index 98eb7753b..45199dfc0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/AtomicLongArrayConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.convert.ConvertUtil; +import java.io.Serial; import java.util.concurrent.atomic.AtomicLongArray; /** @@ -28,6 +29,7 @@ import java.util.concurrent.atomic.AtomicLongArray; * @since 5.4.5 */ public class AtomicLongArrayConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java index 1ea556669..7d28a52fc 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/BooleanConverter.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.util.BooleanUtil; +import java.io.Serial; + /** * 布尔转换器 * @@ -33,6 +35,7 @@ import cn.hutool.v7.core.util.BooleanUtil; * @author Looly */ public class BooleanConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java index 4ba49d5b9..135b50495 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CalendarConverter.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.date.DateUtil; import cn.hutool.v7.core.text.StrUtil; import javax.xml.datatype.XMLGregorianCalendar; +import java.io.Serial; import java.util.Calendar; import java.util.Date; @@ -31,6 +32,7 @@ import java.util.Date; * @author Looly */ public class CalendarConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java index d0543693d..7e48b6293 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CastConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.ConvertException; import cn.hutool.v7.core.convert.MatcherConverter; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; @@ -29,6 +30,7 @@ import java.lang.reflect.Type; * @since 4.0.2 */ public class CastConverter implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java index 8a9169a1e..9d1e7c279 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharacterConverter.java @@ -20,6 +20,8 @@ import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.util.BooleanUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * 字符转换器 * @@ -27,6 +29,7 @@ import cn.hutool.v7.core.text.StrUtil; * */ public class CharacterConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java index df30dd3f4..f48daa57d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CharsetConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.nio.charset.Charset; /** @@ -27,6 +28,7 @@ import java.nio.charset.Charset; * */ public class CharsetConverter extends AbstractConverter{ + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java index 6ecaee773..9a38f68af 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/CurrencyConverter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; +import java.io.Serial; import java.util.Currency; /** @@ -27,6 +28,7 @@ import java.util.Currency; * @since 3.0.8 */ public class CurrencyConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java index e886821b1..dcae3583c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DateConverter.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.date.DateUtil; import cn.hutool.v7.core.date.SqlDateUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.lang.reflect.Type; import java.time.temporal.TemporalAccessor; import java.util.Calendar; @@ -35,6 +36,7 @@ import java.util.Date; * @author Looly */ public class DateConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java index 017d86fc1..c7535aab5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/DurationConverter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; +import java.io.Serial; import java.time.Duration; import java.time.temporal.TemporalAmount; @@ -29,6 +30,7 @@ import java.time.temporal.TemporalAmount; * @since 5.0.0 */ public class DurationConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java index 9fa7b02b7..550588c66 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EmptyBeanConverter.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.convert.MatcherConverter; import cn.hutool.v7.core.reflect.ConstructorUtil; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; @@ -31,6 +32,7 @@ import java.lang.reflect.Type; * @since 6.0.0 */ public class EmptyBeanConverter extends AbstractConverter implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java index 9538c0268..97b69fc71 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EntryConverter.java @@ -30,6 +30,7 @@ import cn.hutool.v7.core.reflect.TypeUtil; import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.Map; @@ -46,6 +47,7 @@ import java.util.Map; * @author Looly */ public class EntryConverter extends ConverterWithRoot implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java index 469529ec3..79fea9867 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/EnumConverter.java @@ -27,6 +27,7 @@ import cn.hutool.v7.core.reflect.ModifierUtil; import cn.hutool.v7.core.reflect.method.MethodUtil; import cn.hutool.v7.core.util.EnumUtil; +import java.io.Serial; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Arrays; @@ -41,6 +42,7 @@ import java.util.stream.Collectors; */ @SuppressWarnings({"unchecked", "rawtypes"}) public class EnumConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java index 8dc6d9108..41b0af7b2 100755 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/KBeanConverter.java @@ -27,6 +27,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.reflect.TypeUtil; import cn.hutool.v7.core.reflect.kotlin.KClassUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.Map; @@ -42,6 +43,7 @@ import java.util.Map; * @author Looly */ public class KBeanConverter implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java index 3848bafff..74a961cb0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/LocaleConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.Locale; /** @@ -30,6 +31,7 @@ import java.util.Locale; * @since 4.5.2 */ public class LocaleConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java index c8173c6b0..07ca30d70 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/MapConverter.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.map.MapUtil; import cn.hutool.v7.core.reflect.TypeReference; import cn.hutool.v7.core.reflect.TypeUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.LinkedHashMap; @@ -39,6 +40,7 @@ import java.util.Objects; * @since 3.0.8 */ public class MapConverter extends ConverterWithRoot implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java index 5856314c9..48d92b1a2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/NumberConverter.java @@ -25,6 +25,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.util.BooleanUtil; import cn.hutool.v7.core.util.ByteUtil; +import java.io.Serial; import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; @@ -57,6 +58,7 @@ import java.util.function.Function; * @author Looly */ public class NumberConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java index a3977e912..d084a02e2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptConverter.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.lang.Opt; +import java.io.Serial; + /** * * {@link Opt}对象转换器 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.lang.Opt; * @since 5.7.16 */ public class OptConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java index 8d4d9c64b..7b867c98a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/OptionalConverter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; +import java.io.Serial; import java.util.Optional; /** @@ -28,6 +29,7 @@ import java.util.Optional; * @since 5.0.0 */ public class OptionalConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java index 12b0cc7ba..f2d975d6e 100755 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PairConverter.java @@ -27,6 +27,7 @@ import cn.hutool.v7.core.reflect.TypeUtil; import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.Map; @@ -43,6 +44,7 @@ import java.util.Map; * @author Looly */ public class PairConverter extends ConverterWithRoot implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java index 654556576..3d492cc5b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PathConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; +import java.io.Serial; import java.net.URI; import java.net.URL; import java.nio.file.Path; @@ -30,6 +31,7 @@ import java.nio.file.Paths; * */ public class PathConverter extends AbstractConverter{ + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java index b8d068949..4e87aabd2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PeriodConverter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; +import java.io.Serial; import java.time.Period; import java.time.temporal.TemporalAmount; @@ -29,6 +30,7 @@ import java.time.temporal.TemporalAmount; * @since 5.0.0 */ public class PeriodConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java index 939cc6d65..7a62562bd 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/PrimitiveConverter.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.convert.ConvertException; import cn.hutool.v7.core.convert.MatcherConverter; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; @@ -40,6 +41,7 @@ import java.lang.reflect.Type; * @author Looly */ public class PrimitiveConverter extends AbstractConverter implements MatcherConverter, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java index 0d49ca6bd..833aa24b3 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/StackTraceElementConverter.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.map.MapUtil; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.util.Map; /** @@ -30,6 +31,7 @@ import java.util.Map; * @since 3.0.8 */ public class StackTraceElementConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java index 5f3214979..5b5667275 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TemporalAccessorConverter.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.date.format.DateFormatManager; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.time.*; import java.time.chrono.Era; import java.time.chrono.IsoEra; @@ -51,6 +52,7 @@ import java.util.Objects; * @since 5.0.0 */ public class TemporalAccessorConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java index 80a1682d4..9ee84bb2a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TimeZoneConverter.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.convert.MatcherConverter; import cn.hutool.v7.core.date.ZoneUtil; +import java.io.Serial; import java.lang.reflect.Type; import java.time.ZoneId; import java.util.TimeZone; @@ -30,6 +31,7 @@ import java.util.TimeZone; * */ public class TimeZoneConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java index 070df660b..071cfe7b8 100755 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/TripleConverter.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.lang.tuple.Triple; import cn.hutool.v7.core.reflect.TypeReference; import cn.hutool.v7.core.reflect.TypeUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; import java.util.Map; @@ -38,6 +39,7 @@ import java.util.Map; * @since 6.0.0 */ public class TripleConverter extends ConverterWithRoot implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java index d443175f2..fbef5c03c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URIConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; +import java.io.Serial; import java.net.URI; import java.net.URL; @@ -28,6 +29,7 @@ import java.net.URL; * */ public class URIConverter extends AbstractConverter{ + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java index 02940537f..fed371f97 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/URLConverter.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; import java.io.File; +import java.io.Serial; import java.net.URI; import java.net.URL; @@ -28,6 +29,7 @@ import java.net.URL; * */ public class URLConverter extends AbstractConverter{ + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java index 8b0b52194..7b90186db 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/UUIDConverter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.convert.impl; import cn.hutool.v7.core.convert.AbstractConverter; +import java.io.Serial; import java.util.UUID; /** @@ -28,6 +29,7 @@ import java.util.UUID; * */ public class UUIDConverter extends AbstractConverter { + @Serial private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java index a8fa02bc0..87da27e2a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/ZoneIdConverter.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.convert.AbstractConverter; import cn.hutool.v7.core.convert.MatcherConverter; import cn.hutool.v7.core.date.ZoneUtil; +import java.io.Serial; import java.lang.reflect.Type; import java.time.ZoneId; import java.util.TimeZone; @@ -30,6 +31,7 @@ import java.util.TimeZone; * @author Looly */ public class ZoneIdConverter extends AbstractConverter implements MatcherConverter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java index c34f61d11..f477f75ad 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/CoordinateUtil.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.data; +import java.io.Serial; import java.io.Serializable; import java.util.Objects; @@ -244,6 +245,7 @@ public class CoordinateUtil { * @author Looly */ public static class Coordinate implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java index 7e1877b09..14cbf5314 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/BetweenFormatter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.date; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.function.Function; @@ -33,6 +34,7 @@ import java.util.function.Function; * @author Looly */ public class BetweenFormatter implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java index a32887d24..967fcf340 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateBetween.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.date; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; import java.util.Calendar; import java.util.Date; @@ -28,6 +29,7 @@ import java.util.Date; * @author Looly */ public class DateBetween implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java index e18b1e420..316e4d41c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateException.java @@ -18,11 +18,14 @@ package cn.hutool.v7.core.date; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 工具类异常 * @author Looly */ public class DateException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java index 8d5810ec7..7546c53d8 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateRange.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.date; import cn.hutool.v7.core.lang.range.Range; +import java.io.Serial; import java.util.Date; /** @@ -27,6 +28,7 @@ import java.util.Date; * @since 4.1.0 */ public class DateRange extends Range { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java index 2e6d2353d..7f22a9701 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/DefaultDateBasic.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.date.format; +import java.io.Serial; import java.io.Serializable; import java.util.Locale; import java.util.TimeZone; @@ -31,6 +32,7 @@ import java.util.TimeZone; * @author Looly */ public class DefaultDateBasic implements DateBasic, Serializable { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java index 25cf897e2..e4b12c75e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/SimpleDateBasic.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.date.format; +import java.io.Serial; import java.io.Serializable; import java.util.Locale; import java.util.TimeZone; @@ -26,6 +27,7 @@ import java.util.TimeZone; * @author Looly */ public class SimpleDateBasic implements DateBasic, Serializable { + @Serial private static final long serialVersionUID = 6333136319870641818L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java index 91851cdb8..cc5805bcb 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/TimeParser.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.regex.PatternPool; import cn.hutool.v7.core.regex.ReUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -36,6 +37,7 @@ import java.io.Serializable; * @since 6.0.0 */ public class TimeParser implements PredicateDateParser, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java index 383ec8e2d..8a4494fc3 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/CloneException.java @@ -16,12 +16,15 @@ package cn.hutool.v7.core.exception; +import java.io.Serial; + /** * 克隆异常 * * @author Looly */ public class CloneException extends HutoolException { + @Serial private static final long serialVersionUID = 6774837422188798989L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java index 30cb904f1..b38ab5cbf 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/DependencyException.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.exception; +import java.io.Serial; + /** * 依赖异常 * @@ -23,6 +25,7 @@ package cn.hutool.v7.core.exception; * @since 4.0.10 */ public class DependencyException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java index b26719bd8..644a52d6b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/HutoolException.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.exception; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * Hutool工具类异常 * @@ -25,6 +27,7 @@ import cn.hutool.v7.core.text.StrUtil; * @since 6.0.0 */ public class HutoolException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java index a4ad20b7b..08a7cd9ef 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/exception/ValidateException.java @@ -16,12 +16,15 @@ package cn.hutool.v7.core.exception; +import java.io.Serial; + /** * 验证异常 * * @author Looly */ public class ValidateException extends StatefulException { + @Serial private static final long serialVersionUID = 6057602589533840889L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java index 4b0ad7cf4..517961817 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/IORuntimeException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.io; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * IO运行时异常，常用于对IOException的包装 * * @author Looly */ public class IORuntimeException extends HutoolException { + @Serial private static final long serialVersionUID = 8247610319171014183L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java index 09733d213..a340a13c0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Ansi.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_ANSI * @@ -23,6 +25,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16Ansi extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xa001; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java index c188ff121..76f564868 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITT.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_CCITT：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在前，高位在后，结果与0x0000异或 * 0x8408是0x1021按位颠倒后的结果。 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16CCITT extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0x8408; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java index ed1e22171..551ee877b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16CCITTFalse.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_CCITT_FALSE：多项式x16+x12+x5+1（0x1021），初始值0xFFFF，低位在后，高位在前，结果与0x0000异或 * @@ -23,6 +25,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16CCITTFalse extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0x1021; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java index c32a7d7ad..a5e6dee2f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Checksum.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.io.checksum.crc16; import cn.hutool.v7.core.codec.binary.HexUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.zip.Checksum; @@ -30,6 +31,7 @@ import java.util.zip.Checksum; * @since 5.3.10 */ public abstract class CRC16Checksum implements Checksum, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java index 66adb7ce5..d329ed672 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16DNP.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_DNP：多项式x16+x13+x12+x11+x10+x8+x6+x5+x2+1（0x3D65），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或 * 0xA6BC是0x3D65按位颠倒后的结果 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16DNP extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xA6BC; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java index a411a25bd..5e1eea21a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16IBM.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_IBM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0x0000异或 * 0xA001是0x8005按位颠倒后的结果 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16IBM extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xa001; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java index 140c58c31..9b650db14 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Maxim.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_MAXIM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或 * 0xA001是0x8005按位颠倒后的结果 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16Maxim extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xa001; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java index 6528364cb..3b2ba5838 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16Modbus.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC-16 (Modbus) * CRC16_MODBUS：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0x0000异或 @@ -25,6 +27,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16Modbus extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xa001; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java index e1f7b5ccd..00b0c0156 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16USB.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_USB：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0xFFFF异或 * 0xA001是0x8005按位颠倒后的结果 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16USB extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0xa001; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java index abbc3c209..cb95d7ca3 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16X25.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC16_X25：多项式x16+x12+x5+1（0x1021），初始值0xffff，低位在前，高位在后，结果与0xFFFF异或 * 0x8408是0x1021按位颠倒后的结果。 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16X25 extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; private static final int WC_POLY = 0x8408; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java index c3dcf6351..e9383a0cc 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/checksum/crc16/CRC16XModem.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.io.checksum.crc16; +import java.io.Serial; + /** * CRC-CCITT (XModem) * CRC16_XMODEM：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在后，高位在前，结果与0x0000异或 @@ -24,6 +26,7 @@ package cn.hutool.v7.core.io.checksum.crc16; * @since 5.3.10 */ public class CRC16XModem extends CRC16Checksum{ + @Serial private static final long serialVersionUID = 1L; // 0001 0000 0010 0001 (0, 5, 12) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java index 4a41c11f3..8787b43e5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/FileWriter.java @@ -34,6 +34,7 @@ import java.util.Map.Entry; * @author Looly */ public class FileWriter extends FileWrapper { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java index 1bc429642..8b5a1e450 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/CharSequenceResource.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.io.resource; import cn.hutool.v7.core.util.ByteUtil; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.nio.charset.Charset; /** @@ -28,6 +29,7 @@ import java.nio.charset.Charset; * @since 5.5.2 */ public class CharSequenceResource extends BytesResource { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java index d5070848f..02366e911 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/JarResource.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.net.url.UrlUtil; import java.io.IOException; +import java.io.Serial; import java.net.JarURLConnection; import java.net.URI; import java.net.URL; @@ -33,6 +34,7 @@ import java.util.jar.JarFile; * @author Looly */ public class JarResource extends UrlResource { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java index e0e1ed8c4..86bf21e70 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiFileResource.java @@ -17,6 +17,7 @@ package cn.hutool.v7.core.io.resource; import java.io.File; +import java.io.Serial; import java.nio.file.Path; import java.util.Collection; @@ -27,6 +28,7 @@ import java.util.Collection; * @author Looly */ public class MultiFileResource extends MultiResource { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java index 19e27f689..aed6be2bb 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/NoResourceException.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.io.resource; import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * 资源文件或资源不存在异常 * @@ -26,6 +28,7 @@ import cn.hutool.v7.core.text.StrUtil; * @since 4.0.2 */ public class NoResourceException extends IORuntimeException { + @Serial private static final long serialVersionUID = -623254467603299129L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java index 6a68292fd..468379d80 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/StringResource.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.io.resource; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.nio.charset.Charset; /** @@ -28,6 +29,7 @@ import java.nio.charset.Charset; * @see CharSequenceResource */ public class StringResource extends CharSequenceResource { + @Serial private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java index 5ed1d0751..c469f8cab 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/WebAppResource.java @@ -17,6 +17,7 @@ package cn.hutool.v7.core.io.resource; import java.io.File; +import java.io.Serial; import cn.hutool.v7.core.io.file.FileUtil; @@ -27,6 +28,7 @@ import cn.hutool.v7.core.io.file.FileUtil; * @since 4.1.11 */ public class WebAppResource extends FileResource { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java index 2c8a0d1d8..570c10219 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.io.watch; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 监听异常 * @author Looly * */ public class WatchException extends HutoolException { + @Serial private static final long serialVersionUID = 8068509879445395353L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java index 39b14ede9..d9d0fe67b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/WatchServiceWrapper.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.io.file.PathUtil; import cn.hutool.v7.core.lang.wrapper.SimpleWrapper; import java.io.IOException; +import java.io.Serial; import java.io.Serializable; import java.nio.file.*; import java.util.concurrent.TimeUnit; @@ -39,6 +40,7 @@ import java.util.function.Predicate; * @since 6.0.0 */ public class WatchServiceWrapper extends SimpleWrapper implements WatchService, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java index 1dce42a53..f6a586c94 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/watch/watchers/SimpleWatcher.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.io.watch.watchers; import cn.hutool.v7.core.io.watch.Watcher; +import java.io.Serial; import java.io.Serializable; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; @@ -29,6 +30,7 @@ import java.nio.file.WatchKey; * @author Looly */ public class SimpleWatcher implements Watcher, Serializable { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java index 5cc4662b6..8409dd727 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/builder/GenericBuilder.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.builder; import cn.hutool.v7.core.func.SerConsumer3; +import java.io.Serial; import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; @@ -74,6 +75,7 @@ import java.util.function.Supplier; * @param 构建对象类型 */ public class GenericBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java index 69aecf007..3d97570ea 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/caller/StackTraceCaller.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.caller; +import java.io.Serial; import java.io.Serializable; import cn.hutool.v7.core.exception.HutoolException; @@ -26,6 +27,7 @@ import cn.hutool.v7.core.exception.HutoolException; * @author Looly */ public class StackTraceCaller implements Caller, Serializable { + @Serial private static final long serialVersionUID = 1L; private static final int OFFSET = 2; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java index 766d536ce..b8f485224 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/copier/SrcToTargetCopier.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.copier; +import java.io.Serial; import java.io.Serializable; import java.util.function.Predicate; @@ -30,6 +31,7 @@ import java.util.function.Predicate; * @since 3.0.9 */ public abstract class SrcToTargetCopier> implements Copier, Serializable{ + @Serial private static final long serialVersionUID = 1L; /** 源 */ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java index a31a8d447..a7c59533a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/event/SourceEvent.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.event; +import java.io.Serial; import java.util.EventObject; /** @@ -25,6 +26,7 @@ import java.util.EventObject; * @since 6.0.0 */ public class SourceEvent extends EventObject implements Event { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java index 2efc2a9c6..e29e18526 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/AtomicLoader.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.loader; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicReference; @@ -34,6 +35,7 @@ import java.util.concurrent.atomic.AtomicReference; * @param 被加载对象类型 */ public abstract class AtomicLoader implements Loader, Serializable { + @Serial private static final long serialVersionUID = 1L; /** 被加载对象的引用 */ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java index 8fc2799a6..ea2a83313 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyFunLoader.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.loader; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.util.function.Supplier; /** @@ -32,6 +33,7 @@ import java.util.function.Supplier; * @since 5.6.1 */ public class LazyFunLoader extends LazyLoader { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java index 7f03ce6a8..d0e87677e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/loader/LazyLoader.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.loader; +import java.io.Serial; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; * @param 被加载对象类型 */ public abstract class LazyLoader implements Loader, Serializable { + @Serial private static final long serialVersionUID = 1L; /** 被加载对象 */ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java index 6bda9a995..7dedc6bed 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableEntry.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.map.AbsEntry; +import java.io.Serial; import java.io.Serializable; import java.util.Map; @@ -29,6 +30,7 @@ import java.util.Map; * @author Looly */ public class MutableEntry extends AbsEntry implements Mutable>, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java index f6f477fe9..f68d851d4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutablePair.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.lang.tuple.Pair; +import java.io.Serial; + /** * 可变二元组对象 * @@ -27,6 +29,7 @@ import cn.hutool.v7.core.lang.tuple.Pair; * @since 6.0.0 */ public class MutablePair extends Pair implements Mutable>{ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java index 2467943c6..0ab1d1619 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/mutable/MutableTriple.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.lang.mutable; import cn.hutool.v7.core.lang.tuple.Triple; +import java.io.Serial; + /** * 可变三元组对象 * @@ -28,6 +30,7 @@ import cn.hutool.v7.core.lang.tuple.Triple; * @since 6.0.0 */ public class MutableTriple extends Triple implements Mutable>{ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java index 5bdbaf22f..1c31842e5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/BoundedRange.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.lang.range; import cn.hutool.v7.core.func.SerPredicate; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.util.Objects; import java.util.function.Predicate; @@ -62,6 +63,7 @@ import java.util.function.Predicate; * @since 6.0.0 */ public class BoundedRange> implements SerPredicate { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java index 8872ff915..69722e36e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/range/Range.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.range; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import java.util.NoSuchElementException; @@ -35,6 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * @author Looly */ public class Range implements Iterable, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java index d5b350deb..a90f7cf94 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/selector/WeightListRandomSelector.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.lang.selector; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; @@ -39,6 +40,7 @@ import java.util.List; * @author 王叶峰 */ public class WeightListRandomSelector implements Selector, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java index 343b97622..dfaf251e5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/tuple/Pair.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.tuple; import cn.hutool.v7.core.exception.CloneException; +import java.io.Serial; import java.io.Serializable; import java.util.Objects; @@ -30,6 +31,7 @@ import java.util.Objects; * @since 6.0.0 */ public class Pair implements Serializable, Cloneable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java index fa7e7071e..f333430b0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseLinkedMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.Map; @@ -30,6 +31,7 @@ import java.util.Map; * @since 4.0.7 */ public class CamelCaseLinkedMap extends CamelCaseMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java index b8b20d7c4..aaaa764b0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CamelCaseMap.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.map; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -33,6 +34,7 @@ import java.util.function.Function; * @since 4.0.7 */ public class CamelCaseMap extends FuncKeyMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java index f2d1af1b1..48962f011 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveLinkedMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.Map; @@ -30,6 +31,7 @@ import java.util.Map; * @since 3.3.1 */ public class CaseInsensitiveLinkedMap extends CaseInsensitiveMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java index 2a18c4cfc..efe861afe 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -32,6 +33,7 @@ import java.util.function.Function; * @since 3.0.2 */ public class CaseInsensitiveMap extends FuncKeyMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; //------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java index cf6cd1876..1296ca78f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CaseInsensitiveTreeMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.Comparator; import java.util.Map; import java.util.TreeMap; @@ -31,6 +32,7 @@ import java.util.TreeMap; * @since 3.3.1 */ public class CaseInsensitiveTreeMap extends CaseInsensitiveMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java index dafec984b..2686c0447 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/CustomKeyMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.Map; /** @@ -27,6 +28,7 @@ import java.util.Map; * @since 4.0.7 */ public abstract class CustomKeyMap extends TransMap { + @Serial private static final long serialVersionUID = 4043263744224569870L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java index f9643d9c0..b32d8552d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/Dict.java @@ -29,6 +29,7 @@ import cn.hutool.v7.core.func.SerSupplier; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.lang.getter.TypeGetter; +import java.io.Serial; import java.lang.reflect.Type; import java.util.*; @@ -39,6 +40,7 @@ import java.util.*; * @author Looly */ public class Dict extends CustomKeyMap implements TypeGetter { + @Serial private static final long serialVersionUID = 6135423866861206530L; static final float DEFAULT_LOAD_FACTOR = 0.75f; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java index 77972d4e4..fb63ecede 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/FixedLinkedHashMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map; +import java.io.Serial; import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Consumer; @@ -29,6 +30,7 @@ import java.util.function.Consumer; * @author Looly */ public class FixedLinkedHashMap extends LinkedHashMap { + @Serial private static final long serialVersionUID = -629171177321416095L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java index c8f88de75..d0997400e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TransMap.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,6 +32,7 @@ import java.util.function.Supplier; * @since 5.8.0 */ public abstract class TransMap extends MapWrapper { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java index ae31c65f7..e86e07026 100755 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/concurrent/Weighers.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.map.concurrent; import cn.hutool.v7.core.collection.iter.IterUtil; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -195,6 +196,7 @@ public final class Weighers { } static final class EntryWeigherView implements EntryWeigher, Serializable { + @Serial private static final long serialVersionUID = 1; final Weigher weigher; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java index 24653ead5..29ba6d658 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsCollValueMap.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.lang.Opt; import cn.hutool.v7.core.map.MapWrapper; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -41,6 +42,7 @@ import java.util.stream.Collectors; * @see ListValueMap */ public abstract class AbsCollValueMap extends MapWrapper> implements MultiValueMap { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java index 626e962fa..fb11fa196 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/AbsTable.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.iter.IterUtil; import cn.hutool.v7.core.collection.iter.TransIter; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.util.AbstractCollection; import java.util.AbstractSet; @@ -198,6 +199,7 @@ public abstract class AbsTable implements Table { * @param 值类型 */ private static class SimpleCell implements Cell, Serializable { + @Serial private static final long serialVersionUID = 1L; private final R rowKey; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java index 71d52ba28..070cabef9 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/ListValueMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map.multi; +import java.io.Serial; import java.util.*; import java.util.function.Supplier; @@ -29,6 +30,7 @@ import java.util.function.Supplier; * @since 4.3.3 */ public class ListValueMap extends AbsCollValueMap { + @Serial private static final long serialVersionUID = 6044017508487827899L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java index 74a3979c6..e28d0089f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/SetValueMap.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.map.multi; +import java.io.Serial; import java.util.*; import java.util.function.Supplier; @@ -29,6 +30,7 @@ import java.util.function.Supplier; * @since 4.3.3 */ public class SetValueMap extends AbsCollValueMap { + @Serial private static final long serialVersionUID = 6044017508487827899L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java index b0edace93..f85c95a7c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Fraction.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.math; +import java.io.Serial; import java.math.BigInteger; import java.util.Objects; @@ -35,6 +36,7 @@ import java.util.Objects; * @since 6.0.0 */ public final class Fraction extends Number implements Comparable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java index 20a57a5b1..86d9b06df 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/LocalPortGenerator.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.net; +import java.io.Serial; import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; @@ -29,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; * */ public class LocalPortGenerator implements Serializable{ + @Serial private static final long serialVersionUID = 1L; /** 备选的本地端口 */ diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java index 4c1d21d56..f23b1d1e1 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlBuilder.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.lang.builder.Builder; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -42,6 +43,7 @@ import java.nio.charset.Charset; * @since 5.3.1 */ public final class UrlBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; private static final String DEFAULT_SCHEME = "http" ; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java index 83aa9b79f..437fb4621 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlDecoder.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.util.CharsetUtil; +import java.io.Serial; import java.io.Serializable; import java.nio.charset.Charset; @@ -36,6 +37,7 @@ import java.nio.charset.Charset; * @author Looly */ public class UrlDecoder implements Serializable { + @Serial private static final long serialVersionUID = 1L; private static final Charset DEFAULT_CHARSET = CharsetUtil.UTF_8; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java index acf9dc42c..abb59a26c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolConfig.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.pool; +import java.io.Serial; import java.io.Serializable; /** @@ -30,6 +31,7 @@ import java.io.Serializable; * @author Daniel, Looly */ public class PoolConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java index d1fd7169b..82e18eac0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/PoolException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.pool; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 对象池异常 * * @author Looly */ public class PoolException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java index b42862a99..d1845bdb5 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionObjectPool.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.thread.ThreadUtil; import java.io.IOException; +import java.io.Serial; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -35,6 +36,7 @@ import java.util.concurrent.BlockingQueue; * @author Daniel, Looly */ public class PartitionObjectPool implements ObjectPool { + @Serial private static final long serialVersionUID = 1L; private final PartitionPoolConfig config; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java index b685e4d6b..5013fbd63 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PartitionPoolConfig.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.pool.partition; import cn.hutool.v7.core.pool.PoolConfig; +import java.io.Serial; + /** * 分局对象池配置 * * @author Looly */ public class PartitionPoolConfig extends PoolConfig { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java index 7a6cf4ee0..874d52571 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/pool/partition/PoolPartition.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.pool.*; import java.io.IOException; +import java.io.Serial; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; @@ -44,6 +45,7 @@ import java.util.concurrent.TimeUnit; * @param 对象类型 */ public class PoolPartition implements ObjectPool { + @Serial private static final long serialVersionUID = 1L; private final PoolConfig config; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java index 9af1d1c7a..92d7fac81 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ClassScanner.java @@ -33,6 +33,7 @@ import cn.hutool.v7.core.util.SystemUtil; import java.io.File; import java.io.IOException; +import java.io.Serial; import java.io.Serializable; import java.lang.annotation.Annotation; import java.net.URL; @@ -51,6 +52,7 @@ import java.util.jar.JarFile; * @since 4.6.9 */ public class ClassScanner implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java index 86c5a9a7f..1549d60fe 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/ParameterizedTypeImpl.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.reflect; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.array.ArrayUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -30,6 +31,7 @@ import java.lang.reflect.Type; * @since 4.5.7 */ public class ParameterizedTypeImpl implements ParameterizedType, Serializable { + @Serial private static final long serialVersionUID = 1L; private final Type[] actualTypeArguments; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java index 27f8238a3..e80c0635a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/SpiException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.spi; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * SPI异常 * * @author Looly */ public class SpiException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java index 52a106e3c..364fe75fb 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrJoiner.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.array.ArrayUtil; import java.io.IOException; +import java.io.Serial; import java.io.Serializable; import java.util.Iterator; import java.util.Map; @@ -42,6 +43,7 @@ import java.util.function.Function; * @since 5.7.2 */ public class StrJoiner implements Appendable, Serializable { + @Serial private static final long serialVersionUID = 1L; private Appendable appendable; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java index 08c7f93d5..3342a2c55 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrRegionMatcher.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text; +import java.io.Serial; import java.io.Serializable; import java.util.function.BiPredicate; @@ -41,6 +42,7 @@ import java.util.function.BiPredicate; * @since 6.0.0 */ public class StrRegionMatcher implements BiPredicate, Serializable { + @Serial private static final long serialVersionUID = 1L; private final boolean ignoreCase; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java index efe3c8f98..2df3a10bd 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrStripper.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text; +import java.io.Serial; import java.io.Serializable; import java.util.function.UnaryOperator; @@ -27,6 +28,7 @@ import java.util.function.UnaryOperator; * @since 5.8.0 */ public class StrStripper implements UnaryOperator, Serializable { + @Serial private static final long serialVersionUID = 1L; private final CharSequence prefix; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java index 3ebe41880..0ab43c9fa 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/StrTrimer.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text; +import java.io.Serial; import java.io.Serializable; import java.util.function.Predicate; import java.util.function.UnaryOperator; @@ -28,6 +29,7 @@ import java.util.function.UnaryOperator; * @since 6.0.0 */ public class StrTrimer implements UnaryOperator, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java index 108a38e58..61dd38808 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/AbstractFilter.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.bloom; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.util.BitSet; /** @@ -26,6 +27,7 @@ import java.util.BitSet; * @author Looly */ public abstract class AbstractFilter implements BloomFilter { + @Serial private static final long serialVersionUID = 1L; private final BitSet bitSet; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java index 4285f454d..b6cd77a4e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/CombinedBloomFilter.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.text.bloom; +import java.io.Serial; + /** * 组合BloomFilter 实现
* 1.构建hash算法
@@ -26,6 +28,7 @@ package cn.hutool.v7.core.text.bloom; * @author Ansj */ public class CombinedBloomFilter implements BloomFilter { + @Serial private static final long serialVersionUID = 1L; private final BloomFilter[] filters; @@ -62,7 +65,7 @@ public class CombinedBloomFilter implements BloomFilter { @Override public boolean contains(final String str) { for (final BloomFilter filter : filters) { - if (filter.contains(str) == false) { + if (!filter.contains(str)) { return false; } } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java index 12e652231..8881d1806 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/bloom/FuncFilter.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text.bloom; +import java.io.Serial; import java.util.function.Function; /** @@ -25,6 +26,7 @@ import java.util.function.Function; * @since 5.8.0 */ public class FuncFilter extends AbstractFilter { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java index 105c0f910..e3fd7d340 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Escape.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.escape; import cn.hutool.v7.core.text.replacer.LookupReplacer; import cn.hutool.v7.core.text.replacer.ReplacerChain; +import java.io.Serial; + /** * HTML4的ESCAPE * 参考：Commons Lang3 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.text.replacer.ReplacerChain; * */ public class Html4Escape extends ReplacerChain { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java index 64dc94810..d6dac81e4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/Html4Unescape.java @@ -18,12 +18,15 @@ package cn.hutool.v7.core.text.escape; import cn.hutool.v7.core.text.replacer.LookupReplacer; +import java.io.Serial; + /** * HTML4的UNESCAPE * * @author Looly */ public class Html4Unescape extends XmlUnescape { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java index d88637d25..8a38f9c39 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/NumericEntityUnescaper.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.escape; import cn.hutool.v7.core.text.replacer.StrReplacer; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; + /** * 形如'的反转义器 * @@ -26,6 +28,7 @@ import cn.hutool.v7.core.text.CharUtil; * */ public class NumericEntityUnescaper extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java index 93114462a..411067843 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlEscape.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.escape; import cn.hutool.v7.core.text.replacer.LookupReplacer; import cn.hutool.v7.core.text.replacer.ReplacerChain; +import java.io.Serial; + /** * XML特殊字符转义
* 见：https://stackoverflow.com/questions/1091945/what-characters-do-i-need-to-escape-in-xml-documents
@@ -34,6 +36,7 @@ import cn.hutool.v7.core.text.replacer.ReplacerChain; * @since 5.7.2 */ public class XmlEscape extends ReplacerChain { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java index 2210dccb0..87f7abf8b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/escape/XmlUnescape.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.escape; import cn.hutool.v7.core.text.replacer.LookupReplacer; import cn.hutool.v7.core.text.replacer.ReplacerChain; +import java.io.Serial; + /** * XML的UNESCAPE * @@ -26,6 +28,7 @@ import cn.hutool.v7.core.text.replacer.ReplacerChain; * @since 5.7.2 */ public class XmlUnescape extends ReplacerChain { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java index 6eb018541..4f538014c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharFinder.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; + /** * 字符查找器
* 查找指定字符在字符串中的位置信息 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.text.CharUtil; * @since 5.7.14 */ public class CharFinder extends TextFinder { + @Serial private static final long serialVersionUID = 1L; private final char c; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java index eb043edae..1330fdb84 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/CharMatcherFinder.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.util.function.Predicate; /** @@ -28,6 +29,7 @@ import java.util.function.Predicate; * @author Looly */ public class CharMatcherFinder extends TextFinder { + @Serial private static final long serialVersionUID = 1L; private final Predicate matcher; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java index 94e4c7be6..e419bd5d4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/LengthFinder.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; + /** * 固定长度查找器
* 给定一个长度，查找的位置为from + length，一般用于分段截取 @@ -26,6 +28,7 @@ import cn.hutool.v7.core.lang.Assert; * @author Looly */ public class LengthFinder extends TextFinder { + @Serial private static final long serialVersionUID = 1L; private final int length; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java index f10ce4482..7ef6232c0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/PatternFinder.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.regex.PatternPool; +import java.io.Serial; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -29,6 +30,7 @@ import java.util.regex.Pattern; * @since 5.7.14 */ public class PatternFinder extends TextFinder { + @Serial private static final long serialVersionUID = 1L; private final Pattern pattern; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java index 2abf12b62..7c89619e3 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/StrFinder.java @@ -19,6 +19,8 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.text.CharSequenceUtil; +import java.io.Serial; + /** * 字符串查找器 * @@ -26,6 +28,7 @@ import cn.hutool.v7.core.text.CharSequenceUtil; * @since 5.7.14 */ public class StrFinder extends TextFinder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java index 112996a68..bf5ece324 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/finder/TextFinder.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.finder; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.io.Serializable; /** @@ -27,6 +28,7 @@ import java.io.Serializable; * @since 5.7.14 */ public abstract class TextFinder implements Finder, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java index 479c47a6d..7ff029d69 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/HighMultiReplacer.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text.replacer; +import java.io.Serial; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; @@ -32,6 +33,7 @@ import java.util.Map; * @author kyao */ public class HighMultiReplacer extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; private final AhoCorasickAutomaton ahoCorasickAutomaton; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java index b21a0fd1b..9b1b6a325 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/LookupReplacer.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.text.replacer; +import java.io.Serial; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -28,6 +29,7 @@ import java.util.Set; * @since 4.1.5 */ public class LookupReplacer extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; private final Map lookupMap; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java index df47e61b7..b74499424 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByChar.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.text.replacer; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符，字符重复次数为区间长度，即替换后字符串长度不变
* 此方法使用{@link String#codePoints()}完成拆分替换 @@ -25,6 +27,7 @@ import cn.hutool.v7.core.text.StrUtil; * @author Looly */ public class RangeReplacerByChar extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; private final int beginInclude; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java index 386a8bd0f..3b38c32c7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/RangeReplacerByStr.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.text.replacer; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * 区间字符串替换，指定区间，将区间中的所有字符去除，替换为指定的字符串，字符串只重复一次
* 此方法使用{@link String#codePoints()}完成拆分替换 @@ -25,6 +27,7 @@ import cn.hutool.v7.core.text.StrUtil; * @author Looly */ public class RangeReplacerByStr extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; private final int beginInclude; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java index dbc890137..a1ba24b57 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/ReplacerChain.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.replacer; import cn.hutool.v7.core.lang.Chain; +import java.io.Serial; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -29,6 +30,7 @@ import java.util.List; * @since 4.1.5 */ public class ReplacerChain extends StrReplacer implements Chain { + @Serial private static final long serialVersionUID = 1L; private final List replacers = new LinkedList<>(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java index cb1750092..9bd75994f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/SearchReplacer.java @@ -20,6 +20,8 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.finder.Finder; +import java.io.Serial; + /** * 查找替换器
* 查找给定的字符串，并全部替换为新的字符串，其它字符不变 @@ -28,6 +30,7 @@ import cn.hutool.v7.core.text.finder.Finder; * @since 6.0.0 */ public class SearchReplacer extends StrReplacer { + @Serial private static final long serialVersionUID = 1L; private static final int INDEX_NOT_FOUND = Finder.INDEX_NOT_FOUND; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java index e8883f71b..67115e236 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/replacer/StrReplacer.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.text.replacer; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.function.UnaryOperator; @@ -29,6 +30,7 @@ import java.util.function.UnaryOperator; * @since 4.1.5 */ public abstract class StrReplacer implements UnaryOperator, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java index 326e1a7f2..869dbabdc 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/split/SplitIter.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.text.finder.TextFinder; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -35,6 +36,7 @@ import java.util.function.Function; * @since 5.7.14 */ public class SplitIter extends ComputeIter implements Serializable { + @Serial private static final long serialVersionUID = 1L; private final String text; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java index a9009d2fb..b71e8f928 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadException.java @@ -18,6 +18,8 @@ package cn.hutool.v7.core.thread; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 线程异常 * @@ -25,6 +27,7 @@ import cn.hutool.v7.core.exception.HutoolException; * @since 5.7.17 */ public class ThreadException extends HutoolException { + @Serial private static final long serialVersionUID = 5253124428623713216L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java index 97f65a236..b7f2a0fe4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/ThreadFactoryBuilder.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.thread; import cn.hutool.v7.core.lang.builder.Builder; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -32,6 +33,7 @@ import java.util.concurrent.atomic.AtomicLong; * @since 4.1.9 */ public class ThreadFactoryBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java index 70b9358bd..d1072a8e1 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/LambdaTreeNodeConfig.java @@ -19,6 +19,7 @@ package cn.hutool.v7.core.tree; import cn.hutool.v7.core.func.LambdaUtil; import cn.hutool.v7.core.func.SerFunction; +import java.io.Serial; import java.util.List; import java.util.Objects; @@ -31,6 +32,7 @@ import java.util.Objects; * @param 返回值类型 */ public class LambdaTreeNodeConfig extends TreeNodeConfig { + @Serial private static final long serialVersionUID = 1L; private SerFunction idKeyFun; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java index bfa113e57..cb907642c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/MapTree.java @@ -24,6 +24,7 @@ import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.util.ObjUtil; import java.io.PrintWriter; +import java.io.Serial; import java.io.StringWriter; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -42,6 +43,7 @@ import java.util.function.Predicate; * @since 5.2.1 */ public class MapTree extends LinkedHashMap implements Node { + @Serial private static final long serialVersionUID = 1L; private final TreeNodeConfig treeNodeConfig; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java index d45d9bc85..c406df36f 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNode.java @@ -17,6 +17,7 @@ package cn.hutool.v7.core.tree; +import java.io.Serial; import java.util.Map; import java.util.Objects; @@ -29,6 +30,7 @@ import java.util.Objects; * @author liangbaikai */ public class TreeNode implements Node { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java index 4316ac0bf..4e10d6d8c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/tree/TreeNodeConfig.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.tree; +import java.io.Serial; import java.io.Serializable; /** @@ -24,6 +25,7 @@ import java.io.Serializable; * @author liangbaikai */ public class TreeNodeConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java index ccc07a73e..0c8f58408 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue1687Test.java @@ -23,6 +23,7 @@ import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.io.Serializable; /** @@ -61,6 +62,7 @@ public class Issue1687Test { @Data static class SysUserFb implements Serializable { + @Serial private static final long serialVersionUID = 1L; @Alias("depart") @@ -73,6 +75,7 @@ public class Issue1687Test { @Data static class SysUser implements Serializable { + @Serial private static final long serialVersionUID = 1L; @Alias("depId") diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java index c9a64104e..e58b77f50 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertTest.java @@ -29,6 +29,7 @@ import lombok.Getter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; @@ -111,19 +112,19 @@ public class ConvertTest { final String a = "aaaa"; final String aDefaultValue = "aDefault"; final String aResult = ConvertUtil.toStr(a, aDefaultValue); - assertEquals(aResult, a); + assertEquals(a, aResult); // 被转化的对象为null，返回默认值 final String b = null; final String bDefaultValue = "bDefault"; final String bResult = ConvertUtil.toStr(b, bDefaultValue); - assertEquals(bResult, bDefaultValue); + assertEquals(bDefaultValue, bResult); // 转换失败，返回默认值 final TestExceptionClass c = new TestExceptionClass(); final String cDefaultValue = "cDefault"; final String cResult = ConvertUtil.toStr(c, cDefaultValue); - assertEquals(cResult, cDefaultValue); + assertEquals(cDefaultValue, cResult); } @Test @@ -266,7 +267,7 @@ public class ConvertTest { final byte[] bytes = ConvertUtil.shortToBytes(short1); final short short2 = ConvertUtil.bytesToShort(bytes); - assertEquals(short2, short1); + assertEquals(short1, short2); } @Test @@ -336,6 +337,7 @@ public class ConvertTest { @Data @AllArgsConstructor public static class Product implements Serializable { + @Serial private static final long serialVersionUID = 1L; private String name; diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java index 298b46fcf..aaf96f72b 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/watch/TestConsoleWatcher.java @@ -19,10 +19,12 @@ package cn.hutool.v7.core.io.watch; import cn.hutool.v7.core.io.watch.watchers.SimpleWatcher; import cn.hutool.v7.core.lang.Console; +import java.io.Serial; import java.nio.file.WatchEvent; import java.nio.file.WatchKey; public class TestConsoleWatcher extends SimpleWatcher { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java index 017a3fc92..a1af3b820 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/ExamInfoDict.java @@ -18,6 +18,7 @@ package cn.hutool.v7.core.lang.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; /** @@ -27,6 +28,7 @@ import java.io.Serializable; */ @Data public class ExamInfoDict implements Serializable { + @Serial private static final long serialVersionUID = 3640936499125004525L; // 主键 diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java index 3b7269f3c..f009a91ed 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoDict.java @@ -16,6 +16,7 @@ package cn.hutool.v7.core.lang.test.bean; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Objects; @@ -26,6 +27,7 @@ import java.util.Objects; * */ public class UserInfoDict implements Serializable { + @Serial private static final long serialVersionUID = -936213991463284306L; // 用户Id private Integer id; diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java index 7673c1a8d..85b8ea4fb 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/test/bean/UserInfoRedundCount.java @@ -16,10 +16,12 @@ package cn.hutool.v7.core.lang.test.bean; +import java.io.Serial; import java.io.Serializable; public class UserInfoRedundCount implements Serializable { + @Serial private static final long serialVersionUID = -8397291070139255181L; private String finishedRatio; // 完成率 diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java index 515dfc58e..082cc4251 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EasyStreamTest.java @@ -26,6 +26,7 @@ import cn.hutool.v7.core.math.NumberUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; @@ -156,6 +157,7 @@ public class EasyStreamTest { final List list = Arrays.asList(1, 2, 3); final Map identityMap = EasyStream.of(list).toMap(String::valueOf); Assertions.assertEquals(new HashMap() { + @Serial private static final long serialVersionUID = 1L; { @@ -172,6 +174,7 @@ public class EasyStreamTest { final Map> group = EasyStream.of(list).group(String::valueOf); Assertions.assertEquals( new HashMap>() { + @Serial private static final long serialVersionUID = 1L; { diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java index 923cedae1..a9f33cf67 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/EntryStreamTest.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.map.multi.Table; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -179,6 +180,7 @@ public class EntryStreamTest { @Test public void testAppend() { final Map map1 = new HashMap(){ + @Serial private static final long serialVersionUID = 2091911960221937275L; { @@ -186,6 +188,7 @@ public class EntryStreamTest { put(2, 2); }}; final Map map2 = new HashMap(){ + @Serial private static final long serialVersionUID = 4802315578432177802L; { @@ -194,6 +197,7 @@ public class EntryStreamTest { }}; Assertions.assertEquals( new ArrayList>(){ + @Serial private static final long serialVersionUID = -4045530648496761947L; { @@ -210,6 +214,7 @@ public class EntryStreamTest { @Test public void testPrepend() { final Map map1 = new HashMap(){ + @Serial private static final long serialVersionUID = -8772310525807986780L; { @@ -217,6 +222,7 @@ public class EntryStreamTest { put(2, 2); }}; final Map map2 = new HashMap(){ + @Serial private static final long serialVersionUID = -8453400649627773936L; { @@ -225,6 +231,7 @@ public class EntryStreamTest { }}; Assertions.assertEquals( new ArrayList>(){ + @Serial private static final long serialVersionUID = 7564826138581563332L; { diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java index 107ad072b..9ca6262c6 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ObjUtilTest.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.convert.ConvertUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -255,6 +256,7 @@ public class ObjUtilTest { @RequiredArgsConstructor @EqualsAndHashCode private static class SerializableBean implements Serializable { + @Serial private static final long serialVersionUID = -7759522980793544334L; private final Integer id; } diff --git a/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java index 0568148e2..5b0c2e52d 100644 --- a/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PartBuilder.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.CollUtil; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.lang.builder.Builder; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -44,6 +45,7 @@ public interface PartBuilder extends Builder { * 始终匹配 */ class Always implements PartBuilder { + @Serial private static final long serialVersionUID = 1L; /** @@ -61,6 +63,7 @@ public interface PartBuilder extends Builder { * 固定值 */ class On implements PartBuilder { + @Serial private static final long serialVersionUID = 1L; private final String value; @@ -93,6 +96,7 @@ public interface PartBuilder extends Builder { * 区间表达式 */ class Range implements PartBuilder { + @Serial private static final long serialVersionUID = 1L; private final String start; @@ -129,6 +133,7 @@ public interface PartBuilder extends Builder { * 逻辑与表达式 */ class And implements PartBuilder { + @Serial private static final long serialVersionUID = 1L; private final List builders; @@ -176,6 +181,7 @@ public interface PartBuilder extends Builder { * 如 5/3，表示每3步取一次，即5,8,11,14,17... */ class Every implements PartBuilder { + @Serial private static final long serialVersionUID = 1L; private final PartBuilder partBuilder; diff --git a/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java index 7f1f278d9..62d84fc4a 100644 --- a/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java +++ b/hutool-cron/src/main/java/cn/hutool/v7/cron/pattern/builder/PatternBuilder.java @@ -23,6 +23,8 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.util.ObjUtil; import cn.hutool.v7.cron.pattern.Part; +import java.io.Serial; + /** * 定时任务表达式构建器 * @@ -30,6 +32,7 @@ import cn.hutool.v7.cron.pattern.Part; * @since 5.8.0 */ public class PatternBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; final String[] parts = new String[7]; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java index 776cf8e14..32427104f 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/CryptoException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.crypto; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 加密异常 * * @author Looly */ public class CryptoException extends HutoolException { + @Serial private static final long serialVersionUID = 8068509879445395353L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java index 18cd5425b..ed02e1238 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AbstractAsymmetricCrypto.java @@ -16,6 +16,7 @@ package cn.hutool.v7.crypto.asymmetric; +import java.io.Serial; import java.security.KeyPair; /** @@ -27,6 +28,7 @@ import java.security.KeyPair; public abstract class AbstractAsymmetricCrypto> extends BaseAsymmetric implements AsymmetricEncryptor, AsymmetricDecryptor{ + @Serial private static final long serialVersionUID = 1L; // ------------------------------------------------------------------ Constructor start diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java index acf3f87f9..47c185108 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/AsymmetricCrypto.java @@ -22,6 +22,7 @@ import cn.hutool.v7.crypto.*; import cn.hutool.v7.crypto.symmetric.SymmetricAlgorithm; import java.io.IOException; +import java.io.Serial; import java.security.*; import java.security.spec.AlgorithmParameterSpec; @@ -39,6 +40,7 @@ import java.security.spec.AlgorithmParameterSpec; * @author Looly */ public class AsymmetricCrypto extends AbstractAsymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java index 75a8c82a6..0944464c6 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/BaseAsymmetric.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.util.ObjUtil; import cn.hutool.v7.crypto.CryptoException; import cn.hutool.v7.crypto.KeyUtil; +import java.io.Serial; import java.io.Serializable; import java.security.Key; import java.security.KeyPair; @@ -39,6 +40,7 @@ import java.util.concurrent.locks.ReentrantLock; * @since 3.3.0 */ public class BaseAsymmetric> implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -217,19 +219,21 @@ public class BaseAsymmetric> implements Serializable * @return {@link Key} */ protected Key getKeyByType(final KeyType type) { - switch (type) { - case PrivateKey: + return switch (type) { + case PrivateKey -> { if (null == this.privateKey) { throw new NullPointerException("Private key must not null when use it !"); } - return this.privateKey; - case PublicKey: + yield this.privateKey; + } + case PublicKey -> { if (null == this.publicKey) { throw new NullPointerException("Public key must not null when use it !"); } - return this.publicKey; - } - throw new CryptoException("Unsupported key type: " + type); + yield this.publicKey; + } + default -> throw new CryptoException("Unsupported key type: " + type); + }; } // endregion } diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java index 6238977a5..4a59d9263 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/ECIES.java @@ -16,6 +16,7 @@ package cn.hutool.v7.crypto.asymmetric; +import java.io.Serial; import java.security.KeyPair; /** @@ -29,6 +30,7 @@ import java.security.KeyPair; * @since 5.3.10 */ public class ECIES extends AsymmetricCrypto{ + @Serial private static final long serialVersionUID = 1L; /** 默认的ECIES算法 */ diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java index 9889b6c7e..a96d6e188 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/RSA.java @@ -20,6 +20,7 @@ import cn.hutool.v7.crypto.CryptoException; import cn.hutool.v7.crypto.provider.GlobalProviderFactory; import cn.hutool.v7.crypto.KeyUtil; +import java.io.Serial; import java.math.BigInteger; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -45,6 +46,7 @@ import java.security.spec.RSAPublicKeySpec; * */ public class RSA extends AsymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** 默认的RSA算法 */ diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java index b70192bbf..a516a02a4 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SM2.java @@ -41,6 +41,7 @@ import cn.hutool.v7.crypto.bc.ECKeyUtil; import cn.hutool.v7.crypto.bc.SmUtil; import java.io.InputStream; +import java.io.Serial; import java.math.BigInteger; import java.nio.charset.Charset; import java.security.KeyPair; @@ -65,6 +66,7 @@ import java.security.SecureRandom; * @since 4.3.2 */ public class SM2 extends AbstractAsymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java index dbaaea97e..64445ee2e 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/Sign.java @@ -27,6 +27,7 @@ import cn.hutool.v7.crypto.SignUtil; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.io.Serial; import java.security.InvalidAlgorithmParameterException; import java.security.KeyPair; import java.security.Signature; @@ -42,6 +43,7 @@ import java.util.Set; * @since 3.3.0 */ public class Sign extends BaseAsymmetric { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java index ebe508155..53c75b71a 100755 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierCrypto.java @@ -22,6 +22,7 @@ import cn.hutool.v7.crypto.asymmetric.AbstractAsymmetricCrypto; import cn.hutool.v7.crypto.asymmetric.KeyType; import javax.crypto.Cipher; +import java.io.Serial; import java.security.Key; import java.security.KeyPair; import java.security.SecureRandom; @@ -46,6 +47,7 @@ import java.security.SecureRandom; * @author Revers, peterstefanov **/ public class PaillierCrypto extends AbstractAsymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; private final PaillierCipher cipher; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java index 7e946b0de..36d0ad374 100755 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierKey.java @@ -16,6 +16,7 @@ package cn.hutool.v7.crypto.asymmetric.paillier; +import java.io.Serial; import java.math.BigInteger; import java.security.Key; import java.security.SecureRandom; @@ -27,6 +28,7 @@ import java.security.SecureRandom; * @author Looly */ public class PaillierKey implements Key { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java index bdf0e4357..ea5b7f651 100755 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPrivateKey.java @@ -18,6 +18,7 @@ package cn.hutool.v7.crypto.asymmetric.paillier; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.math.BigInteger; import java.security.PrivateKey; @@ -27,6 +28,7 @@ import java.security.PrivateKey; * @author peterstefanov, Revers, Looly */ public class PaillierPrivateKey extends PaillierKey implements PrivateKey { + @Serial private static final long serialVersionUID = 1L; private final BigInteger u; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java index 72f63b5da..dcc2f183a 100755 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/paillier/PaillierPublicKey.java @@ -18,6 +18,7 @@ package cn.hutool.v7.crypto.asymmetric.paillier; import cn.hutool.v7.core.lang.Assert; +import java.io.Serial; import java.math.BigInteger; import java.security.PublicKey; @@ -27,6 +28,7 @@ import java.security.PublicKey; * @author peterstefanov, Revers, Looly */ public class PaillierPublicKey extends PaillierKey implements PublicKey { + @Serial private static final long serialVersionUID = 1L; private final BigInteger g; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java index c98dee1a0..e97bc9878 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/Digester.java @@ -28,10 +28,7 @@ import cn.hutool.v7.crypto.CryptoException; import cn.hutool.v7.crypto.SecureUtil; import cn.hutool.v7.crypto.provider.GlobalProviderFactory; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; +import java.io.*; import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.Provider; @@ -43,6 +40,7 @@ import java.security.Provider; * @author Looly */ public class Digester extends SimpleWrapper implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java index 93fb1c13b..e94ecaf53 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/MD5.java @@ -18,6 +18,7 @@ package cn.hutool.v7.crypto.digest; import java.io.File; import java.io.InputStream; +import java.io.Serial; import java.nio.charset.Charset; /** @@ -27,6 +28,7 @@ import java.nio.charset.Charset; * @since 4.4.3 */ public class MD5 extends Digester { + @Serial private static final long serialVersionUID = 1L; // issue#I6ZIQH diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java index 7d9806510..bb63788bb 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/SM3.java @@ -16,6 +16,8 @@ package cn.hutool.v7.crypto.digest; +import java.io.Serial; + /** * 国密SM3杂凑（摘要）算法 * @@ -31,6 +33,7 @@ package cn.hutool.v7.crypto.digest; * @since 4.6.8 */ public class SM3 extends Digester { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java index 975ca163f..54b868cbe 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/HMac.java @@ -17,6 +17,7 @@ package cn.hutool.v7.crypto.digest.mac; import javax.crypto.spec.SecretKeySpec; +import java.io.Serial; import java.security.Key; import java.security.spec.AlgorithmParameterSpec; @@ -31,6 +32,7 @@ import java.security.spec.AlgorithmParameterSpec; * @author Looly */ public class HMac extends Mac { + @Serial private static final long serialVersionUID = 1L; // ------------------------------------------------------------------------------------------- Constructor start diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java index c617bd347..b6ce9924b 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/mac/Mac.java @@ -24,10 +24,7 @@ import cn.hutool.v7.core.util.ByteUtil; import cn.hutool.v7.core.util.CharsetUtil; import cn.hutool.v7.crypto.CryptoException; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.InputStream; -import java.io.Serializable; +import java.io.*; import java.nio.charset.Charset; import java.security.MessageDigest; @@ -42,6 +39,7 @@ import java.security.MessageDigest; * @since 5.8.0 */ public class Mac implements Serializable { + @Serial private static final long serialVersionUID = 1L; private final MacEngine engine; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java index 48c12bd99..1cc95ba5b 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/AES.java @@ -24,6 +24,7 @@ import cn.hutool.v7.crypto.Padding; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; import java.security.spec.AlgorithmParameterSpec; /** @@ -46,6 +47,7 @@ import java.security.spec.AlgorithmParameterSpec; * @since 3.0.8 */ public class AES extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; //------------------------------------------------------------------------- Constrctor start diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java index fa1f388e1..2ddc2b69b 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ChaCha20.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.util.RandomUtil; import cn.hutool.v7.crypto.KeyUtil; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; /** * ChaCha20算法实现
@@ -29,6 +30,7 @@ import javax.crypto.spec.IvParameterSpec; * @since 5.7.12 */ public class ChaCha20 extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java index 4c8d137af..dde1bda0f 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DES.java @@ -23,6 +23,7 @@ import cn.hutool.v7.crypto.Padding; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; /** * DES加密算法实现
@@ -33,6 +34,7 @@ import javax.crypto.spec.IvParameterSpec; * @since 3.0.8 */ public class DES extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; // region ----- Constructor diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java index 0a16d52a2..165f56f90 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/DESede.java @@ -23,6 +23,7 @@ import cn.hutool.v7.crypto.Padding; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; /** * DESede是由DES对称加密算法改进后的一种对称加密算法，又名3DES、TripleDES。
@@ -34,6 +35,7 @@ import javax.crypto.spec.IvParameterSpec; * @since 3.3.0 */ public class DESede extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; // ------------------------------------------------------------------------- Constructor start diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java index c1f5e1fd7..5fb9f8e95 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/FPE.java @@ -21,6 +21,7 @@ import cn.hutool.v7.crypto.Padding; import org.bouncycastle.crypto.AlphabetMapper; import org.bouncycastle.jcajce.spec.FPEParameterSpec; +import java.io.Serial; import java.io.Serializable; /** @@ -46,6 +47,7 @@ import java.io.Serializable; * @since 5.7.12 */ public class FPE implements Serializable { + @Serial private static final long serialVersionUID = 1L; // 映射字符表，规定了明文和密文的字符范围 diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java index 191c4e4bd..8f6d652b6 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SM4.java @@ -24,6 +24,7 @@ import cn.hutool.v7.crypto.Padding; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; /** * 国密对称堆成加密算法SM4实现 @@ -40,6 +41,7 @@ import javax.crypto.spec.IvParameterSpec; * @since 4.6.8 */ public class SM4 extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java index af76efe00..02aadc9ff 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/SymmetricCrypto.java @@ -34,10 +34,7 @@ import javax.crypto.CipherOutputStream; import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEParameterSpec; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Serializable; +import java.io.*; import java.security.SecureRandom; import java.security.spec.AlgorithmParameterSpec; import java.util.concurrent.locks.Lock; @@ -52,6 +49,7 @@ import java.util.concurrent.locks.ReentrantLock; * @author Looly */ public class SymmetricCrypto implements SymmetricEncryptor, SymmetricDecryptor, Serializable { + @Serial private static final long serialVersionUID = 1L; private JceCipher cipher; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java index 2d1853067..6b01fc3a8 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/XXTEA.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.io.IoUtil; import java.io.InputStream; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; * @author Ma Bingyao */ public class XXTEA implements SymmetricEncryptor, SymmetricDecryptor, Serializable { + @Serial private static final long serialVersionUID = 1L; private static final int DELTA = 0x9E3779B9; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java index 6ff01b727..8f9a4d3a5 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/symmetric/ZUC.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.util.RandomUtil; import cn.hutool.v7.crypto.KeyUtil; import javax.crypto.spec.IvParameterSpec; +import java.io.Serial; /** * 祖冲之算法集（ZUC算法）实现，基于BouncyCastle实现。 @@ -28,6 +29,7 @@ import javax.crypto.spec.IvParameterSpec; * @since 5.7.12 */ public class ZUC extends SymmetricCrypto { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java b/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java index 3a6219f10..593945418 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ActiveEntity.java @@ -19,6 +19,8 @@ package cn.hutool.v7.db; import cn.hutool.v7.core.func.SerSupplier; import cn.hutool.v7.core.map.MapUtil; +import java.io.Serial; + /** * 动态实体类
* 提供了针对自身实体的增删改方法 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.map.MapUtil; * */ public class ActiveEntity extends Entity { + @Serial private static final long serialVersionUID = 6112321379601134750L; private final Db db; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java b/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java index dfd5fd622..a276b691b 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/DbException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.db; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 数据库异常 * * @author Looly */ public class DbException extends HutoolException { + @Serial private static final long serialVersionUID = 3624487785708765623L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java b/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java index d8bf8398f..3f3cc2fe8 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/Entity.java @@ -29,6 +29,7 @@ import cn.hutool.v7.core.util.ObjUtil; import cn.hutool.v7.db.sql.Condition; import cn.hutool.v7.db.sql.SqlUtil; +import java.io.Serial; import java.nio.charset.Charset; import java.sql.Blob; import java.sql.Clob; @@ -46,6 +47,7 @@ import java.util.*; * @author loolly */ public class Entity extends Dict { + @Serial private static final long serialVersionUID = -1951012511464327448L; // region ----- of diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/Page.java b/hutool-db/src/main/java/cn/hutool/v7/db/Page.java index 234c66a39..cd4c15059 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/Page.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/Page.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.lang.page.PageInfo; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.db.sql.Order; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; @@ -30,6 +31,7 @@ import java.util.Arrays; * @author Looly */ public class Page implements Segment, Serializable { + @Serial private static final long serialVersionUID = 97792549823353462L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java b/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java index f669a46a2..4b0ab4966 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/PageResult.java @@ -18,6 +18,7 @@ package cn.hutool.v7.db; import cn.hutool.v7.core.lang.page.PageInfo; +import java.io.Serial; import java.util.ArrayList; /** @@ -27,6 +28,7 @@ import java.util.ArrayList; * @author Looly */ public class PageResult extends ArrayList { + @Serial private static final long serialVersionUID = 9056411043515781783L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/Session.java b/hutool-db/src/main/java/cn/hutool/v7/db/Session.java index 57c149487..ec4632f7f 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/Session.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/Session.java @@ -25,6 +25,7 @@ import cn.hutool.v7.log.Log; import javax.sql.DataSource; import java.io.Closeable; +import java.io.Serial; import java.sql.Connection; import java.sql.SQLException; import java.sql.Savepoint; @@ -39,6 +40,7 @@ import java.sql.Savepoint; * */ public class Session extends AbstractDb implements Closeable { + @Serial private static final long serialVersionUID = 3421251905539056945L; private final static Log log = Log.get(); diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java index 1d3452dae..b13e397f8 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/AbstractDSFactory.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.ds; import cn.hutool.v7.core.lang.Assert; import javax.sql.DataSource; +import java.io.Serial; /** * 抽象数据源工厂 @@ -26,6 +27,7 @@ import javax.sql.DataSource; * @author Looly */ public abstract class AbstractDSFactory implements DSFactory { + @Serial private static final long serialVersionUID = 1L; private final String dataSourceName; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java index 2407e5921..06f934732 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/c3p0/C3p0DSFactory.java @@ -25,6 +25,7 @@ import cn.hutool.v7.setting.props.Props; import javax.sql.DataSource; import java.beans.PropertyVetoException; +import java.io.Serial; import java.util.Properties; /** @@ -34,6 +35,7 @@ import java.util.Properties; * */ public class C3p0DSFactory extends AbstractDSFactory { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java index c30b6476d..1f4c1e3f0 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/dbcp/DbcpDSFactory.java @@ -23,6 +23,7 @@ import cn.hutool.v7.db.ds.AbstractDSFactory; import cn.hutool.v7.setting.props.Props; import javax.sql.DataSource; +import java.io.Serial; import java.util.Properties; /** @@ -32,6 +33,7 @@ import java.util.Properties; * */ public class DbcpDSFactory extends AbstractDSFactory { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java index b021561b1..793278a20 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/druid/DruidDSFactory.java @@ -24,6 +24,7 @@ import cn.hutool.v7.db.ds.AbstractDSFactory; import cn.hutool.v7.setting.props.Props; import javax.sql.DataSource; +import java.io.Serial; import java.util.Properties; /** @@ -33,6 +34,7 @@ import java.util.Properties; * */ public class DruidDSFactory extends AbstractDSFactory { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java index 46f52b692..afa313d42 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/hikari/HikariDSFactory.java @@ -24,6 +24,7 @@ import cn.hutool.v7.db.ds.AbstractDSFactory; import cn.hutool.v7.setting.props.Props; import javax.sql.DataSource; +import java.io.Serial; import java.util.Properties; /** @@ -33,6 +34,7 @@ import java.util.Properties; * */ public class HikariDSFactory extends AbstractDSFactory { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java index 12c0d0436..5b925a438 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/jndi/JndiDSFactory.java @@ -23,6 +23,7 @@ import cn.hutool.v7.db.ds.DSFactory; import cn.hutool.v7.db.ds.DSUtil; import javax.sql.DataSource; +import java.io.Serial; /** * JNDI数据源工厂类
@@ -36,6 +37,7 @@ import javax.sql.DataSource; * */ public class JndiDSFactory implements DSFactory { + @Serial private static final long serialVersionUID = 1573625812927370432L; @Override diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java index d82b3b919..439a32e1a 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDSFactory.java @@ -20,6 +20,7 @@ import cn.hutool.v7.db.config.ConnectionConfig; import cn.hutool.v7.db.ds.DSFactory; import javax.sql.DataSource; +import java.io.Serial; /** * Hutool自身实现的池化数据源工厂类 @@ -28,6 +29,7 @@ import javax.sql.DataSource; * */ public class PooledDSFactory implements DSFactory { + @Serial private static final long serialVersionUID = 8093886210895248277L; @Override diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java index 607c96c15..a9bb7d62a 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/simple/SimpleDSFactory.java @@ -20,6 +20,7 @@ import cn.hutool.v7.db.config.ConnectionConfig; import cn.hutool.v7.db.ds.DSFactory; import javax.sql.DataSource; +import java.io.Serial; /** * 简单数据源工厂类 @@ -28,6 +29,7 @@ import javax.sql.DataSource; * */ public class SimpleDSFactory implements DSFactory { + @Serial private static final long serialVersionUID = 4738029988261034743L; @Override diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java index 396d1cfe4..29ee5ce46 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/tomcat/TomcatDSFactory.java @@ -23,6 +23,7 @@ import cn.hutool.v7.db.config.ConnectionConfig; import cn.hutool.v7.db.ds.AbstractDSFactory; import cn.hutool.v7.setting.props.Props; +import java.io.Serial; import java.util.Properties; /** @@ -31,6 +32,7 @@ import java.util.Properties; * @author Looly */ public class TomcatDSFactory extends AbstractDSFactory { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java index 7ccd3490f..d2f225230 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanHandler.java @@ -18,6 +18,7 @@ package cn.hutool.v7.db.handler; import cn.hutool.v7.db.handler.row.BeanRowHandler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; @@ -29,6 +30,7 @@ import java.sql.SQLException; *@since 3.1.0 */ public class BeanHandler implements RsHandler{ + @Serial private static final long serialVersionUID = -5491214744966544475L; private final Class elementBeanType; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java index b907084c1..d74bc2696 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/BeanListHandler.java @@ -16,6 +16,7 @@ package cn.hutool.v7.db.handler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -29,6 +30,7 @@ import java.util.List; * @since 3.1.0 */ public class BeanListHandler implements RsHandler> { + @Serial private static final long serialVersionUID = 4510569754766197707L; private final Class elementBeanType; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java index aeb4cfd1c..22cd91f34 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityHandler.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.handler; import cn.hutool.v7.db.Entity; import cn.hutool.v7.db.handler.row.EntityRowHandler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; @@ -29,6 +30,7 @@ import java.sql.SQLException; * */ public class EntityHandler implements RsHandler{ + @Serial private static final long serialVersionUID = -8742432871908355992L; /** 是否大小写不敏感 */ diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java index b19331ddb..18008472f 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntityListHandler.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.db.Entity; import cn.hutool.v7.db.handler.row.EntityRowHandler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -31,6 +32,7 @@ import java.util.List; * @author loolly */ public class EntityListHandler implements RsHandler> { + @Serial private static final long serialVersionUID = -2846240126316979895L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java index da8b9e012..6239fc1b2 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/EntitySetHandler.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.handler; import cn.hutool.v7.db.Entity; import cn.hutool.v7.db.handler.row.EntityRowHandler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; import java.util.LinkedHashSet; @@ -29,6 +30,7 @@ import java.util.LinkedHashSet; * */ public class EntitySetHandler implements RsHandler>{ + @Serial private static final long serialVersionUID = 8191723216703506736L; /** 是否大小写不敏感 */ diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java index 89f029606..ab5a80f36 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/NumberHandler.java @@ -16,6 +16,7 @@ package cn.hutool.v7.db.handler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; @@ -25,6 +26,7 @@ import java.sql.SQLException; * */ public class NumberHandler implements RsHandler{ + @Serial private static final long serialVersionUID = 4081498054379705596L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java index bdc07bf94..b9e2317f8 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/PageResultHandler.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.handler; import cn.hutool.v7.db.Entity; import cn.hutool.v7.db.PageResult; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; @@ -29,6 +30,7 @@ import java.sql.SQLException; * @author loolly */ public class PageResultHandler implements RsHandler> { + @Serial private static final long serialVersionUID = 1L; private final Class beanClass; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java index 86fe4930b..6e28392e7 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/StringHandler.java @@ -16,6 +16,7 @@ package cn.hutool.v7.db.handler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; @@ -25,6 +26,7 @@ import java.sql.SQLException; * @author weibaohui */ public class StringHandler implements RsHandler{ + @Serial private static final long serialVersionUID = -5296733366845720383L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java index 6d993cf7e..e3a2a37bc 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/handler/ValueListHandler.java @@ -18,6 +18,7 @@ package cn.hutool.v7.db.handler; import cn.hutool.v7.db.handler.row.ListRowHandler; +import java.io.Serial; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -29,6 +30,7 @@ import java.util.List; * */ public class ValueListHandler implements RsHandler>>{ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java index 874e14bfd..f7e317b12 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Column.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.util.BooleanUtil; import cn.hutool.v7.core.regex.ReUtil; import cn.hutool.v7.db.DbException; +import java.io.Serial; import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -30,6 +31,7 @@ import java.sql.SQLException; * @author loolly */ public class Column implements Serializable, Cloneable { + @Serial private static final long serialVersionUID = 577527740359719367L; // ----------------------------------------------------- Fields start diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java index 9b3fcbd66..4752727a8 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/IndexInfo.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.meta; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -31,6 +32,7 @@ import java.util.Objects; * @author huzhongying */ public class IndexInfo implements Serializable, Cloneable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java index 501f2ab16..0902cf194 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/meta/Table.java @@ -16,6 +16,7 @@ package cn.hutool.v7.db.meta; +import java.io.Serial; import java.io.Serializable; import java.util.Collection; import java.util.LinkedHashMap; @@ -30,6 +31,7 @@ import java.util.Set; * @author loolly */ public class Table implements Serializable, Cloneable { + @Serial private static final long serialVersionUID = -810699625961392983L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java index 63e82cb5c..793eec189 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionBuilder.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.text.CharUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -34,6 +35,7 @@ import java.util.List; * @since 5.4.3 */ public class ConditionBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java index 0e03ed6af..39b7b71db 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/ConditionGroup.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.sql; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.List; /** @@ -29,6 +30,7 @@ import java.util.List; * @since 5.7.21 */ public class ConditionGroup extends Condition { + @Serial private static final long serialVersionUID = 1L; /** * 条件列表 diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java index 1d1dbc2d5..d78ffa65d 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/Order.java @@ -18,6 +18,7 @@ package cn.hutool.v7.db.sql; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -26,6 +27,7 @@ import java.io.Serializable; * */ public class Order implements Serializable{ + @Serial private static final long serialVersionUID = 1L; /** 排序的字段 */ diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java index 6c650cad5..5edbc7fda 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QueryBuilder.java @@ -19,6 +19,7 @@ package cn.hutool.v7.db.sql; import cn.hutool.v7.core.lang.builder.Builder; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -39,6 +40,7 @@ import java.util.List; * @since 6.0.0 */ public class QueryBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; private final List fields; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java index 3ad510e34..a05dfd25b 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/sql/QuoteWrapper.java @@ -22,6 +22,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.split.SplitUtil; import cn.hutool.v7.db.Entity; +import java.io.Serial; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -34,6 +35,7 @@ import java.util.Map.Entry; * @author Looly */ public class QuoteWrapper implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java index 25f7b4b69..0c554b46f 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/SimpleInterceptor.java @@ -16,6 +16,7 @@ package cn.hutool.v7.extra.aop; +import java.io.Serial; import java.io.Serializable; /** @@ -25,6 +26,7 @@ import java.io.Serializable; * @since 6.0.0 */ public class SimpleInterceptor implements Serializable { + @Serial private static final long serialVersionUID = 1L; protected final Object target; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java index 6799e8fc9..f0073b2ec 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/SimpleAspect.java @@ -18,6 +18,7 @@ package cn.hutool.v7.extra.aop.aspects; import cn.hutool.v7.extra.aop.Aspect; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Method; @@ -28,6 +29,7 @@ import java.lang.reflect.Method; * @author Looly, ted.L */ public class SimpleAspect implements Aspect, Serializable { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java index dc6c3b3a4..3568c040c 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/aspects/TimeIntervalAspect.java @@ -19,6 +19,7 @@ package cn.hutool.v7.extra.aop.aspects; import cn.hutool.v7.core.date.StopWatch; import cn.hutool.v7.core.lang.Console; +import java.io.Serial; import java.lang.reflect.Method; /** @@ -27,6 +28,7 @@ import java.lang.reflect.Method; * @author Looly */ public class TimeIntervalAspect extends SimpleAspect { + @Serial private static final long serialVersionUID = 1L; private final StopWatch interval = new StopWatch(); diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java index 3398de587..eb5508e31 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/jdk/JdkInterceptor.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.reflect.ReflectUtil; import cn.hutool.v7.extra.aop.Aspect; import cn.hutool.v7.extra.aop.SimpleInterceptor; +import java.io.Serial; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,6 +33,7 @@ import java.lang.reflect.Method; * @author ted.L */ public class JdkInterceptor extends SimpleInterceptor implements InvocationHandler { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java index 68f15c33d..cf6388f7d 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/aop/engine/spring/SpringCglibInterceptor.java @@ -21,6 +21,7 @@ import cn.hutool.v7.extra.aop.SimpleInterceptor; import org.springframework.cglib.proxy.MethodInterceptor; import org.springframework.cglib.proxy.MethodProxy; +import java.io.Serial; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -30,6 +31,7 @@ import java.lang.reflect.Method; * @author Looly */ public class SpringCglibInterceptor extends SimpleInterceptor implements MethodInterceptor { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java index 8a1ebcebd..9393ab660 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/compress/CompressException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.compress; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 压缩解压异常语言异常 * * @author Looly */ public class CompressException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java index 84b265094..1ee7dad85 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpConfig.java @@ -18,6 +18,7 @@ package cn.hutool.v7.extra.ftp; import cn.hutool.v7.extra.ssh.Connector; +import java.io.Serial; import java.io.Serializable; import java.nio.charset.Charset; @@ -27,6 +28,7 @@ import java.nio.charset.Charset; * @author Looly */ public class FtpConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java index 8af33670b..aad98c129 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ftp/FtpException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.ftp; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * Ftp异常 * * @author Looly */ public class FtpException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java index a5ef76d71..8839be3a9 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mail/MailException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.mail; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 邮件异常 * * @author Looly */ public class MailException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java index 0186d15db..a284f9803 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JavaSpecInfo.java @@ -18,12 +18,14 @@ package cn.hutool.v7.extra.management; import cn.hutool.v7.core.util.SystemUtil; +import java.io.Serial; import java.io.Serializable; /** * 代表Java Specification的信息。 */ public class JavaSpecInfo implements Serializable{ + @Serial private static final long serialVersionUID = 1L; private final String JAVA_SPECIFICATION_NAME = SystemUtil.get("java.specification.name", false); diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java index ac5ca6685..9bdb473ce 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmInfo.java @@ -18,12 +18,14 @@ package cn.hutool.v7.extra.management; import cn.hutool.v7.core.util.SystemUtil; +import java.io.Serial; import java.io.Serializable; /** * 代表Java Virtual Machine Implementation的信息。 */ public class JvmInfo implements Serializable{ + @Serial private static final long serialVersionUID = 1L; private final String JAVA_VM_NAME = SystemUtil.get("java.vm.name", false); diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java index 51e970eb8..e2b433efe 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/JvmSpecInfo.java @@ -18,12 +18,14 @@ package cn.hutool.v7.extra.management; import cn.hutool.v7.core.util.SystemUtil; +import java.io.Serial; import java.io.Serializable; /** * 代表Java Virtual Machine Specification的信息。 */ public class JvmSpecInfo implements Serializable{ + @Serial private static final long serialVersionUID = 1L; private final String JAVA_VM_SPECIFICATION_NAME = SystemUtil.get("java.vm.specification.name", false); diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java index 748761046..1e533488d 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/ManagementException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.management; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * FtpException异常 * * @author Looly */ public class ManagementException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java index fab2b55ec..c74304604 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/RuntimeInfo.java @@ -18,6 +18,7 @@ package cn.hutool.v7.extra.management; import cn.hutool.v7.core.io.file.FileUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -26,6 +27,7 @@ import java.io.Serializable; * @author Looly */ public class RuntimeInfo implements Serializable { + @Serial private static final long serialVersionUID = 1L; private final Runtime currentRuntime = Runtime.getRuntime(); diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java index d554ac839..42e53e6a8 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/management/UserInfo.java @@ -20,12 +20,14 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.util.SystemUtil; import java.io.File; +import java.io.Serial; import java.io.Serializable; /** * 代表当前用户的信息。 */ public class UserInfo implements Serializable{ + @Serial private static final long serialVersionUID = 1L; private final String USER_NAME; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java index 3bcec3a1b..ad2083f3a 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/pinyin/PinyinException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.pinyin; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 拼音异常 * * @author Looly */ public class PinyinException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java index 0d45cb507..600e435ac 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/ssh/SshException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.ssh; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * SSH异常 * * @author Looly */ public class SshException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java index 7231a375c..39434c742 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/TemplateException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.template; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 模板异常 * * @author Looly */ public class TemplateException extends HutoolException { + @Serial private static final long serialVersionUID = 8247610319171014183L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java index 1d2299ab6..e72fa2c63 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/beetl/BeetlTemplate.java @@ -19,6 +19,7 @@ package cn.hutool.v7.extra.template.engine.beetl; import cn.hutool.v7.extra.template.Template; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -29,6 +30,7 @@ import java.util.Map; * @author Looly */ public class BeetlTemplate implements Template, Serializable{ + @Serial private static final long serialVersionUID = -8157926902932567280L; private final org.beetl.core.Template rawTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java index 2f34d44f2..04c5b1162 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/enjoy/EnjoyTemplate.java @@ -19,6 +19,7 @@ package cn.hutool.v7.extra.template.engine.enjoy; import cn.hutool.v7.extra.template.Template; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -30,6 +31,7 @@ import java.util.Map; * @since 4.1.9 */ public class EnjoyTemplate implements Template, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java index 1d49a7adc..c0ccca75f 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jetbrick/JetbrickTemplate.java @@ -22,6 +22,7 @@ import cn.hutool.v7.extra.template.Template; import jetbrick.template.JetTemplate; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -34,6 +35,7 @@ import java.util.Map; * @since 5.7.21 */ public class JetbrickTemplate implements Template, Serializable{ + @Serial private static final long serialVersionUID = 1L; private final JetTemplate rawTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java index 70e4dc7d5..b81bb3ca5 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/jte/JteTemplate.java @@ -33,6 +33,7 @@ import java.util.Map; */ public class JteTemplate implements Template, Serializable { + @Serial private static final long serialVersionUID = -2739915422007257186L; private final TemplateEngine templateEngine; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java index 724f8a65d..1f5f63a85 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/rythm/RythmTemplate.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.reflect.TypeReference; import cn.hutool.v7.extra.template.Template; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -32,6 +33,7 @@ import java.util.Map; * */ public class RythmTemplate implements Template, Serializable { + @Serial private static final long serialVersionUID = -132774960373894911L; private final org.rythmengine.template.ITemplate rawTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java index d2e5990ec..344e71669 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/thymeleaf/ThymeleafTemplate.java @@ -26,6 +26,7 @@ import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.nio.charset.Charset; @@ -39,6 +40,7 @@ import java.util.Map; * @since 4.1.11 */ public class ThymeleafTemplate implements Template, Serializable { + @Serial private static final long serialVersionUID = 781284916568562509L; private final TemplateEngine engine; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java index 4860a8723..db4fd1351 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/velocity/VelocityTemplate.java @@ -26,6 +26,7 @@ import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -37,6 +38,7 @@ import java.util.Map; * */ public class VelocityTemplate implements Template, Serializable { + @Serial private static final long serialVersionUID = -132774960373894911L; private final org.apache.velocity.Template rawTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java index 0e06088b4..f8923f7fe 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/wit/WitTemplate.java @@ -21,6 +21,7 @@ import cn.hutool.v7.core.reflect.TypeReference; import org.febit.wit.Template; import java.io.OutputStream; +import java.io.Serial; import java.io.Serializable; import java.io.Writer; import java.util.Map; @@ -31,6 +32,7 @@ import java.util.Map; * @author Looly */ public class WitTemplate implements cn.hutool.v7.extra.template.Template, Serializable{ + @Serial private static final long serialVersionUID = 1L; private final Template rawTemplate; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java index cc01adb68..030b851e7 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/TokenizerException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.extra.tokenizer; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 分词异常 * * @author Looly */ public class TokenizerException extends HutoolException { + @Serial private static final long serialVersionUID = 8074865854534335463L; /** diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java index 46964e9c4..c87c8757d 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ansj/AnsjWord.java @@ -20,6 +20,8 @@ import org.ansj.domain.Term; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * Ansj分词中的一个单词包装 * @@ -27,6 +29,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class AnsjWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final Term term; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java index ba36fec00..7b2e1e054 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPWord.java @@ -20,6 +20,8 @@ import com.hankcs.hanlp.seg.common.Term; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * HanLP分词中的一个单词包装 * @@ -27,6 +29,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class HanLPWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final Term term; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java index 1ffbe14c4..5c106a991 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/ikanalyzer/IKAnalyzerWord.java @@ -20,6 +20,8 @@ import org.wltea.analyzer.core.Lexeme; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * IKAnalyzer分词中的一个单词包装 * @@ -27,6 +29,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class IKAnalyzerWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final Lexeme word; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java index 09563ff7a..e09bfad7f 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jcseg/JcsegWord.java @@ -19,6 +19,8 @@ package cn.hutool.v7.extra.tokenizer.engine.jcseg; import cn.hutool.v7.extra.tokenizer.Word; import org.lionsoul.jcseg.IWord; +import java.io.Serial; + /** * Jcseg分词中的一个单词包装 * @@ -26,6 +28,7 @@ import org.lionsoul.jcseg.IWord; * */ public class JcsegWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final IWord word; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java index 0c400d104..fbe2e84d8 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/jieba/JiebaWord.java @@ -20,6 +20,8 @@ import com.huaban.analysis.jieba.SegToken; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * Jieba分词中的一个单词包装 * @@ -27,6 +29,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class JiebaWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final SegToken segToken; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java index 2e3b14999..803d7753a 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mmseg/MmsegWord.java @@ -18,6 +18,8 @@ package cn.hutool.v7.extra.tokenizer.engine.mmseg; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * mmseg分词中的一个单词包装 * @@ -25,6 +27,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class MmsegWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final com.chenlb.mmseg4j.Word word; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java index a0e298e17..9944940b4 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/mynlp/MynlpWord.java @@ -20,12 +20,15 @@ import com.mayabot.nlp.segment.WordTerm; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * mmseg分词中的一个单词包装 * * @author Looly */ public class MynlpWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final WordTerm word; diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java index 02c639abe..cc56503f4 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/word/WordWord.java @@ -18,6 +18,8 @@ package cn.hutool.v7.extra.tokenizer.engine.word; import cn.hutool.v7.extra.tokenizer.Word; +import java.io.Serial; + /** * Word分词中的一个单词包装 * @@ -25,6 +27,7 @@ import cn.hutool.v7.extra.tokenizer.Word; * */ public class WordWord implements Word { + @Serial private static final long serialVersionUID = 1L; private final org.apdplat.word.segmentation.Word word; diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java b/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java index 96d88dd59..f6a972d70 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/HttpException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.http; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * HTTP异常 * * @author Looly */ public class HttpException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java index a3bb6ad10..8e2f6bd1b 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/TlsSocketStrategyBuilder.java @@ -27,6 +27,7 @@ import cn.hutool.v7.core.util.ObjUtil; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import java.io.Serial; /** * TLS Socket 策略构建器 @@ -35,6 +36,7 @@ import javax.net.ssl.SSLContext; * @since 6.0.0 */ public class TlsSocketStrategyBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java index ee09bbed7..7bebd1479 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/html/HtmlFilter.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; * String clean = new HTMLFilter().filter(input); * *

- * 此类来自：http://xss-html-filter.sf.net + * 此类来自：xss-html-filter.sf.net * * @author Joseph O'Connell * @author Cal Hendersen @@ -47,15 +47,14 @@ public final class HtmlFilter { /** * regex flag union representing /si modifiers in php **/ - private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); - private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); + private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); - private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); - private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); - private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); - private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); - private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); + private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); + private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); + private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); + private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); + private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java index cb94c0d94..6b17f08b4 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Browser.java @@ -19,6 +19,7 @@ package cn.hutool.v7.http.useragent; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.regex.ReUtil; +import java.io.Serial; import java.util.List; import java.util.regex.Pattern; @@ -29,6 +30,7 @@ import java.util.regex.Pattern; * @since 4.2.1 */ public class Browser extends UserAgentInfo { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java index d7567d6c9..61955debf 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/BrowserEngine.java @@ -19,6 +19,7 @@ package cn.hutool.v7.http.useragent; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.regex.ReUtil; +import java.io.Serial; import java.util.List; import java.util.regex.Pattern; @@ -29,6 +30,7 @@ import java.util.regex.Pattern; * @since 4.2.1 */ public class BrowserEngine extends UserAgentInfo { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java index 139d8c759..44917e99b 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/OS.java @@ -19,6 +19,7 @@ package cn.hutool.v7.http.useragent; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.regex.ReUtil; +import java.io.Serial; import java.util.List; import java.util.regex.Pattern; @@ -29,6 +30,7 @@ import java.util.regex.Pattern; * @since 4.2.1 */ public class OS extends UserAgentInfo { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java index 7368ebd5a..815429671 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/Platform.java @@ -18,6 +18,7 @@ package cn.hutool.v7.http.useragent; import cn.hutool.v7.core.collection.ListUtil; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -28,6 +29,7 @@ import java.util.List; * @since 4.2.1 */ public class Platform extends UserAgentInfo { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java index 0930bf4be..e20ba7c88 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgent.java @@ -16,6 +16,7 @@ package cn.hutool.v7.http.useragent; +import java.io.Serial; import java.io.Serializable; /** @@ -25,6 +26,7 @@ import java.io.Serializable; * @since 4.2.1 */ public class UserAgent implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java index bdfadbd12..e140e288d 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/useragent/UserAgentInfo.java @@ -18,6 +18,7 @@ package cn.hutool.v7.http.useragent; import cn.hutool.v7.core.regex.ReUtil; +import java.io.Serial; import java.io.Serializable; import java.util.regex.Pattern; @@ -28,6 +29,7 @@ import java.util.regex.Pattern; * @since 4.2.1 */ public class UserAgentInfo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java index 32427f7d2..be4e4de1d 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/webservice/SoapRuntimeException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.http.webservice; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * SOAP异常 * * @author Looly */ public class SoapRuntimeException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java index 70ab1338d..4d78aefb3 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONConfig.java @@ -19,6 +19,7 @@ package cn.hutool.v7.json; import cn.hutool.v7.core.comparator.CompareUtil; import cn.hutool.v7.json.writer.NumberWriteMode; +import java.io.Serial; import java.io.Serializable; import java.util.Comparator; @@ -29,6 +30,7 @@ import java.util.Comparator; * @since 4.1.19 */ public class JSONConfig implements Serializable { + @Serial private static final long serialVersionUID = 119730355204738278L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java b/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java index fc0a755a6..73f2994ae 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/JSONException.java @@ -18,6 +18,8 @@ package cn.hutool.v7.json; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * JSON异常 * @@ -25,6 +27,7 @@ import cn.hutool.v7.core.exception.HutoolException; * @since 3.0.2 */ public class JSONException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java index 47cb5ea41..e5fcab297 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/JSONEngineConfig.java @@ -16,6 +16,7 @@ package cn.hutool.v7.json.engine; +import java.io.Serial; import java.io.Serializable; /** @@ -25,6 +26,7 @@ import java.io.Serializable; * @since 6.0.0 */ public class JSONEngineConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java index 48863dca2..adb812c07 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/HutoolModule.java @@ -18,6 +18,8 @@ package cn.hutool.v7.json.engine.jackson; import com.fasterxml.jackson.databind.module.SimpleModule; +import java.io.Serial; + /** * 时间相关序列化模块 * @@ -25,6 +27,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; * @since 6.0.0 */ public class HutoolModule extends SimpleModule { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java index 15ba54f67..fd73a0006 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTException.java @@ -18,6 +18,8 @@ package cn.hutool.v7.json.jwt; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * JWT异常 * @@ -25,6 +27,7 @@ import cn.hutool.v7.core.exception.HutoolException; * @since 5.7.0 */ public class JWTException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java index cf0ab5d88..eed385d5e 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTHeader.java @@ -16,6 +16,7 @@ package cn.hutool.v7.json.jwt; +import java.io.Serial; import java.util.Map; /** @@ -25,6 +26,7 @@ import java.util.Map; * @since 5.7.0 */ public class JWTHeader extends Claims { + @Serial private static final long serialVersionUID = 1L; //Header names diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java index 90a148621..12d3601d1 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/jwt/JWTPayload.java @@ -16,6 +16,7 @@ package cn.hutool.v7.json.jwt; +import java.io.Serial; import java.util.Map; /** @@ -34,6 +35,7 @@ import java.util.Map; * @since 5.7.0 */ public class JWTPayload extends Claims implements RegisteredPayload{ + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java b/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java index 797993d26..f67a69e8b 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/xml/ParseConfig.java @@ -16,6 +16,7 @@ package cn.hutool.v7.json.xml; +import java.io.Serial; import java.io.Serializable; /** @@ -25,6 +26,7 @@ import java.io.Serializable; * @author AylwardJ, Looly */ public class ParseConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java index 688197acf..0f0718a2b 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONUtilTest.java @@ -27,6 +27,7 @@ import cn.hutool.v7.json.test.bean.UserC; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.sql.SQLException; import java.util.*; @@ -221,6 +222,7 @@ public class JSONUtilTest { public void toJsonStrFromSortedTest() { //noinspection SerializableInnerClassWithNonSerializableOuterClass final SortedMap sortedMap = new TreeMap() { + @Serial private static final long serialVersionUID = 1L; { diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java index 89f6c8317..f84457ed5 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3058Test.java @@ -20,6 +20,7 @@ import cn.hutool.v7.json.JSONUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.SortedMap; import java.util.TreeMap; @@ -27,6 +28,7 @@ public class Issue3058Test { @Test void toJsonStrTest() { final SortedMap sortedMap = new TreeMap() { + @Serial private static final long serialVersionUID = 1L; { put("attributes", "a"); diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java index abe86dd93..3b7016b99 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/IssueI1AU86Test.java @@ -23,6 +23,7 @@ import cn.hutool.v7.json.JSONUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -56,6 +57,7 @@ public class IssueI1AU86Test { @Data public static class Vcc implements Serializable { + @Serial private static final long serialVersionUID = 1L; private Long id; private Date updateDate; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java index 7939d78ec..76af2ddd2 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issues1881Test.java @@ -22,6 +22,7 @@ import cn.hutool.v7.json.JSONUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -32,6 +33,7 @@ public class Issues1881Test { @Data static class ThingsHolderContactVO implements Serializable { + @Serial private static final long serialVersionUID = -8727337936070932370L; private Long id; private Integer type; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java index a412a6f37..6f6271588 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTTest.java @@ -27,6 +27,7 @@ import cn.hutool.v7.json.jwt.signers.JWTSignerUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.*; public class JWTTest { @@ -138,6 +139,7 @@ public class JWTTest { map.put("test2", "2"); final Map payload = new HashMap() { + @Serial private static final long serialVersionUID = 1L; { put("username", username); diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java index ed405081a..6ab574fed 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/jwt/JWTUtilTest.java @@ -19,6 +19,7 @@ package cn.hutool.v7.json.jwt; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.HashMap; import java.util.Map; @@ -28,6 +29,7 @@ public class JWTUtilTest { public void createTest(){ final byte[] key = "1234".getBytes(); final Map map = new HashMap() { + @Serial private static final long serialVersionUID = 1L; { put("uid", Integer.parseInt("123")); diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java index 3deff5852..214427bad 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ExamInfoDict.java @@ -18,6 +18,7 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; /** @@ -27,6 +28,7 @@ import java.io.Serializable; */ @Data public class ExamInfoDict implements Serializable { + @Serial private static final long serialVersionUID = 3640936499125004525L; // 主键 diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java index c3fb3dd83..3de528664 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/JsonNode.java @@ -18,10 +18,12 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; @Data public class JsonNode implements Serializable { + @Serial private static final long serialVersionUID = -2280206942803550272L; private Long id; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java index c38cb0419..12519380b 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/PerfectEvaluationProductResVo.java @@ -19,6 +19,7 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; import java.util.HashMap; import java.util.Map; @@ -30,9 +31,11 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @Data public class PerfectEvaluationProductResVo extends ProductResBase { + @Serial private static final long serialVersionUID = 1L; public static final Map KEY_TO_KEY = new HashMap() { + @Serial private static final long serialVersionUID = 1L; { diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java index b9e4033d1..264e98664 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ProductResBase.java @@ -18,6 +18,7 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; /** @@ -26,6 +27,7 @@ import java.io.Serializable; */ @Data public class ProductResBase implements Serializable { + @Serial private static final long serialVersionUID = -6708040074002451511L; /** * 请求结果成功0 diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java index 9cb05926f..d94db8b96 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/ResultDto.java @@ -18,10 +18,12 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; @Data public class ResultDto implements Serializable { + @Serial private static final long serialVersionUID = -1417999729205654379L; /** diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java index 7c8932173..f94e86b4a 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp.java @@ -19,9 +19,12 @@ package cn.hutool.v7.json.test.bean; import lombok.Getter; import lombok.Setter; +import java.io.Serial; + @Getter @Setter public class TokenAuthWarp extends UUMap { + @Serial private static final long serialVersionUID = 1L; private String targetUrl; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java index 85cbd71a8..043ce4052 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/TokenAuthWarp2.java @@ -16,6 +16,9 @@ package cn.hutool.v7.json.test.bean; +import java.io.Serial; + public class TokenAuthWarp2 extends TokenAuthWarp { + @Serial private static final long serialVersionUID = 1L; } diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java index c50f0b6b0..58dfbe740 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UUMap.java @@ -18,10 +18,12 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; @Data public class UUMap implements Serializable{ + @Serial private static final long serialVersionUID = 1L; private T result; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java index af83eabac..293c66b64 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoDict.java @@ -18,6 +18,7 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -28,6 +29,7 @@ import java.util.List; */ @Data public class UserInfoDict implements Serializable { + @Serial private static final long serialVersionUID = -936213991463284306L; // 用户Id private Integer id; diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java index e8f13323e..00e9a3320 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/test/bean/UserInfoRedundCount.java @@ -18,10 +18,12 @@ package cn.hutool.v7.json.test.bean; import lombok.Data; +import java.io.Serial; import java.io.Serializable; @Data public class UserInfoRedundCount implements Serializable { + @Serial private static final long serialVersionUID = -8397291070139255181L; private String finishedRatio; // 完成率 diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java index 19050733e..e8769836f 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/AbstractLog.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.exception.ExceptionUtil; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.log.level.Level; +import java.io.Serial; import java.io.Serializable; /** @@ -30,26 +31,24 @@ import java.io.Serializable; * */ public abstract class AbstractLog implements Log, Serializable{ - + @Serial private static final long serialVersionUID = -3211115409504005616L; + + /** + * FQCN，全限定类名 + */ private static final String FQCN = AbstractLog.class.getName(); @Override public boolean isEnabled(final Level level) { - switch (level) { - case TRACE: - return isTraceEnabled(); - case DEBUG: - return isDebugEnabled(); - case INFO: - return isInfoEnabled(); - case WARN: - return isWarnEnabled(); - case ERROR: - return isErrorEnabled(); - default: - throw new Error(StrUtil.format("Can not identify level: {}", level)); - } + return switch (level) { + case TRACE -> isTraceEnabled(); + case DEBUG -> isDebugEnabled(); + case INFO -> isInfoEnabled(); + case WARN -> isWarnEnabled(); + case ERROR -> isErrorEnabled(); + default -> throw new Error(StrUtil.format("Can not identify level: {}", level)); + }; } @Override diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java index 69c6efe21..2e840734d 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/commons/ApacheCommonsLog4JLog.java @@ -20,12 +20,15 @@ import cn.hutool.v7.log.engine.log4j.Log4jLog; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.io.Serial; + /** * Apache Commons Logging for Log4j * * @author Looly */ public class ApacheCommonsLog4JLog extends Log4jLog { + @Serial private static final long serialVersionUID = -6843151523380063975L; // ------------------------------------------------------------------------- Constructor diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java index 06f3cb055..fbf8ac897 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/console/ConsoleColorLog.java @@ -23,6 +23,7 @@ import cn.hutool.v7.core.reflect.ClassUtil; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.log.level.Level; +import java.io.Serial; import java.util.function.Function; /** @@ -32,6 +33,7 @@ import java.util.function.Function; * @since 5.8.0 */ public class ConsoleColorLog extends ConsoleLog { + @Serial private static final long serialVersionUID = 1L; /** @@ -49,20 +51,12 @@ public class ConsoleColorLog extends ConsoleLog { */ private static final Ansi4BitColor COLOR_NONE = Ansi4BitColor.DEFAULT; - private static Function colorFactory = (level -> { - switch (level) { - case DEBUG: - case INFO: - return Ansi4BitColor.GREEN; - case WARN: - return Ansi4BitColor.YELLOW; - case ERROR: - return Ansi4BitColor.RED; - case TRACE: - return Ansi4BitColor.MAGENTA; - default: - return COLOR_NONE; - } + private static Function colorFactory = (level -> switch (level) { + case DEBUG, INFO -> Ansi4BitColor.GREEN; + case WARN -> Ansi4BitColor.YELLOW; + case ERROR -> Ansi4BitColor.RED; + case TRACE -> Ansi4BitColor.MAGENTA; + default -> COLOR_NONE; }); /** diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java index da4583f98..cf5827dd7 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/jboss/JbossLog.java @@ -22,6 +22,8 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.log.AbstractLog; import cn.hutool.v7.log.level.Level; +import java.io.Serial; + /** * Jboss-Logging log. * @@ -29,6 +31,7 @@ import cn.hutool.v7.log.level.Level; * */ public class JbossLog extends AbstractLog { + @Serial private static final long serialVersionUID = -6843151523380063975L; private final transient Logger logger; diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java index 2cf162821..1e64bf8c9 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java @@ -24,12 +24,15 @@ import org.apache.logging.log4j.spi.AbstractLogger; import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.log.AbstractLog; +import java.io.Serial; + /** * Apache Log4J 2 log.
* * @author Looly */ public class Log4j2Log extends AbstractLog { + @Serial private static final long serialVersionUID = -6843151523380063975L; private final transient Logger logger; diff --git a/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java index b80848171..9f5a642af 100644 --- a/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java +++ b/hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLog.java @@ -24,6 +24,8 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.log.AbstractLog; import cn.hutool.v7.log.level.Level; +import java.io.Serial; + /** * SLF4J log.
* 同样无缝支持 LogBack @@ -32,6 +34,7 @@ import cn.hutool.v7.log.level.Level; * */ public class Slf4jLog extends AbstractLog { + @Serial private static final long serialVersionUID = -6843151523380063975L; private final transient Logger logger; diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java index d6c40bd5a..de9dfcb6a 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/POIException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.poi; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * POI异常 * * @author Looly */ public class POIException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java index 6a40f6fea..927faa057 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvConfig.java @@ -18,6 +18,7 @@ package cn.hutool.v7.poi.csv; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; @@ -31,6 +32,7 @@ import java.util.Map; */ @SuppressWarnings("unchecked") public class CsvConfig> implements Serializable { + @Serial private static final long serialVersionUID = -8069578249066158459L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java index 1acbf644a..b9b246b33 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvReadConfig.java @@ -16,6 +16,7 @@ package cn.hutool.v7.poi.csv; +import java.io.Serial; import java.io.Serializable; /** @@ -25,6 +26,7 @@ import java.io.Serializable; * */ public class CsvReadConfig extends CsvConfig implements Serializable { + @Serial private static final long serialVersionUID = 5396453565371560052L; /** 指定标题行号，-1表示无标题行 */ diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java index 582d1e9f1..2aab0c998 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriteConfig.java @@ -18,6 +18,7 @@ package cn.hutool.v7.poi.csv; import cn.hutool.v7.core.text.CharUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -26,6 +27,7 @@ import java.io.Serializable; * @author Looly */ public class CsvWriteConfig extends CsvConfig implements Serializable { + @Serial private static final long serialVersionUID = 5396453565371560052L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java index 63d5b0c45..82de6cbcb 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/csv/CsvWriter.java @@ -42,6 +42,7 @@ import java.util.Map; * @since 4.0.5 */ public final class CsvWriter implements Closeable, Flushable, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java index 5e16ce671..cd9ce9908 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/StopReadException.java @@ -18,6 +18,8 @@ package cn.hutool.v7.poi.excel.sax; import cn.hutool.v7.poi.POIException; +import java.io.Serial; + /** * 读取结束异常，用于标记读取结束
* Sax方式读取时，如果用户在RowHandler中抛出此异常，表示读取结束，此时不再读取其他数据 @@ -26,6 +28,7 @@ import cn.hutool.v7.poi.POIException; * @since 5.8.35 */ public class StopReadException extends POIException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java index 1f155b6c3..c3bc413d2 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/DefaultStyleSet.java @@ -20,6 +20,7 @@ import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellReference; +import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; import java.time.temporal.TemporalAccessor; @@ -33,6 +34,7 @@ import java.util.Date; * @since 6.0.0 */ public class DefaultStyleSet implements StyleSet, Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java index be90ee558..d866ce83a 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/style/ShapeConfig.java @@ -19,6 +19,7 @@ package cn.hutool.v7.poi.excel.style; import org.apache.poi.sl.usermodel.ShapeType; import java.awt.Color; +import java.io.Serial; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; * @since 6.0.0 */ public class ShapeConfig implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java index ab6ee26ba..261c787cf 100644 --- a/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java +++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/reader/CellEditorTest.java @@ -23,6 +23,7 @@ import lombok.Data; import org.apache.poi.ss.usermodel.Cell; import org.junit.jupiter.api.Assertions; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -45,6 +46,7 @@ public class CellEditorTest { @AllArgsConstructor @Data public static class Test implements Serializable { + @Serial private static final long serialVersionUID = 1L; private String test1; diff --git a/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java index 855b456a3..ce986b2d9 100644 --- a/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/v7/poi/excel/writer/BigExcelWriteTest.java @@ -33,6 +33,7 @@ import cn.hutool.v7.poi.excel.style.StyleUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.*; /** @@ -244,21 +245,25 @@ public class BigExcelWriteTest { config.addHeaderAlias("userName", "User Name"); final List> list = new ArrayList<>(); - list.add(new HashMap() { + list.add(new HashMap<>() { + @Serial private static final long serialVersionUID = 1L; { - put("id", 1); - put("userName", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); - }}); + put("id", 1); + put("userName", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); + } + }); - list.add(new HashMap() { + list.add(new HashMap<>() { + @Serial private static final long serialVersionUID = 1L; { - put("id", 2); - put("userName", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); - }}); + put("id", 2); + put("userName", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"); + } + }); writer.write(list, true); writer.autoSizeColumnAll(false, 0); writer.close(); diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java index dd099f430..99fd8fb6c 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/AbsSetting.java @@ -29,6 +29,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.text.split.SplitUtil; import cn.hutool.v7.core.util.ObjUtil; +import java.io.Serial; import java.io.Serializable; import java.lang.reflect.Type; @@ -39,6 +40,7 @@ import java.lang.reflect.Type; */ public abstract class AbsSetting implements TypeGetter, GroupedTypeGetter, Serializable { + @Serial private static final long serialVersionUID = 6200156302595905863L; /** diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java index 1a6d0101e..358b2d073 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedMap.java @@ -19,6 +19,7 @@ package cn.hutool.v7.setting; import cn.hutool.v7.core.map.MapUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; @@ -37,6 +38,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; * @since 4.0.11 */ public class GroupedMap extends LinkedHashMap> { + @Serial private static final long serialVersionUID = -7777365130776081931L; private final ReentrantReadWriteLock cacheLock = new ReentrantReadWriteLock(); diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java index e6e53bcba..f00b1ea1d 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/GroupedSet.java @@ -23,10 +23,7 @@ import cn.hutool.v7.core.text.StrUtil; import cn.hutool.v7.core.array.ArrayUtil; import cn.hutool.v7.core.util.CharsetUtil; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URL; import java.nio.charset.Charset; import java.util.*; @@ -53,6 +50,7 @@ import java.util.*; * @since 3.1.0 */ public class GroupedSet extends HashMap> { + @Serial private static final long serialVersionUID = -8430706353275835496L; // private final static Log log = StaticLog.get(); diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java index cd85171e9..fdf2db9df 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/SettingException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.setting; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * 设置异常 * * @author Looly */ public class SettingException extends HutoolException { + @Serial private static final long serialVersionUID = 7941096116780378387L; /** diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java index ec1a59e7c..343e3f28a 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/props/Props.java @@ -40,6 +40,7 @@ import cn.hutool.v7.log.LogUtil; import java.io.File; import java.io.IOException; +import java.io.Serial; import java.io.Writer; import java.net.URL; import java.nio.charset.Charset; @@ -54,6 +55,7 @@ import java.util.Properties; * @author loolly */ public final class Props extends Properties implements TypeGetter { + @Serial private static final long serialVersionUID = 1935981579709590740L; /** @@ -235,6 +237,7 @@ public final class Props extends Properties implements TypeGetter // 先关闭之前的监听 IoUtil.closeQuietly(this.watchMonitor); this.watchMonitor = WatchUtil.ofModify(this.resource.getUrl(), new SimpleWatcher() { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java index bb57b41df..59bf492e8 100644 --- a/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java +++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketConfig.java @@ -19,6 +19,7 @@ package cn.hutool.v7.socket; import cn.hutool.v7.core.io.IoUtil; import cn.hutool.v7.core.util.RuntimeUtil; +import java.io.Serial; import java.io.Serializable; /** @@ -28,6 +29,7 @@ import java.io.Serializable; * */ public class SocketConfig implements Serializable{ + @Serial private static final long serialVersionUID = 1L; /** CPU核心数 */ diff --git a/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java index 22cdf4eb6..163bc443d 100644 --- a/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java +++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/SocketRuntimeException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.socket; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * Socket异常 * * @author Looly */ public class SocketRuntimeException extends HutoolException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java index 1da19d5a2..155aa8235 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/CircleCaptcha.java @@ -25,6 +25,7 @@ import cn.hutool.v7.swing.img.color.ColorUtil; import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; +import java.io.Serial; import java.util.concurrent.ThreadLocalRandom; /** @@ -34,6 +35,7 @@ import java.util.concurrent.ThreadLocalRandom; * @since 3.2.3 */ public class CircleCaptcha extends AbstractCaptcha { + @Serial private static final long serialVersionUID = -7096627300356535494L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java index 9521e1abb..82237c5ba 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/GifCaptcha.java @@ -29,6 +29,7 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; +import java.io.Serial; /** * Gif验证码类 @@ -37,6 +38,7 @@ import java.io.ByteArrayOutputStream; * @since 5.5.2 */ public class GifCaptcha extends AbstractCaptcha { + @Serial private static final long serialVersionUID = 7091627304326538464L; //量化器取样间隔 - 默认是10ms diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java index 5a3f8d546..6b945f7d3 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/LineCaptcha.java @@ -26,6 +26,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; +import java.io.Serial; import java.util.concurrent.ThreadLocalRandom; /** @@ -35,6 +36,7 @@ import java.util.concurrent.ThreadLocalRandom; * @since 3.1.2 */ public class LineCaptcha extends AbstractCaptcha { + @Serial private static final long serialVersionUID = 8691294460763091089L; // -------------------------------------------------------------------- Constructor start diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java index 64f36e581..1c88abd8e 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/ShearCaptcha.java @@ -28,6 +28,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; +import java.io.Serial; /** * 扭曲干扰验证码 @@ -36,6 +37,7 @@ import java.awt.image.BufferedImage; * @since 3.2.3 */ public class ShearCaptcha extends AbstractCaptcha { + @Serial private static final long serialVersionUID = -7096627300356535494L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java index 68d55d8d1..f652ea7ea 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/AbstractGenerator.java @@ -18,6 +18,8 @@ package cn.hutool.v7.swing.captcha.generator; import cn.hutool.v7.core.util.RandomUtil; +import java.io.Serial; + /** * 随机字符验证码生成器
* 可以通过传入的基础集合和长度随机生成验证码字符 @@ -26,6 +28,7 @@ import cn.hutool.v7.core.util.RandomUtil; * @since 4.1.2 */ public abstract class AbstractGenerator implements CodeGenerator { + @Serial private static final long serialVersionUID = 8685744597154953479L; /** 基础字符集合，用于随机获取字符串的字符集合 */ diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java index 728a5b41b..14c84f58c 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/captcha/generator/RandomGenerator.java @@ -19,6 +19,8 @@ package cn.hutool.v7.swing.captcha.generator; import cn.hutool.v7.core.util.RandomUtil; import cn.hutool.v7.core.text.StrUtil; +import java.io.Serial; + /** * 随机字符验证码生成器
* 可以通过传入的基础集合和长度随机生成验证码字符 @@ -27,6 +29,7 @@ import cn.hutool.v7.core.text.StrUtil; * @since 4.1.2 */ public class RandomGenerator extends AbstractGenerator { + @Serial private static final long serialVersionUID = -7802758587765561876L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java index e8a3a8ad9..85eec0ac8 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/ImageSelection.java @@ -20,6 +20,7 @@ import java.awt.Image; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.Serial; import java.io.Serializable; /** @@ -30,6 +31,7 @@ import java.io.Serializable; * @since 4.5.6 */ public class ImageSelection implements Transferable, Serializable { + @Serial private static final long serialVersionUID = 1L; private final Image image; diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java index f1ca00306..2b2c899f8 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/clipboard/StrClipboardListener.java @@ -19,6 +19,7 @@ package cn.hutool.v7.swing.clipboard; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; +import java.io.Serial; import java.io.Serializable; /** @@ -28,6 +29,7 @@ import java.io.Serializable; * @since 4.5.7 */ public abstract class StrClipboardListener implements ClipboardListener, Serializable { + @Serial private static final long serialVersionUID = 1L; @Override diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java index e55a89cf2..e43313b70 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/DisplayText.java @@ -19,6 +19,7 @@ package cn.hutool.v7.swing.img; import java.awt.Color; import java.awt.Font; import java.awt.Point; +import java.io.Serial; import java.io.Serializable; import java.util.Objects; @@ -29,6 +30,7 @@ import java.util.Objects; * @since 6.0.0 */ public class DisplayText implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java index aa4c7aef3..2221e4555 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/Img.java @@ -48,6 +48,7 @@ import java.nio.file.Path; * @since 4.1.5 */ public class Img implements Flushable, Serializable { + @Serial private static final long serialVersionUID = 1L; private final BufferedImage srcImage; diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java index dce067a62..74f7adbbc 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/img/RenderingHintsBuilder.java @@ -20,6 +20,7 @@ import cn.hutool.v7.core.lang.Assert; import cn.hutool.v7.core.lang.builder.Builder; import java.awt.RenderingHints; +import java.io.Serial; import java.util.HashMap; import java.util.Map; @@ -42,6 +43,7 @@ import java.util.Map; * @since 6.0.0 */ public class RenderingHintsBuilder implements Builder { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java index 0a842b409..d7346b809 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/qrcode/QrCodeException.java @@ -18,12 +18,15 @@ package cn.hutool.v7.swing.qrcode; import cn.hutool.v7.core.exception.HutoolException; +import java.io.Serial; + /** * Qrcode异常 * * @author Looly */ public class QrCodeException extends HutoolException { + @Serial private static final long serialVersionUID = 8247610319171014183L; /** diff --git a/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java index 49b64edcb..4f4ff170c 100644 --- a/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java +++ b/hutool-swing/src/test/java/cn/hutool/v7/swing/captcha/CaptchaUtilTest.java @@ -28,6 +28,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; import java.awt.image.BufferedImage; +import java.io.Serial; import java.util.concurrent.ThreadLocalRandom; public class CaptchaUtilTest { @@ -50,6 +51,7 @@ public class CaptchaUtilTest { } static class TestLineCaptcha extends AbstractCaptcha{ + @Serial private static final long serialVersionUID = -558846929114465692L; public TestLineCaptcha(final int width, final int height, final int codeCount, final int interfereCount) {