From f91f0f21df3fbe9a86e2580fc1862f8e9ee7957e Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 27 Oct 2025 01:47:24 +0800 Subject: [PATCH] fix code --- bin/check_dependency_updates.sh | 2 +- bin/cobertura.sh | 2 +- bin/commit.sh | 4 +- bin/deploy.sh | 2 +- bin/install.sh | 2 +- bin/javadoc.sh | 8 +-- bin/package.sh | 2 +- bin/push_master.sh | 2 +- bin/sync.sh | 2 +- bin/update_version.sh | 4 +- .../model/deepseek/DeepSeekServiceImpl.java | 2 +- .../v7/ai/model/doubao/DoubaoCommon.java | 22 ++++++-- .../v7/ai/model/doubao/DoubaoServiceImpl.java | 5 ++ .../hutool/v7/ai/model/grok/GrokCommon.java | 18 ++++++- .../hutool/v7/ai/model/grok/GrokConfig.java | 16 +++++- .../v7/ai/model/grok/GrokServiceImpl.java | 5 ++ .../v7/ai/model/doubao/DoubaoServiceTest.java | 9 ++-- .../v7/ai/model/grok/GrokServiceTest.java | 11 ++-- .../cn/hutool/v7/core/cache/SimpleCache.java | 2 +- .../v7/core/cache/file/LFUFileCache.java | 2 +- .../v7/core/cache/file/LRUFileCache.java | 2 +- .../cn/hutool/v7/core/cache/impl/NoCache.java | 2 +- .../cn/hutool/v7/core/codec/Number128.java | 3 +- .../hutool/v7/core/codec/hash/MurmurHash.java | 2 +- .../hutool/v7/core/collection/CollUtil.java | 2 +- .../queue/MemorySafeLinkedBlockingQueue.java | 2 +- .../v7/core/collection/set/SetUtil.java | 3 +- .../v7/core/convert/impl/EntryConverter.java | 6 +-- .../v7/core/convert/impl/PairConverter.java | 6 +-- .../impl/StackTraceElementConverter.java | 3 +- .../impl/TemporalAccessorConverter.java | 3 +- .../impl/XMLGregorianCalendarConverter.java | 3 +- .../masking/RichTextMaskingProcessor.java | 1 - .../java/cn/hutool/v7/core/date/DateUtil.java | 12 ++--- .../cn/hutool/v7/core/date/TemporalUtil.java | 1 - .../v7/core/date/format/FastDateFormat.java | 2 +- .../date/format/parser/RegexDateParser.java | 8 +-- .../java/cn/hutool/v7/core/io/LineReader.java | 2 +- .../cn/hutool/v7/core/io/ManifestUtil.java | 4 +- .../cn/hutool/v7/core/io/file/PathUtil.java | 2 +- .../v7/core/io/resource/JarResource.java | 3 +- .../v7/core/io/resource/ResourceFinder.java | 3 +- .../v7/core/io/stream/LineInputStream.java | 2 +- .../v7/core/io/watch/WatchServiceWrapper.java | 2 +- .../java/cn/hutool/v7/core/lang/Console.java | 6 +-- .../main/java/cn/hutool/v7/core/lang/Opt.java | 3 +- .../cn/hutool/v7/core/lang/range/Range.java | 10 ++-- .../java/cn/hutool/v7/core/map/AbsEntry.java | 3 +- .../java/cn/hutool/v7/core/map/MapUtil.java | 2 +- .../java/cn/hutool/v7/core/map/TableMap.java | 2 +- .../cn/hutool/v7/core/map/multi/AbsTable.java | 6 +-- .../core/map/multi/DirectedWeightGraph.java | 18 +++---- .../hutool/v7/core/map/multi/RowKeyTable.java | 2 +- .../map/reference/ReferenceConcurrentMap.java | 12 ++--- .../cn/hutool/v7/core/math/Calculator.java | 5 +- .../java/cn/hutool/v7/core/math/Fraction.java | 3 +- .../core/reflect/method/MethodTypeUtil.java | 3 +- .../hutool/v7/core/spi/ListServiceLoader.java | 2 +- .../hutool/v7/core/spi/MapServiceLoader.java | 2 +- .../cn/hutool/v7/core/stream/EasyStream.java | 3 +- .../core/stream/TerminableWrappedStream.java | 2 +- .../spliterators/TakeWhileSpliterator.java | 1 + .../cn/hutool/v7/core/text/CodePointIter.java | 18 ++----- .../java/cn/hutool/v7/core/text/dfa/NFA.java | 2 +- .../RecyclableBatchThreadPoolExecutor.java | 2 +- .../java/cn/hutool/v7/core/tree/MapTree.java | 4 +- .../GenericAnnotationMappingTest.java | 2 +- .../HierarchicalAnnotatedElementTest.java | 2 +- .../annotation/MetaAnnotatedElementTest.java | 8 +-- .../RepeatableMetaAnnotatedElementTest.java | 2 +- .../hutool/v7/core/array/ArrayUtilTest.java | 8 +-- .../cn/hutool/v7/core/bean/Issue3497Test.java | 2 +- .../cn/hutool/v7/core/cache/CacheTest.java | 8 ++- .../cn/hutool/v7/core/codec/MorseTest.java | 8 +-- .../core/collection/CollStreamUtilTest.java | 14 ++--- .../v7/core/collection/MapProxyTest.java | 4 +- .../v7/core/convert/ConvertOtherTest.java | 4 +- .../hutool/v7/core/convert/ConvertTest.java | 2 +- .../v7/core/convert/ConvertToArrayTest.java | 20 +++---- .../v7/core/convert/ConvertToBeanTest.java | 7 ++- .../core/convert/ConvertToCollectionTest.java | 16 +++--- .../v7/core/convert/DateConvertTest.java | 2 +- .../v7/core/convert/PrimitiveConvertTest.java | 4 +- .../hutool/v7/core/data/IdcardUtilTest.java | 2 +- .../cn/hutool/v7/core/data/id/NanoIdTest.java | 12 ++--- .../v7/core/date/BetweenFormatterTest.java | 25 ++++----- .../cn/hutool/v7/core/date/QuarterTest.java | 10 ++-- .../hutool/v7/core/func/LambdaUtilTest.java | 4 +- .../v7/core/func/PredicateUtilTest.java | 4 +- .../v7/core/io/file/FileSystemUtilTest.java | 2 +- .../hutool/v7/core/io/file/FileUtilTest.java | 12 ++--- .../cn/hutool/v7/core/lang/SingletonTest.java | 10 ++-- .../cn/hutool/v7/core/lang/ValidatorTest.java | 4 +- .../v7/core/lang/mutable/BaseMutableTest.java | 4 +- .../hutool/v7/core/lang/range/BoundTest.java | 8 +-- .../v7/core/lang/range/BoundedRangeTest.java | 2 +- .../hutool/v7/core/lang/range/RangeTest.java | 8 +-- .../v7/core/map/DirectedWeightGraphTest.java | 4 +- .../cn/hutool/v7/core/map/Issue2349Test.java | 4 +- .../cn/hutool/v7/core/map/MapBuilderTest.java | 4 +- .../cn/hutool/v7/core/map/MapUtilTest.java | 18 +++---- .../map/reference/WeakConcurrentMapTest.java | 4 +- .../hutool/v7/core/math/NumberUtilTest.java | 8 +-- .../v7/core/pool/PartitionObjectPoolTest.java | 2 +- .../v7/core/reflect/IssueI7CRIWTest.java | 4 +- .../v7/core/spi/ListServiceLoaderTest.java | 4 +- .../v7/core/spi/MapServiceLoaderTest.java | 4 +- .../AbstractEnhancedWrappedStreamTest.java | 6 +-- .../hutool/v7/core/stream/EasyStreamTest.java | 11 ++-- .../v7/core/stream/EntryStreamTest.java | 42 ++++++++------- .../hutool/v7/core/thread/RetryUtilTest.java | 4 +- .../v7/core/thread/SimpleSchedulerTest.java | 2 +- .../hutool/v7/core/thread/ThreadUtilTest.java | 4 +- .../cn/hutool/v7/core/util/ByteUtilTest.java | 2 +- .../hutool/v7/core/util/RandomUtilTest.java | 4 +- .../cn/hutool/v7/core/xml/XmlUtilTest.java | 38 +++++++------ .../cn/hutool/v7/crypto/asymmetric/Sign.java | 3 +- .../v7/crypto/asymmetric/SignAlgorithm.java | 53 ++++++++++++++++++- .../cn/hutool/v7/crypto/digest/BCrypt.java | 9 ++-- .../cn/hutool/v7/crypto/SignUtilTest.java | 51 +++++++++--------- .../src/main/java/cn/hutool/v7/db/Entity.java | 3 +- .../hutool/v7/db/ds/druid/DruidDSFactory.java | 2 +- .../v7/db/ds/pooled/PooledDataSource.java | 4 +- .../test/java/cn/hutool/v7/db/MySQLTest.java | 22 ++++---- .../test/java/cn/hutool/v7/db/PageTest.java | 4 +- .../cn/hutool/v7/db/QuoteWrapperTest.java | 6 +-- .../cn/hutool/v7/db/meta/MetaUtilTest.java | 2 +- .../cn/hutool/v7/db/sql/SqlFormatterTest.java | 9 ++-- .../v7/extra/mq/engine/jms/JmsConsumer.java | 40 +++++++------- .../cn/hutool/v7/extra/spring/SpringUtil.java | 3 +- .../template/engine/beetl/BeetlEngine.java | 1 - .../engine/jetbrick/JetbrickTemplate.java | 6 ++- .../engine/pebble/PebbleTemplate.java | 4 +- .../template/engine/rythm/RythmTemplate.java | 3 +- .../engine/thymeleaf/ThymeleafTemplate.java | 3 +- .../engine/velocity/VelocityTemplate.java | 3 +- .../template/engine/wit/WitTemplate.java | 6 ++- .../tokenizer/engine/hanlp/HanLPResult.java | 7 ++- .../v7/extra/spring/SpringUtilTest.java | 3 +- .../spring/SpringUtilWithAutoConfigTest.java | 3 +- .../v7/http/client/HeaderOperation.java | 4 +- .../client/cookie/ThreadLocalCookieStore.java | 2 +- .../engine/httpclient4/HttpClient4Engine.java | 3 +- .../engine/httpclient5/HttpClient5Engine.java | 3 +- .../client/engine/jdk/JdkHttpConnection.java | 3 +- .../java/cn/hutool/v7/http/meta/Method.java | 37 ++++++++++++- .../engine/undertow/UndertowEngine.java | 8 ++- .../v7/http/server/servlet/ServletUtil.java | 2 +- .../v7/json/engine/jackson/JacksonEngine.java | 2 +- .../json/serializer/impl/IterTypeAdapter.java | 8 +-- .../serializer/impl/TemporalTypeAdapter.java | 9 ++-- .../v7/json/support/JSONNodeBeanFactory.java | 3 +- .../java/cn/hutool/v7/json/JSONArrayTest.java | 4 +- .../cn/hutool/v7/json/JSONConvertTest.java | 2 +- .../java/cn/hutool/v7/json/JSONUtilTest.java | 20 +++---- .../hutool/v7/json/issues/Issue1101Test.java | 2 +- .../hutool/v7/json/issues/Issue3058Test.java | 6 ++- .../hutool/v7/json/issues/Issue3506Test.java | 2 +- .../hutool/v7/json/issues/Issue3795Test.java | 4 +- .../issues/issueIVMD5/IssueIVMD5Test.java | 6 ++- .../java/cn/hutool/v7/json/jwt/JWTTest.java | 5 +- .../cn/hutool/v7/json/jwt/JWTUtilTest.java | 3 +- .../bean/PerfectEvaluationProductResVo.java | 2 +- .../cn/hutool/v7/json/xml/Issue2748Test.java | 4 +- .../cn/hutool/v7/poi/excel/ExcelBase.java | 5 +- .../v7/poi/excel/sax/Excel03SaxReader.java | 9 ++-- .../java/cn/hutool/v7/setting/AbsSetting.java | 2 +- .../cn/hutool/v7/setting/toml/TomlWriter.java | 6 +-- .../cn/hutool/v7/setting/props/PropsTest.java | 8 +-- .../hutool/v7/socket/protocol/Protocol.java | 1 + .../java/cn/hutool/v7/swing/RobotUtil.java | 8 +-- 171 files changed, 587 insertions(+), 547 deletions(-) diff --git a/bin/check_dependency_updates.sh b/bin/check_dependency_updates.sh index f2d9f9bb0..32222a4b9 100755 --- a/bin/check_dependency_updates.sh +++ b/bin/check_dependency_updates.sh @@ -21,5 +21,5 @@ #-------------------------------------- # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh mvn versions:display-dependency-updates diff --git a/bin/cobertura.sh b/bin/cobertura.sh index ee8d1745b..1b107ef09 100755 --- a/bin/cobertura.sh +++ b/bin/cobertura.sh @@ -17,5 +17,5 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh exec mvn cobertura:cobertura diff --git a/bin/commit.sh b/bin/commit.sh index 493629994..4a26c8837 100755 --- a/bin/commit.sh +++ b/bin/commit.sh @@ -17,9 +17,9 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh git add . git commit -am "$1" -"$(dirname ${BASH_SOURCE[0]})"/push_dev.sh +"$(dirname "${BASH_SOURCE[0]}")"/push_dev.sh diff --git a/bin/deploy.sh b/bin/deploy.sh index 09b7ec3a1..ec836ac90 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -17,6 +17,6 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh mvn clean deploy -P release -Dhttps.protocols=TLSv1.2 diff --git a/bin/install.sh b/bin/install.sh index 2cd7d50d6..1ea6373a8 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -17,6 +17,6 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh exec mvn clean source:jar javadoc:javadoc install -Dmaven.test.skip=false -Dmaven.javadoc.skip=false -Dmaven.compile.fork=true diff --git a/bin/javadoc.sh b/bin/javadoc.sh index a6cf5032d..bb06dfa59 100755 --- a/bin/javadoc.sh +++ b/bin/javadoc.sh @@ -16,13 +16,13 @@ # limitations under the License. # -bin_home="$(dirname ${BASH_SOURCE[0]})" +bin_home="$(dirname "${BASH_SOURCE[0]}")" # show Hutool logo -$bin_home/logo.sh +"$bin_home"/logo.sh # 多模块聚合文档，生成在target/site/apidocs -exec mvn javadoc:aggregate +mvn javadoc:aggregate # 拷贝自定义的index.html到聚合文档目录 -cp -vf $bin_home/../docs/apidocs/index.html $bin_home/../target/reports/apidocs/ +cp -vf "$bin_home"/../docs/apidocs/index.html "$bin_home"/../target/reports/apidocs/ diff --git a/bin/package.sh b/bin/package.sh index 96c65fa41..3621a3caa 100755 --- a/bin/package.sh +++ b/bin/package.sh @@ -17,6 +17,6 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh exec mvn clean source:jar javadoc:javadoc package -Dmaven.test.skip=false -Dmaven.javadoc.skip=false diff --git a/bin/push_master.sh b/bin/push_master.sh index 69bfa9676..5f13ea7c6 100755 --- a/bin/push_master.sh +++ b/bin/push_master.sh @@ -17,7 +17,7 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh echo -e "\033[32mCheckout to v7-master\033[0m" git checkout v7-master diff --git a/bin/sync.sh b/bin/sync.sh index e138b6c6c..630d62394 100644 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -17,7 +17,7 @@ # # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh # 保证当前在v7-dev分支 git checkout v7-dev diff --git a/bin/update_version.sh b/bin/update_version.sh index 1f78fb422..ae5732968 100755 --- a/bin/update_version.sh +++ b/bin/update_version.sh @@ -23,7 +23,7 @@ #------------------------------------------------ # show Hutool logo -"$(dirname ${BASH_SOURCE[0]})"/logo.sh +"$(dirname "${BASH_SOURCE[0]}")"/logo.sh if [ -z "$1" ]; then echo "ERROR: 新版本不存在，请指定参数1" @@ -37,4 +37,4 @@ mvn versions:set -DnewVersion=$1 version=${1%-SNAPSHOT} # 替换其它地方的版本 -"$(dirname ${BASH_SOURCE[0]})"/replaceVersion.sh "$version" +"$(dirname "${BASH_SOURCE[0]}")"/replaceVersion.sh "$version" diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java index 75f59608a..34bf6478b 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/deepseek/DeepSeekServiceImpl.java @@ -78,7 +78,7 @@ public class DeepSeekServiceImpl extends BaseAIService implements DeepSeekServic @Override public void beta(String prompt, Consumer callback) { Map paramMap = buildBetaStreamRequestBody(prompt); - ThreadUtil.newThread(() -> sendPostStream(BETA_ENDPOINT, paramMap, callback::accept), "deepseek-beta-sse").start(); + ThreadUtil.newThread(() -> sendPostStream(BETA_ENDPOINT, paramMap, callback), "deepseek-beta-sse").start(); } @Override diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java index 1ebead8f1..6caa30904 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoCommon.java @@ -156,22 +156,38 @@ public class DoubaoCommon { private final String type; private final Object value; + /** + * 构造 + * + * @param type 参数类型 + * @param value 参数值 + */ DoubaoVideo(final String type, final Object value) { this.type = type; this.value = value; } + /** + * 获取参数类型 + * + * @return 参数类型 + */ public String getType() { return type; } + /** + * 获取参数值 + * + * @return 值 + */ public Object getValue() { if (value instanceof String) { - return (String) value; + return value; } else if (value instanceof Integer) { - return (Integer) value; + return value; } else if (value instanceof Boolean) { - return (Boolean) value; + return value; } return value; } diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java index 8aa32a82a..2f7733cf0 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceImpl.java @@ -59,6 +59,11 @@ public class DoubaoServiceImpl extends BaseAIService implements DoubaoService { //文生图 private static final String IMAGES_GENERATIONS = "/images/generations"; + /** + * 构造 + * + * @param config 配置 + */ public DoubaoServiceImpl(final AIConfig config) { //初始化doubao客户端 super(config); diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java index 7692537c9..0a241c56b 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokCommon.java @@ -24,11 +24,22 @@ package cn.hutool.v7.ai.model.grok; */ public class GrokCommon { - //grok视觉参数 + /** + * grok视觉参数 + */ public enum GrokVision { + /** + * 自动 + */ AUTO("auto"), + /** + * 低 + */ LOW("low"), + /** + * 高 + */ HIGH("high"); private final String detail; @@ -37,6 +48,11 @@ public class GrokCommon { this.detail = detail; } + /** + * 获取详情 + * + * @return 详情 + */ public String getDetail() { return detail; } diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java index 4a8584cf4..b43860f6d 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokConfig.java @@ -27,16 +27,28 @@ import cn.hutool.v7.ai.core.BaseAIConfig; */ public class GrokConfig extends BaseAIConfig { + /** + * API接口地址 + */ private final String API_URL = "https://api.x.ai/v1"; - + /** + * 默认模型 + */ private final String DEFAULT_MODEL = Models.Grok.GROK_2_1212.getModel(); - + /** + * 构造 + */ public GrokConfig() { setApiUrl(API_URL); setModel(DEFAULT_MODEL); } + /** + * 构造 + * + * @param apiKey API密钥 + */ public GrokConfig(String apiKey) { this(); setApiKey(apiKey); diff --git a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java index dc2f61a46..24e1f2f43 100644 --- a/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java +++ b/hutool-ai/src/main/java/cn/hutool/v7/ai/model/grok/GrokServiceImpl.java @@ -52,6 +52,11 @@ public class GrokServiceImpl extends BaseAIService implements GrokService { //文生图 private final String IMAGES_GENERATIONS = "/images/generations"; + /** + * 构造函数 + * + * @param config 配置 + */ public GrokServiceImpl(final AIConfig config) { //初始化grok客户端 super(config); diff --git a/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java index 9e97c0b1a..07182ba76 100644 --- a/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/doubao/DoubaoServiceTest.java @@ -26,9 +26,8 @@ import cn.hutool.v7.swing.img.ImgUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.awt.*; +import java.awt.Toolkit; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -85,7 +84,7 @@ class DoubaoServiceTest { final DoubaoService doubaoService = AIServiceFactory.getAIService(new AIConfigBuilder(ModelName.DOUBAO.getValue()) .setApiKey(key).setModel(Models.Doubao.DOUBAO_1_5_VISION_PRO_32K.getModel()).build(), DoubaoService.class); final String base64 = ImgUtil.toBase64DataUri(Toolkit.getDefaultToolkit().createImage("your imageUrl"), "png"); - final String chatVision = doubaoService.chatVision("图片上有些什么？", Arrays.asList(base64)); + final String chatVision = doubaoService.chatVision("图片上有些什么？", List.of(base64)); assertNotNull(chatVision); } @@ -96,7 +95,7 @@ class DoubaoServiceTest { .setApiKey(key).setModel(Models.Doubao.DOUBAO_1_5_VISION_PRO_32K.getModel()).build(), DoubaoService.class); String prompt = "图片上有些什么？"; - List images = Arrays.asList("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"); + List images = List.of("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"); // 使用AtomicBoolean作为结束标志 AtomicBoolean isDone = new AtomicBoolean(false); @@ -121,7 +120,7 @@ class DoubaoServiceTest { void testChatVision() { final DoubaoService doubaoService = AIServiceFactory.getAIService(new AIConfigBuilder(ModelName.DOUBAO.getValue()) .setApiKey(key).setModel(Models.Doubao.DOUBAO_1_5_VISION_PRO_32K.getModel()).build(), DoubaoService.class); - final String chatVision = doubaoService.chatVision("图片上有些什么？", Arrays.asList("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"),DoubaoCommon.DoubaoVision.HIGH.getDetail()); + final String chatVision = doubaoService.chatVision("图片上有些什么？", List.of("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"),DoubaoCommon.DoubaoVision.HIGH.getDetail()); assertNotNull(chatVision); } diff --git a/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java index d20d032ee..76c6c6b8a 100644 --- a/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java +++ b/hutool-ai/src/test/java/cn/hutool/v7/ai/model/grok/GrokServiceTest.java @@ -26,13 +26,12 @@ import cn.hutool.v7.swing.img.ImgUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import java.awt.*; +import java.awt.Toolkit; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; class GrokServiceTest { @@ -115,7 +114,7 @@ class GrokServiceTest { void chatVision() { final GrokService grokService = AIServiceFactory.getAIService(new AIConfigBuilder(ModelName.GROK.getValue()).setModel(Models.Grok.GROK_2_VISION_1212.getModel()).setApiKey(key).build(), GrokService.class); final String base64 = ImgUtil.toBase64DataUri(Toolkit.getDefaultToolkit().createImage("your imageUrl"), "png"); - final String chatVision = grokService.chatVision("图片上有些什么？", Arrays.asList(base64)); + final String chatVision = grokService.chatVision("图片上有些什么？", List.of(base64)); assertNotNull(chatVision); } @@ -124,7 +123,7 @@ class GrokServiceTest { void testChatVisionStream() { final GrokService grokService = AIServiceFactory.getAIService(new AIConfigBuilder(ModelName.GROK.getValue()).setModel(Models.Grok.GROK_2_VISION_1212.getModel()).setApiKey(key).build(), GrokService.class); String prompt = "图片上有些什么？"; - List images = Arrays.asList("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"); + List images = List.of("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544"); // 使用AtomicBoolean作为结束标志 AtomicBoolean isDone = new AtomicBoolean(false); @@ -148,7 +147,7 @@ class GrokServiceTest { @Disabled void testChatVision() { final GrokService grokService = AIServiceFactory.getAIService(new AIConfigBuilder(ModelName.GROK.getValue()).setModel(Models.Grok.GROK_2_VISION_1212.getModel()).setApiKey(key).build(), GrokService.class); - final String chatVision = grokService.chatVision("图片上有些什么？", Arrays.asList("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544")); + final String chatVision = grokService.chatVision("图片上有些什么？", List.of("https://img2.baidu.com/it/u=862000265,4064861820&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1544")); assertNotNull(chatVision); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java index b315525d7..358401144 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/SimpleCache.java @@ -207,7 +207,7 @@ public class SimpleCache implements Iterable>, Serializabl @Override public Iterator> iterator() { - return new TransIter<>(this.rawMap.entrySet().iterator(), (entry) -> new Map.Entry() { + return new TransIter<>(this.rawMap.entrySet().iterator(), (entry) -> new Map.Entry<>() { @Override public K getKey() { return entry.getKey().get(); 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 770ac8b77..d5dc6dcdc 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 @@ -63,7 +63,7 @@ public class LFUFileCache extends AbstractFileCache{ @Override protected Cache initCache() { - return new LFUCache(LFUFileCache.this.capacity, LFUFileCache.this.timeout) { + return new LFUCache<>(LFUFileCache.this.capacity, LFUFileCache.this.timeout) { @Serial private static final long serialVersionUID = 1L; 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 5256bb66e..21d7503b1 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 @@ -63,7 +63,7 @@ public class LRUFileCache extends AbstractFileCache{ @Override protected Cache initCache() { - return new LRUCache(LRUFileCache.this.capacity, super.timeout) { + return new LRUCache<>(LRUFileCache.this.capacity, super.timeout) { @Serial private static final long serialVersionUID = 1L; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java index 6841f1093..f15bb60f2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/cache/impl/NoCache.java @@ -75,7 +75,7 @@ public class NoCache implements Cache { @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { @Override public boolean hasNext() { return false; 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 528521da8..aa7e049ac 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 @@ -134,8 +134,7 @@ public class Number128 extends Number implements Comparable{ if (this == o) { return true; } - if (o instanceof Number128) { - final Number128 number128 = (Number128) o; + if (o instanceof Number128 number128) { return leastSigBits == number128.leastSigBits && mostSigBits == number128.mostSigBits; } return false; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java index aa025b7c9..54da091ea 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/codec/hash/MurmurHash.java @@ -268,7 +268,7 @@ public class MurmurHash implements Hash32, Hash64, Hash128 List> groupByFunc(final Collection collection, final Function getter) { - return group(collection, new Hash32() { + return group(collection, new Hash32<>() { private final List hashValList = new ArrayList<>(); @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java index 3ec059278..c0cc0a138 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/queue/MemorySafeLinkedBlockingQueue.java @@ -106,7 +106,7 @@ public class MemorySafeLinkedBlockingQueue extends CheckedLinkedBlockingQueue private static final FreeMemoryCalculator INSTANCE = new FreeMemoryCalculator(); FreeMemoryCalculator() { - super(new SimpleScheduler.Job() { + super(new SimpleScheduler.Job<>() { private volatile long maxAvailable = RuntimeUtil.getFreeMemory(); @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java index 804267a3c..c3aa6042b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/collection/set/SetUtil.java @@ -88,8 +88,7 @@ public class SetUtil { if (null == iterable) { return of(isLinked); } - if (iterable instanceof Collection) { - final Collection collection = (Collection) iterable; + if (iterable instanceof Collection collection) { return isLinked ? new LinkedHashSet<>(collection) : new HashSet<>(collection); } return of(isLinked, iterable.iterator()); 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 97b69fc71..12c688847 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 @@ -89,16 +89,14 @@ public class EntryConverter extends ConverterWithRoot implements MatcherConverte public Map.Entry convert(final Type targetType, final Type keyType, final Type valueType, final Object value) throws ConvertException { Map map = null; - if (value instanceof Map.Entry) { - final Map.Entry entry = (Map.Entry) value; + if (value instanceof Map.Entry entry) { map = MapUtil.of(entry.getKey(), entry.getValue()); } else if (value instanceof Pair) { final Pair entry = (Pair) value; map = MapUtil.of(entry.getLeft(), entry.getRight()); } else if (value instanceof Map) { map = (Map) value; - } else if (value instanceof CharSequence) { - final CharSequence str = (CharSequence) value; + } else if (value instanceof CharSequence str) { map = strToMap(str); } else if (BeanUtil.isWritableBean(value.getClass())) { // 一次性只读场景，包装为Map效率更高 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 f2d975d6e..572ed751f 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 @@ -80,16 +80,14 @@ public class PairConverter extends ConverterWithRoot implements Serializable { public Pair convert(final Type leftType, final Type rightType, final Object value) throws ConvertException { Map map = null; - if (value instanceof Map.Entry) { - final Map.Entry entry = (Map.Entry) value; + if (value instanceof Map.Entry entry) { map = MapUtil.of(entry.getKey(), entry.getValue()); } else if (value instanceof Pair) { final Pair entry = (Pair) value; map = MapUtil.of(entry.getLeft(), entry.getRight()); } else if (value instanceof Map) { map = (Map) value; - } else if (value instanceof CharSequence) { - final CharSequence str = (CharSequence) value; + } else if (value instanceof CharSequence str) { map = strToMap(str); } else if (BeanUtil.isReadableBean(value.getClass())) { // 一次性只读场景，包装为Map效率更高 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 833aa24b3..0e7c83941 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 @@ -36,8 +36,7 @@ public class StackTraceElementConverter extends AbstractConverter { @Override protected StackTraceElement convertInternal(final Class targetClass, final Object value) { - if (value instanceof Map) { - final Map map = (Map) value; + if (value instanceof Map map) { final String declaringClass = MapUtil.getStr(map, "className"); final String methodName = MapUtil.getStr(map, "methodName"); 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 5b5667275..94c1ffb1e 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 @@ -110,8 +110,7 @@ public class TemporalAccessorConverter extends AbstractConverter { } else if (value instanceof Date) { final DateTime dateTime = DateUtil.date((Date) value); return parseFromInstant(targetClass, dateTime.toInstant(), dateTime.getZoneId()); - } else if (value instanceof Calendar) { - final Calendar calendar = (Calendar) value; + } else if (value instanceof Calendar calendar) { return parseFromInstant(targetClass, calendar.toInstant(), calendar.getTimeZone().toZoneId()); } else { return parseFromCharSequence(targetClass, convertToStr(value)); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java index 76a9ecd27..9d318e9b7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/convert/impl/XMLGregorianCalendarConverter.java @@ -87,8 +87,7 @@ public class XMLGregorianCalendarConverter extends AbstractConverter { // Handle Date if (value instanceof Date) { gregorianCalendar.setTime((Date) value); - } else if (value instanceof Calendar) { - final Calendar calendar = (Calendar) value; + } else if (value instanceof Calendar calendar) { gregorianCalendar.setTimeZone(calendar.getTimeZone()); gregorianCalendar.setFirstDayOfWeek(calendar.getFirstDayOfWeek()); gregorianCalendar.setLenient(calendar.isLenient()); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/RichTextMaskingProcessor.java b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/RichTextMaskingProcessor.java index 476049c74..894c5b628 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/RichTextMaskingProcessor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/data/masking/RichTextMaskingProcessor.java @@ -243,7 +243,6 @@ public class RichTextMaskingProcessor { case REPLACE -> // 替换脱敏，用指定文本替换 rule.getReplacement(); - default -> matched; }; // 处理正则表达式中的特殊字符 diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java index 16d10b9f8..5dd5a143b 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/DateUtil.java @@ -1674,8 +1674,8 @@ public class DateUtil { * @since 5.7.21 */ public static List rangeContains(final DateRange start, final DateRange end) { - final List startDateTimes = ListUtil.of((Iterable) start); - final List endDateTimes = ListUtil.of((Iterable) end); + final List startDateTimes = ListUtil.of(start); + final List endDateTimes = ListUtil.of(end); return startDateTimes.stream().filter(endDateTimes::contains).collect(Collectors.toList()); } @@ -1689,8 +1689,8 @@ public class DateUtil { * @since 5.7.21 */ public static List rangeNotContains(final DateRange start, final DateRange end) { - final List startDateTimes = ListUtil.of((Iterable) start); - final List endDateTimes = ListUtil.of((Iterable) end); + final List startDateTimes = ListUtil.of(start); + final List endDateTimes = ListUtil.of(end); return endDateTimes.stream().filter(item -> !startDateTimes.contains(item)).collect(Collectors.toList()); } @@ -1741,7 +1741,7 @@ public class DateUtil { * @return {@link DateRange} */ public static List rangeToList(final Date start, final Date end, final DateField unit) { - return ListUtil.of((Iterable) range(start, end, unit)); + return ListUtil.of(range(start, end, unit)); } /** @@ -1755,7 +1755,7 @@ public class DateUtil { * @since 5.7.16 */ public static List rangeToList(final Date start, final Date end, final DateField unit, final int step) { - return ListUtil.of((Iterable) new DateRange(start, end, unit, step)); + return ListUtil.of(new DateRange(start, end, unit, step)); } // endregion diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java index 7feb67e7e..cfb84c6d7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/TemporalUtil.java @@ -79,7 +79,6 @@ public class TemporalUtil { case MINUTES -> ChronoUnit.MINUTES; case HOURS -> ChronoUnit.HOURS; case DAYS -> ChronoUnit.DAYS; - default -> throw new IllegalArgumentException("Unknown TimeUnit constant"); }; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java index 2a2f96572..4bb36c42e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/FastDateFormat.java @@ -70,7 +70,7 @@ public class FastDateFormat extends Format implements PositionDateParser, DatePr */ public static final int SHORT = DateFormat.SHORT; - private static final FormatCache CACHE = new FormatCache() { + private static final FormatCache CACHE = new FormatCache<>() { @Override protected FastDateFormat createInstance(final String pattern, final TimeZone timeZone, final Locale locale) { return new FastDateFormat(pattern, timeZone, locale); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java index 7cf79b02b..1c08b66df 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/date/format/parser/RegexDateParser.java @@ -233,9 +233,7 @@ public class RegexDateParser implements DateParser, Serializable { }); // zone（包括可时区名称、时区偏移等信息，综合解析） - Opt.ofNullable(ReUtil.group(matcher, "zone")).ifPresent((zoneOffset) -> { - parseZone(zoneOffset, dateBuilder); - }); + Opt.ofNullable(ReUtil.group(matcher, "zone")).ifPresent((zoneOffset) -> parseZone(zoneOffset, dateBuilder)); // zone offset Opt.ofNullable(ReUtil.group(matcher, "zoneOffset")).ifPresent((zoneOffset) -> { @@ -244,9 +242,7 @@ public class RegexDateParser implements DateParser, Serializable { }); // unix时间戳，可能有NS - Opt.ofNullable(ReUtil.group(matcher, "unixsecond")).ifPresent((unixsecond) -> { - dateBuilder.setUnixsecond(parseLong(unixsecond)); - }); + Opt.ofNullable(ReUtil.group(matcher, "unixsecond")).ifPresent((unixsecond) -> dateBuilder.setUnixsecond(parseLong(unixsecond))); } /** diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java index 39391c93e..a5c14d141 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/LineReader.java @@ -117,7 +117,7 @@ public class LineReader extends ReaderWrapper implements Iterable { @Override public Iterator iterator() { - return new ComputeIter() { + return new ComputeIter<>() { @Override protected String computeNext() { try { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java index 442da69a6..9deb19c0a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/ManifestUtil.java @@ -16,7 +16,6 @@ package cn.hutool.v7.core.io; -import cn.hutool.v7.core.io.IORuntimeException; import cn.hutool.v7.core.io.resource.ResourceUtil; import java.io.File; @@ -56,8 +55,7 @@ public class ManifestUtil { throw new IORuntimeException(e); } - if (connection instanceof JarURLConnection) { - final JarURLConnection conn = (JarURLConnection) connection; + if (connection instanceof JarURLConnection conn) { return getManifest(conn); } return null; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java index d39f28f72..6da49a77d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/PathUtil.java @@ -169,7 +169,7 @@ public class PathUtil { return fileList; } - walkFiles(path, maxDepth, isFollowLinks, new SimpleFileVisitor() { + walkFiles(path, maxDepth, isFollowLinks, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(final Path path, final BasicFileAttributes attrs) { 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 02366e911..dffc93792 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 @@ -89,8 +89,7 @@ public class JarResource extends UrlResource { */ private JarFile doGetJarFile() throws IOException { final URLConnection con = getUrl().openConnection(); - if (con instanceof JarURLConnection) { - final JarURLConnection jarCon = (JarURLConnection) con; + if (con instanceof JarURLConnection jarCon) { return jarCon.getJarFile(); } else { final String urlFile = getUrl().getFile(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java index aaa4a9a2a..43170d2b0 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceFinder.java @@ -127,8 +127,7 @@ public class ResourceFinder { String rootEntryPath; final boolean closeJarFile; - if (conn instanceof JarURLConnection) { - final JarURLConnection jarCon = (JarURLConnection) conn; + if (conn instanceof JarURLConnection jarCon) { UrlUtil.useCachesIfNecessary(jarCon); jarFile = jarCon.getJarFile(); final JarEntry jarEntry = jarCon.getJarEntry(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java index a071729f9..79fc17434 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/stream/LineInputStream.java @@ -85,7 +85,7 @@ public class LineInputStream extends FilterInputStream implements Iterable iterator() { - return new ComputeIter() { + return new ComputeIter<>() { @Override protected byte[] computeNext() { return readLine(); 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 d9d0fe67b..2ac109115 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 @@ -193,7 +193,7 @@ public class WatchServiceWrapper extends SimpleWrapper implements } // 递归注册下一层层级的目录和文件 - PathUtil.walkFiles(path, maxDepth, new SimpleFileVisitor() { + PathUtil.walkFiles(path, maxDepth, new SimpleFileVisitor<>() { @SuppressWarnings("resource") @Override public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java index 1c48d195e..450329238 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Console.java @@ -52,8 +52,7 @@ public class Console { * @param obj 要打印的对象 */ public static void log(final Object obj) { - if (obj instanceof Throwable) { - final Throwable e = (Throwable) obj; + if (obj instanceof Throwable e) { log(e, e.getMessage()); } else { log(TEMPLATE_VAR, obj); @@ -220,8 +219,7 @@ public class Console { * @param obj 要打印的对象 */ public static void error(final Object obj) { - if (obj instanceof Throwable) { - final Throwable e = (Throwable) obj; + if (obj instanceof Throwable e) { error(e, e.getMessage()); } else { error(TEMPLATE_VAR, obj); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java index cf70e75b9..1a4c86153 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/lang/Opt.java @@ -541,11 +541,10 @@ public class Opt { return true; } - if (!(obj instanceof Opt)) { + if (!(obj instanceof Opt other)) { return false; } - final Opt other = (Opt) obj; return Objects.equals(value, other.value); } 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 69722e36e..397c5256f 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 @@ -102,7 +102,7 @@ public class Range implements Iterable, Serializable { @Override public Iterator iterator() { - return new Iterator(){ + return new Iterator<>() { /** * 下一个对象 */ @@ -142,11 +142,11 @@ public class Range implements Iterable, Serializable { */ private T nextUncheck() { final T current; - if(0 == this.index){ + if (0 == this.index) { current = start; - if(!includeStart){ + if (!includeStart) { // 获取下一组元素 - index ++; + index++; return nextUncheck(); } } else { @@ -161,7 +161,7 @@ public class Range implements Iterable, Serializable { /** * 不抛异常的获取下一步进的元素，如果获取失败返回{@code null} * - * @param base 上一个元素 + * @param base 上一个元素 * @return 下一步进 */ private T safeStep(final T base) { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java index b5f210957..89ac5dd04 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/AbsEntry.java @@ -39,8 +39,7 @@ public abstract class AbsEntry implements Map.Entry { @Override public boolean equals(final Object object) { - if (object instanceof Map.Entry) { - final Map.Entry that = (Map.Entry) object; + if (object instanceof Map.Entry that) { return ObjUtil.equals(this.getKey(), that.getKey()) && ObjUtil.equals(this.getValue(), that.getValue()); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java index d5bd36b02..bd1eaff8a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/MapUtil.java @@ -772,7 +772,7 @@ public class MapUtil extends MapGetUtil { * @since 3.2.2 */ public static Map reverse(final Map map) { - return edit(map, t -> new Entry() { + return edit(map, t -> new Entry<>() { @Override public T getKey() { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java index ec7be0d64..e27821955 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/TableMap.java @@ -243,7 +243,7 @@ public class TableMap implements Map, Iterable>, Ser @Override public Iterator> iterator() { - return new Iterator>() { + return new Iterator<>() { private final Iterator keysIter = keys.iterator(); private final Iterator valuesIter = values.iterator(); 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 fb11fa196..66fc5283a 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 @@ -54,8 +54,7 @@ public abstract class AbsTable implements Table { public boolean equals(final Object obj) { if (obj == this) { return true; - } else if (obj instanceof Table) { - final Table that = (Table) obj; + } else if (obj instanceof Table that) { return this.cellSet().equals(that.cellSet()); } else { return false; @@ -232,8 +231,7 @@ public abstract class AbsTable implements Table { if (obj == this) { return true; } - if (obj instanceof Cell) { - final Cell other = (Cell) obj; + if (obj instanceof Cell other) { return ObjUtil.equals(rowKey, other.getRowKey()) && ObjUtil.equals(columnKey, other.getColumnKey()) && ObjUtil.equals(value, other.getValue()); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java index 6503f7478..5e8dda7b8 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/DirectedWeightGraph.java @@ -73,9 +73,7 @@ public class DirectedWeightGraph { allPoints.clear(); neighborEdgeMap.forEach((f, m) -> { allPoints.add(f); - m.forEach((t, e) -> { - allPoints.add(t); - }); + m.forEach((t, e) -> allPoints.add(t)); }); } @@ -87,20 +85,16 @@ public class DirectedWeightGraph { public void removePoint(final T point) { allPoints.remove(point); neighborEdgeMap.remove(point); - neighborEdgeMap.forEach((f, m) -> { - m.remove(point); - }); + neighborEdgeMap.forEach((f, m) -> m.remove(point)); } @Override public String toString() { final StringBuilder builder = new StringBuilder(); - neighborEdgeMap.forEach((from, edgeMap) -> { - edgeMap.forEach((to, edge) -> { - builder.append(edge); - builder.append("\r\n"); - }); - }); + neighborEdgeMap.forEach((from, edgeMap) -> edgeMap.forEach((to, edge) -> { + builder.append(edge); + builder.append("\r\n"); + })); return builder.toString(); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java index f89e02ece..348dac7a9 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/multi/RowKeyTable.java @@ -271,7 +271,7 @@ public class RowKeyTable extends AbsTable { while (iterator.hasNext()) { final Entry> entry = iterator.next(); if (entry.getValue().containsKey(columnKey)) { - return new AbsEntry() { + return new AbsEntry<>() { @Override public R getKey() { return entry.getKey(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java index 85798f921..b9d9596db 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/map/reference/ReferenceConcurrentMap.java @@ -212,11 +212,11 @@ public abstract class ReferenceConcurrentMap implements ConcurrentMap keySet() { this.purgeStale(); final Set> referenceSet = this.raw.keySet(); - return new AbstractSet() { + return new AbstractSet<>() { @Override public Iterator iterator() { final Iterator> referenceIter = referenceSet.iterator(); - return new Iterator() { + return new Iterator<>() { @Override public boolean hasNext() { return referenceIter.hasNext(); @@ -240,11 +240,11 @@ public abstract class ReferenceConcurrentMap implements ConcurrentMap values() { this.purgeStale(); final Collection> referenceValues = this.raw.values(); - return new AbstractCollection() { + return new AbstractCollection<>() { @Override public Iterator iterator() { final Iterator> referenceIter = referenceValues.iterator(); - return new Iterator() { + return new Iterator<>() { @Override public boolean hasNext() { return referenceIter.hasNext(); @@ -268,7 +268,7 @@ public abstract class ReferenceConcurrentMap implements ConcurrentMap> entrySet() { this.purgeStale(); final Set, Ref>> referenceEntrySet = this.raw.entrySet(); - return new AbstractSet>() { + return new AbstractSet<>() { @Override public Iterator> iterator() { final Iterator, Ref>> referenceIter = referenceEntrySet.iterator(); @@ -281,7 +281,7 @@ public abstract class ReferenceConcurrentMap implements ConcurrentMap next() { final Entry, Ref> next = referenceIter.next(); - return new Entry() { + return new Entry<>() { @Override public K getKey() { return unwrap(next.getKey()); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java index 9724006aa..1e953057c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/math/Calculator.java @@ -25,7 +25,7 @@ import java.util.Stack; /** * 数学表达式计算工具类
- * 见：https://github.com/chinabugotech/hutool/issues/1090#issuecomment-693750140 + * 见：issues#1090#issuecomment-693750140 * * @author trainliang, Looly * @since 5.4.3 @@ -165,7 +165,7 @@ public class Calculator { * @return 结果 */ private BigDecimal calculate(final String firstValue, final String secondValue, final char currentOp) { - final BigDecimal result = switch (currentOp) { + return switch (currentOp) { case '+' -> NumberUtil.add(firstValue, secondValue); case '-' -> NumberUtil.sub(firstValue, secondValue); case '*' -> NumberUtil.mul(firstValue, secondValue); @@ -173,7 +173,6 @@ public class Calculator { case '%' -> NumberUtil.toBigDecimal(firstValue).remainder(NumberUtil.toBigDecimal(secondValue)); default -> throw new IllegalStateException("Unexpected value: " + currentOp); }; - return result; } /** 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 f85c95a7c..db7d4e7ff 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 @@ -618,10 +618,9 @@ public final class Fraction extends Number implements Comparable { if (obj == this) { return true; } - if (!(obj instanceof Fraction)) { + if (!(obj instanceof Fraction other)) { return false; } - final Fraction other = (Fraction) obj; return getNumerator() == other.getNumerator() && getDenominator() == other.getDenominator(); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java index ab5f2d279..3ebdc15f9 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/reflect/method/MethodTypeUtil.java @@ -60,8 +60,7 @@ public class MethodTypeUtil { if (null == declaringClass) { declaringClass = executable.getDeclaringClass(); } - if (executable instanceof Method) { - final Method method = (Method) executable; + if (executable instanceof Method method) { return MethodType.methodType(method.getReturnType(), declaringClass, method.getParameterTypes()); } else { final Constructor constructor = (Constructor) executable; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java index cb5f5574a..d3910d954 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/ListServiceLoader.java @@ -184,7 +184,7 @@ public class ListServiceLoader extends AbsServiceLoader { @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { private final Iterator nameIter = serviceNames.iterator(); @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java index a9a8ea5ef..c4e81473a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/spi/MapServiceLoader.java @@ -156,7 +156,7 @@ public class MapServiceLoader extends AbsServiceLoader { @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { private final Iterator nameIter = serviceProperties.stringPropertyNames().iterator(); diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java index 639a3495f..8b18a94e7 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/EasyStream.java @@ -100,7 +100,7 @@ public class EasyStream extends AbstractEnhancedWrappedStream Builder builder() { - return new Builder() { + return new Builder<>() { @Serial private static final long serialVersionUID = 1L; private final Stream.Builder streamBuilder = Stream.builder(); @@ -473,6 +473,7 @@ public class EasyStream extends AbstractEnhancedWrappedStream 元素类型 */ public interface Builder extends Consumer, cn.hutool.v7.core.lang.builder.Builder> { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java index cd791883d..63cf5b079 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/stream/TerminableWrappedStream.java @@ -347,7 +347,7 @@ public interface TerminableWrappedStream 元素类型 */ public class TakeWhileSpliterator implements Spliterator { diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java index 5e7144447..95c40d99e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/CodePointIter.java @@ -20,26 +20,16 @@ import java.util.Iterator; /** * Unicode字符遍历器
- * 参考：http://stackoverflow.com/a/21791059/6030888 + * 参考：http://stackoverflow.com/a/21791059/6030888 * * @author Looly + * @param str */ -public class CodePointIter implements Iterable { - - final String str; - - /** - * 构造 - * - * @param str 字符串 - */ - public CodePointIter(final String str) { - this.str = str; - } +public record CodePointIter(String str) implements Iterable { @Override public Iterator iterator() { - return new Iterator() { + return new Iterator<>() { private final int length = str.length(); private int nextIndex = 0; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java index 4da261a42..c1a97fbf2 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/text/dfa/NFA.java @@ -148,7 +148,7 @@ public class NFA { } } final List ans = new ArrayList<>(); - Node p = root, k = null; + Node p = root, k; for (int i = 0, len = text.length(); i < len; i++) { final int ind = text.charAt(i); // 状态转移(沿着fail指针链接的链表，此处区别于DFA模型) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/thread/RecyclableBatchThreadPoolExecutor.java b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RecyclableBatchThreadPoolExecutor.java index a7320cbd8..ad09b2501 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/thread/RecyclableBatchThreadPoolExecutor.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/thread/RecyclableBatchThreadPoolExecutor.java @@ -225,7 +225,7 @@ public class RecyclableBatchThreadPoolExecutor { */ private static List> splitData(final List data, final int batchSize) { final int batchCount = (data.size() + batchSize - 1) / batchSize; - return new AbstractList>() { + return new AbstractList<>() { @Override public List get(final int index) { final int from = index * batchSize; 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 cb907642c..a06ff618e 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 @@ -386,9 +386,7 @@ public class MapTree extends LinkedHashMap implements Node return null; } final List> newChildren = new ArrayList<>(children.size()); - children.forEach((t) -> { - newChildren.add(t.cloneTree().setParent(parent)); - }); + children.forEach((t) -> newChildren.add(t.cloneTree().setParent(parent))); return newChildren; } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java index 8660a022c..04b435c7e 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/GenericAnnotationMappingTest.java @@ -37,7 +37,7 @@ public class GenericAnnotationMappingTest { public void testEquals() { final Annotation1 annotation = Foo.class.getAnnotation(Annotation1.class); final GenericAnnotationMapping mapping = GenericAnnotationMapping.create(annotation, false); - Assertions.assertNotEquals(mapping, null); + Assertions.assertNotEquals(null, mapping); Assertions.assertEquals(mapping, GenericAnnotationMapping.create(annotation, false)); Assertions.assertNotEquals(mapping, GenericAnnotationMapping.create(annotation, true)); } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java index ad8afce76..c6a4a7d67 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/HierarchicalAnnotatedElementTest.java @@ -67,7 +67,7 @@ public class HierarchicalAnnotatedElementTest { Assertions.assertEquals(elements, HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY)); Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.of(Super.class, ELEMENT_MAPPING_FACTORY)); Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.of(Foo.class, (es, e) -> e)); - Assertions.assertNotEquals(elements, null); + Assertions.assertNotEquals(null, elements); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java index 403af4082..4e91f7e1d 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/MetaAnnotatedElementTest.java @@ -44,10 +44,10 @@ public class MetaAnnotatedElementTest { @Test public void testEquals() { final AnnotatedElement element = new MetaAnnotatedElement<>(Foo.class, RESOLVED_MAPPING_FACTORY); - Assertions.assertNotEquals(element, null); - Assertions.assertEquals(element, new MetaAnnotatedElement<>(Foo.class, RESOLVED_MAPPING_FACTORY)); - Assertions.assertNotEquals(element, new MetaAnnotatedElement<>(Foo.class, MAPPING_FACTORY)); - Assertions.assertNotEquals(element, new MetaAnnotatedElement<>(Annotation1.class, MAPPING_FACTORY)); + Assertions.assertNotEquals(null, element); + Assertions.assertEquals(new MetaAnnotatedElement<>(Foo.class, RESOLVED_MAPPING_FACTORY), element); + Assertions.assertNotEquals(new MetaAnnotatedElement<>(Foo.class, MAPPING_FACTORY), element); + Assertions.assertNotEquals(new MetaAnnotatedElement<>(Annotation1.class, MAPPING_FACTORY), element); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java index fa616a992..1ab993a57 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/annotation/RepeatableMetaAnnotatedElementTest.java @@ -46,7 +46,7 @@ public class RepeatableMetaAnnotatedElementTest { @Test public void testEquals() { final AnnotatedElement element = RepeatableMetaAnnotatedElement.create(Foo.class, RESOLVED_MAPPING_FACTORY); - Assertions.assertNotEquals(element, null); + Assertions.assertNotEquals(null, element); Assertions.assertEquals(element, RepeatableMetaAnnotatedElement.create(Foo.class, RESOLVED_MAPPING_FACTORY)); Assertions.assertNotEquals(element, RepeatableMetaAnnotatedElement.create(Foo.class, MAPPING_FACTORY)); Assertions.assertNotEquals(element, RepeatableMetaAnnotatedElement.create(Annotation1.class, MAPPING_FACTORY)); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java index ee4dab905..bc929348f 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/array/ArrayUtilTest.java @@ -104,21 +104,21 @@ public class ArrayUtilTest { public void filterEditTest() { final Integer[] a = {1, 2, 3, 4, 5, 6}; final Integer[] filter = ArrayUtil.edit(a, t -> (t % 2 == 0) ? t : null); - assertArrayEquals(filter, new Integer[]{2, 4, 6}); + assertArrayEquals(new Integer[]{2, 4, 6}, filter); } @Test public void filterTestForFilter() { final Integer[] a = {1, 2, 3, 4, 5, 6}; final Integer[] filter = ArrayUtil.filter(a, t -> t % 2 == 0); - assertArrayEquals(filter, new Integer[]{2, 4, 6}); + assertArrayEquals(new Integer[]{2, 4, 6}, filter); } @Test public void editTest() { final Integer[] a = {1, 2, 3, 4, 5, 6}; final Integer[] filter = ArrayUtil.edit(a, t -> (t % 2 == 0) ? t * 10 : t); - assertArrayEquals(filter, new Integer[]{1, 20, 3, 40, 5, 60}); + assertArrayEquals(new Integer[]{1, 20, 3, 40, 5, 60}, filter); } @Test @@ -227,7 +227,7 @@ public class ArrayUtilTest { final String[] keys = {"a", "b", "c"}; final Integer[] values = {1, 2, 3}; final Map map = ArrayUtil.zip(keys, values, true); - assertEquals(Objects.requireNonNull(map).toString(), "{a=1, b=2, c=3}"); + assertEquals("{a=1, b=2, c=3}", Objects.requireNonNull(map).toString()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java index 0a01f1990..07f795bc8 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/bean/Issue3497Test.java @@ -33,7 +33,7 @@ public class Issue3497Test { entry.setKey(StrUtil.toCamelCase(entry.getKey().toString())); return entry; })); - Assertions.assertEquals(bean.toString(), "{aB=1}"); + Assertions.assertEquals("{aB=1}", bean.toString()); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java index e33cfab24..4419f833c 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/cache/CacheTest.java @@ -145,7 +145,7 @@ public class CacheTest { /** * TimedCache的数据过期后不是每次都触发监听器onRemove，而是偶尔触发onRemove - * https://gitee.com/chinabugotech/hutool/issues/IBP752 + * issues#IBP752 */ @Test public void whenContainsKeyTimeoutShouldCallOnRemove() { @@ -153,9 +153,7 @@ public class CacheTest { final TimedCache ALARM_CACHE = new TimedCache<>(timeout); final AtomicInteger counter = new AtomicInteger(0); - ALARM_CACHE.setListener((key, value) -> { - counter.incrementAndGet(); - }); + ALARM_CACHE.setListener((key, value) -> counter.incrementAndGet()); ALARM_CACHE.put(1, "value1"); @@ -167,7 +165,7 @@ public class CacheTest { /** * ReentrantCache类clear()方法、AbstractCache.putWithoutLock方法可能导致资源泄露 - * https://github.com/chinabugotech/hutool/issues/3957 + * issues#3957 */ @Test public void reentrantCacheClearMethodTest() { diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java index 7cd91d18f..6f184104c 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/codec/MorseTest.java @@ -35,15 +35,15 @@ public class MorseTest { public void test1() { final String text = "你好，世界！"; final String morse = "-..----.--...../-.--..-.-----.-/--------....--../-..---....-.--./---.-.-.-..--../--------.......-/"; - Assertions.assertEquals(morseCoder.encode(text), morse); - Assertions.assertEquals(morseCoder.decode(morse), text); + Assertions.assertEquals(morse, morseCoder.encode(text)); + Assertions.assertEquals(text, morseCoder.decode(morse)); } @Test public void test2() { final String text = "こんにちは"; final String morse = "--.....-.-..--/--....-..-..--/--.....--.-.--/--.....--....-/--.....--.----/"; - Assertions.assertEquals(morseCoder.encode(text), morse); - Assertions.assertEquals(morseCoder.decode(morse), text); + Assertions.assertEquals(morse, morseCoder.encode(text)); + Assertions.assertEquals(text, morseCoder.decode(morse)); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java index a8bf3faf1..53dc77e84 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/CollStreamUtilTest.java @@ -172,13 +172,15 @@ public class CollStreamUtilTest { // 对null友好 final Map> termIdClassIdStudentMap = CollStreamUtil.group2Map(Arrays.asList(null, new Student(2, 2, 1, "王五")), Student::getTermId, Student::getClassId); - final Map> termIdClassIdStudentCompareMap = new HashMap>() { + final Map> termIdClassIdStudentCompareMap = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; + { - put(null, MapUtil.empty()); - put(2L, MapUtil.of(2L, new Student(2, 2, 1, "王五"))); - }}; + put(null, MapUtil.empty()); + put(2L, MapUtil.of(2L, new Student(2, 2, 1, "王五"))); + } + }; assertEquals(termIdClassIdStudentCompareMap, termIdClassIdStudentMap); } @@ -375,9 +377,7 @@ public class CollStreamUtilTest { list.add(null); list.add(new Student(1, 2, 2L, null)); - assertThrows(NullPointerException.class, () -> { - CollStreamUtil.toMap(list, Student::getStudentId, Student::getName); - }); + assertThrows(NullPointerException.class, () -> CollStreamUtil.toMap(list, Student::getStudentId, Student::getName)); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java index e793580b6..3ec255193 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/collection/MapProxyTest.java @@ -57,7 +57,7 @@ public class MapProxyTest { public void classProxyTest() { final Student student = MapProxy.of(new HashMap<>()).toProxyBean(Student.class); student.setName("小明").setAge(18); - Assertions.assertEquals(student.getAge(), 18); - Assertions.assertEquals(student.getName(), "小明"); + Assertions.assertEquals(18, student.getAge()); + Assertions.assertEquals("小明", student.getName()); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java index 0bdc87cef..a6d6f1ba8 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertOtherTest.java @@ -46,7 +46,7 @@ public class ConvertOtherTest { Assertions.assertEquals("\\u6211\\u662f\\u4e00\\u4e2a\\u5c0f\\u5c0f\\u7684\\u53ef\\u7231\\u7684\\u5b57\\u7b26\\u4e32", unicode); final String raw = ConvertUtil.unicodeToStr(unicode); - Assertions.assertEquals(raw, a); + Assertions.assertEquals(a, raw); // 针对有特殊空白符的Unicode final String str = "你 好"; @@ -63,7 +63,7 @@ public class ConvertOtherTest { // 转换后result为乱码 final String result = ConvertUtil.convertCharset(a, CharsetUtil.NAME_UTF_8, CharsetUtil.NAME_ISO_8859_1); final String raw = ConvertUtil.convertCharset(result, CharsetUtil.NAME_ISO_8859_1, "UTF-8"); - Assertions.assertEquals(raw, a); + Assertions.assertEquals(a, raw); } @Test 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 e58b77f50..1422be745 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 @@ -353,7 +353,7 @@ public class ConvertTest { @Test public void toSetTest(){ - final Set result = ConvertUtil.convert(new TypeReference>() { + final Set result = ConvertUtil.convert(new TypeReference<>() { }, "1,2,3"); assertEquals(SetUtil.of(1,2,3), result); } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java index d782eeb85..e7e9ef925 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToArrayTest.java @@ -41,14 +41,14 @@ public class ConvertToArrayTest { final String[] b = { "1", "2", "3", "4" }; final Integer[] integerArray = ConvertUtil.toIntArray(b); - Assertions.assertArrayEquals(integerArray, new Integer[]{1,2,3,4}); + Assertions.assertArrayEquals(new Integer[]{1,2,3,4}, integerArray); final int[] intArray = ConvertUtil.convert(int[].class, b); - Assertions.assertArrayEquals(intArray, new int[]{1,2,3,4}); + Assertions.assertArrayEquals(new int[]{1,2,3,4}, intArray); final long[] c = {1,2,3,4,5}; final Integer[] intArray2 = ConvertUtil.toIntArray(c); - Assertions.assertArrayEquals(intArray2, new Integer[]{1,2,3,4,5}); + Assertions.assertArrayEquals(new Integer[]{1,2,3,4,5}, intArray2); } @Test @@ -57,7 +57,7 @@ public class ConvertToArrayTest { final ArrayConverter arrayConverter = new ArrayConverter(true); final Integer[] integerArray = arrayConverter.convert(Integer[].class, b, null); - Assertions.assertArrayEquals(integerArray, new Integer[]{null, 1}); + Assertions.assertArrayEquals(new Integer[]{null, 1}, integerArray); } @Test @@ -65,14 +65,14 @@ public class ConvertToArrayTest { final String[] b = { "1", "2", "3", "4" }; final Long[] longArray = ConvertUtil.toLongArray(b); - Assertions.assertArrayEquals(longArray, new Long[]{1L,2L,3L,4L}); + Assertions.assertArrayEquals(new Long[]{1L,2L,3L,4L}, longArray); final long[] longArray2 = ConvertUtil.convert(long[].class, b); - Assertions.assertArrayEquals(longArray2, new long[]{1L,2L,3L,4L}); + Assertions.assertArrayEquals(new long[]{1L,2L,3L,4L}, longArray2); final int[] c = {1,2,3,4,5}; final Long[] intArray2 = ConvertUtil.toLongArray(c); - Assertions.assertArrayEquals(intArray2, new Long[]{1L,2L,3L,4L,5L}); + Assertions.assertArrayEquals(new Long[]{1L,2L,3L,4L,5L}, intArray2); } @Test @@ -80,14 +80,14 @@ public class ConvertToArrayTest { final String[] b = { "1", "2", "3", "4" }; final Double[] doubleArray = ConvertUtil.toDoubleArray(b); - Assertions.assertArrayEquals(doubleArray, new Double[]{1D,2D,3D,4D}); + Assertions.assertArrayEquals(new Double[]{1D,2D,3D,4D}, doubleArray); final double[] doubleArray2 = ConvertUtil.convert(double[].class, b); - Assertions.assertArrayEquals(doubleArray2, new double[]{1D,2D,3D,4D}, 2); + Assertions.assertArrayEquals(new double[]{1D,2D,3D,4D}, doubleArray2, 2); final int[] c = {1,2,3,4,5}; final Double[] intArray2 = ConvertUtil.toDoubleArray(c); - Assertions.assertArrayEquals(intArray2, new Double[]{1D,2D,3D,4D,5D}); + Assertions.assertArrayEquals(new Double[]{1D,2D,3D,4D,5D}, intArray2); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java index 74239f050..2e8575c44 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToBeanTest.java @@ -46,8 +46,8 @@ public class ConvertToBeanTest { person.setSubName("sub名字"); final Map map = ConvertUtil.convert(Map.class, person); - assertEquals(map.get("name"), "测试A11"); - assertEquals(map.get("age"), 14); + assertEquals("测试A11", map.get("name")); + assertEquals(14, map.get("age")); assertEquals("11213232", map.get("openid")); } @@ -64,8 +64,7 @@ public class ConvertToBeanTest { assertEquals("14", map.get("age")); assertEquals("11213232", map.get("openid")); - final LinkedHashMap map2 = ConvertUtil.convert( - new TypeReference>() {}, person); + final LinkedHashMap map2 = ConvertUtil.convert(new TypeReference<>() {}, person); assertEquals("测试A11", map2.get("name")); assertEquals("14", map2.get("age")); assertEquals("11213232", map2.get("openid")); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java index 199a94cc9..7e71e0f12 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/ConvertToCollectionTest.java @@ -38,7 +38,7 @@ public class ConvertToCollectionTest { @Test public void toCollectionTest() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final List list = (List) ConvertUtil.convert(Collection.class, a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); @@ -49,7 +49,7 @@ public class ConvertToCollectionTest { @Test public void toListTest() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final List list = ConvertUtil.toList(a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); @@ -60,7 +60,7 @@ public class ConvertToCollectionTest { @Test public void toListTest2() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final List list = ConvertUtil.toList(String.class, a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); @@ -71,7 +71,7 @@ public class ConvertToCollectionTest { @Test public void toListTest3() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final List list = ConvertUtil.toList(String.class, a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); @@ -82,8 +82,8 @@ public class ConvertToCollectionTest { @Test public void toListTest4() { - final Object[] a = { "a", "你", "好", "", 1 }; - final List list = ConvertUtil.convert(new TypeReference>() {}, a); + final Object[] a = {"a", "你", "好", "", 1}; + final List list = ConvertUtil.convert(new TypeReference<>() {}, a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); Assertions.assertEquals("好", list.get(2)); @@ -131,7 +131,7 @@ public class ConvertToCollectionTest { @Test public void toLinkedListTest() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final List list = ConvertUtil.convert(LinkedList.class, a); Assertions.assertEquals("a", list.get(0)); Assertions.assertEquals("你", list.get(1)); @@ -142,7 +142,7 @@ public class ConvertToCollectionTest { @Test public void toSetTest() { - final Object[] a = { "a", "你", "好", "", 1 }; + final Object[] a = {"a", "你", "好", "", 1}; final LinkedHashSet set = ConvertUtil.convert(LinkedHashSet.class, a); final ArrayList list = ListUtil.of(set); Assertions.assertEquals("a", list.get(0)); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java index f4350600c..7dfb2ba1b 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/DateConvertTest.java @@ -82,6 +82,6 @@ public class DateConvertTest { final String str = "2020-12-12 12:12:12.0"; ldt = ConvertUtil.toLocalDateTime(str); - Assertions.assertEquals(ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")), str); + Assertions.assertEquals(str, ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S"))); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java index bc3eda5a8..5bf5541fe 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/convert/PrimitiveConvertTest.java @@ -30,9 +30,7 @@ public class PrimitiveConvertTest { @Test public void toIntErrorTest(){ - Assertions.assertThrows(IllegalArgumentException.class, ()->{ - ConvertUtil.convert(int.class, "aaaa"); - }); + Assertions.assertThrows(IllegalArgumentException.class, ()-> ConvertUtil.convert(int.class, "aaaa")); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java index ea6d2ee17..70492ebfd 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/IdcardUtilTest.java @@ -191,7 +191,7 @@ public class IdcardUtilTest { assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18)); final Date date = DateUtil.parse("2017-04-10"); - assertEquals(IdcardUtil.getAge(FOREIGN_ID_18, date), 32); + assertEquals(32, IdcardUtil.getAge(FOREIGN_ID_18, date)); // 新版外国人永久居留身份证 assertTrue(IdcardUtil.isValidCard18("932682198501010017")); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java index 13c177bd6..70a8628d0 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/data/id/NanoIdTest.java @@ -149,9 +149,7 @@ public class NanoIdTest { @Test public void randomNanoIdEmptyAlphabetExceptionThrownTest() { - Assertions.assertThrows(IllegalArgumentException.class, ()->{ - NanoId.randomNanoId(new SecureRandom(), new char[]{}, 10); - }); + Assertions.assertThrows(IllegalArgumentException.class, ()-> NanoId.randomNanoId(new SecureRandom(), new char[]{}, 10)); } @Test @@ -170,15 +168,11 @@ public class NanoIdTest { @Test public void randomNanoIdNegativeSizeExceptionThrown() { - Assertions.assertThrows(IllegalArgumentException.class, ()->{ - NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, -10); - }); + Assertions.assertThrows(IllegalArgumentException.class, ()-> NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, -10)); } @Test public void randomNanoIdZeroSizeExceptionThrown() { - Assertions.assertThrows(IllegalArgumentException.class, ()->{ - NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, 0); - }); + Assertions.assertThrows(IllegalArgumentException.class, ()-> NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, 0)); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java index 8f6ef5ae8..fc6aa6953 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/BetweenFormatterTest.java @@ -23,22 +23,19 @@ import java.util.function.Function; public class BetweenFormatterTest { - Function levelFormatterEn = level -> { - return switch (level) { - case DAY -> " day"; - case HOUR -> " hour"; - case MINUTE -> " minute"; - case SECOND -> " second"; - case MILLISECOND -> " millisecond"; - default -> " " + level.name(); - }; + Function levelFormatterEn = level -> switch (level) { + case DAY -> " day"; + case HOUR -> " hour"; + case MINUTE -> " minute"; + case SECOND -> " second"; + case MILLISECOND -> " millisecond"; }; @Test public void formatTest() { final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2017-01-01 22:59:59"), DateUtil.parse("2017-01-02 23:59:58")); final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND, 1); - Assertions.assertEquals(formatter.toString(), "1天"); + Assertions.assertEquals("1天", formatter.toString()); } @Test @@ -46,27 +43,27 @@ public class BetweenFormatterTest { final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2017-01-01 22:59:59"), DateUtil.parse("2017-01-02 23:59:58")); final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND, 1); formatter.setLevelFormatter(levelFormatterEn); - Assertions.assertEquals(formatter.toString(), "1 day"); + Assertions.assertEquals("1 day", formatter.toString()); } @Test public void formatBetweenTest() { final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 11:23:19"), DateUtil.parse("2018-07-16 11:23:20")); final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.SECOND, 1); - Assertions.assertEquals(formatter.toString(), "1秒"); + Assertions.assertEquals("1秒", formatter.toString()); } @Test public void formatBetweenTest2() { final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 12:25:23"), DateUtil.parse("2018-07-16 11:23:20")); final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.SECOND, 5); - Assertions.assertEquals(formatter.toString(), "1小时2分3秒"); + Assertions.assertEquals("1小时2分3秒", formatter.toString()); } @Test public void formatTest2() { final BetweenFormatter formatter = new BetweenFormatter(584, BetweenFormatter.Level.SECOND, 1); - Assertions.assertEquals(formatter.toString(), "0秒"); + Assertions.assertEquals("0秒", formatter.toString()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java index c3eec41bc..1aeaea56f 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/date/QuarterTest.java @@ -53,9 +53,7 @@ public class QuarterTest { assertEquals(3, Objects.requireNonNull(quarter).getValue()); assertEquals("Q3", quarter.name()); - assertThrows(IllegalArgumentException.class, () -> { - Quarter.valueOf("Abc"); - }); + assertThrows(IllegalArgumentException.class, () -> Quarter.valueOf("Abc")); final Month firstMonth = quarter.firstMonth(); assertEquals(Month.JULY, firstMonth); @@ -69,12 +67,10 @@ public class QuarterTest { final Quarter quarter = Quarter.of(4); assertSame(Quarter.Q4, quarter); assertSame(quarter, Quarter.valueOf("Q4")); - assertEquals(4, quarter.getValue()); + assertEquals(4, Objects.requireNonNull(quarter).getValue()); assertEquals("Q4", quarter.name()); - assertThrows(IllegalArgumentException.class, () -> { - Quarter.valueOf("Q5"); - }); + assertThrows(IllegalArgumentException.class, () -> Quarter.valueOf("Q5")); final Month firstMonth = quarter.firstMonth(); assertEquals(Month.OCTOBER, firstMonth); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java index 20b1b4057..e813d8f3f 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/LambdaUtilTest.java @@ -329,9 +329,7 @@ public class LambdaUtilTest { @Test void getInvokeMethodErrorTest() { // 非函数接口返回异常 - Assertions.assertThrows(IllegalArgumentException.class, () -> { - LambdaUtil.getInvokeMethod(LambdaUtilTest.class); - }); + Assertions.assertThrows(IllegalArgumentException.class, () -> LambdaUtil.getInvokeMethod(LambdaUtilTest.class)); } @SuppressWarnings("unchecked") diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java index 2a92dad36..9aedf0e81 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/func/PredicateUtilTest.java @@ -17,14 +17,12 @@ package cn.hutool.v7.core.func; import cn.hutool.v7.core.collection.set.SetUtil; -import cn.hutool.v7.core.func.PredicateUtil; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; public class PredicateUtilTest { @@ -34,7 +32,7 @@ public class PredicateUtilTest { final Set sets = SetUtil.of("1", "2", "3"); final List collect = Stream.of("3", "4", "5") .filter(PredicateUtil.negate(sets::contains)) - .collect(Collectors.toList()); + .toList(); Assertions.assertEquals(2, collect.size()); Assertions.assertEquals("4", collect.get(0)); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java index 5269f7257..d1013ec42 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileSystemUtilTest.java @@ -35,7 +35,7 @@ public class FileSystemUtilTest { final FileSystem fileSystem = FileSystemUtil.createZip("d:/test/test.zip", CharsetUtil.GBK); final Path root = FileSystemUtil.getRoot(fileSystem); - PathUtil.walkFiles(root, new SimpleFileVisitor() { + PathUtil.walkFiles(root, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(final Path path, final BasicFileAttributes attrs) { diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java index 8ec07ea25..bdd72c809 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/io/file/FileUtilTest.java @@ -506,9 +506,7 @@ public class FileUtilTest { @Test void checkSlipTest() { - Assertions.assertThrows(IllegalArgumentException.class, () -> { - FileUtil.checkSlip(FileUtil.file("test/a"), FileUtil.file("test/../a")); - }); + Assertions.assertThrows(IllegalArgumentException.class, () -> FileUtil.checkSlip(FileUtil.file("test/a"), FileUtil.file("test/../a"))); } @Test @@ -537,15 +535,11 @@ public class FileUtilTest { @Test public void isSub_NullParentTest() { - assertThrows(IllegalArgumentException.class, () -> { - FileUtil.isSub(null, new java.io.File("d:/any/path")); - }); + assertThrows(IllegalArgumentException.class, () -> FileUtil.isSub(null, new File("d:/any/path"))); } @Test public void isSub_NullSubTest() { - assertThrows(IllegalArgumentException.class, () -> { - FileUtil.isSub(new java.io.File("d:/any/path"), null); - }); + assertThrows(IllegalArgumentException.class, () -> FileUtil.isSub(new File("d:/any/path"), null)); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java index 1370d2721..5153acfd5 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/SingletonTest.java @@ -84,12 +84,10 @@ public class SingletonTest { final String key = "123"; final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 10, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()); for (int i = 0; i < 100; i++) { - threadPoolExecutor.execute(() -> { - Singleton.get(key, () -> { - System.out.println(key); - return "123"; - }); - }); + threadPoolExecutor.execute(() -> Singleton.get(key, () -> { + System.out.println(key); + return "123"; + })); } ThreadUtil.sleep(5000); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java index 64d7aec99..16017f90a 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/ValidatorTest.java @@ -311,11 +311,11 @@ public class ValidatorTest { public void validateByteLengthTest() { final String s1 = "abc"; final int len1 = StrUtil.byteLength(s1, CharsetUtil.UTF_8); - Assertions.assertEquals(len1, 3); + Assertions.assertEquals(3, len1); final String s2 = "我ab"; final int len2 = StrUtil.byteLength(s2, CharsetUtil.UTF_8); - Assertions.assertEquals(len2, 5); + Assertions.assertEquals(5, len2); //一个汉字在utf-8编码下，占3个字节。 Assertions.assertThrows(ValidateException.class, ()-> diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java index 9b544bca9..d8f0644c0 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/mutable/BaseMutableTest.java @@ -128,8 +128,8 @@ abstract class BaseMutableTest> { final Mutable mutableObj = new MutableObj<>(value); Assertions.assertNotEquals(value, mutableObj); Assertions.assertEquals(mutableObj, new MutableObj<>(value)); - Assertions.assertNotEquals(mutableObj, new MutableObj<>(null)); - Assertions.assertNotEquals(mutableObj, null); + Assertions.assertNotEquals(new MutableObj<>(null), mutableObj); + Assertions.assertNotEquals(null, mutableObj); Assertions.assertNotEquals(mutableObj, value); } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java index ddc5ca057..b400a0476 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundTest.java @@ -29,10 +29,10 @@ public class BoundTest { public void testEquals() { final Bound bound = new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND); Assertions.assertEquals(bound, bound); - Assertions.assertEquals(bound, new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND)); - Assertions.assertNotEquals(bound, new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND)); - Assertions.assertNotEquals(bound, new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND)); - Assertions.assertNotEquals(bound, null); + Assertions.assertEquals(new FiniteBound<>(1, BoundType.OPEN_UPPER_BOUND), bound); + Assertions.assertNotEquals(new FiniteBound<>(2, BoundType.OPEN_UPPER_BOUND), bound); + Assertions.assertNotEquals(new FiniteBound<>(1, BoundType.OPEN_LOWER_BOUND), bound); + Assertions.assertNotEquals(null, bound); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java index a101c5df3..c22452faa 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/BoundedRangeTest.java @@ -29,7 +29,7 @@ public class BoundedRangeTest { final BoundedRange range = new BoundedRange<>( Bound.greaterThan(0), Bound.lessThan(10) ); - Assertions.assertNotEquals(range, null); + Assertions.assertNotEquals(null, range); Assertions.assertEquals(range, new BoundedRange<>( Bound.greaterThan(0), Bound.lessThan(10) )); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java index 127ecceac..0c9be907b 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/lang/range/RangeTest.java @@ -62,10 +62,10 @@ public class RangeTest { final Date end = DateUtil.parse("2021-01-03"); final List dayOfMonthList = DateUtil.rangeFunc(start, end, DateField.DAY_OF_YEAR, a -> DateTime.of(a).dayOfMonth()); - Assertions.assertArrayEquals(dayOfMonthList.toArray(new Integer[]{}), new Integer[]{1, 2, 3}); + Assertions.assertArrayEquals(new Integer[]{1, 2, 3}, dayOfMonthList.toArray(new Integer[]{})); final List dayOfMonthList2 = DateUtil.rangeFunc(null, null, DateField.DAY_OF_YEAR, a -> DateTime.of(a).dayOfMonth()); - Assertions.assertArrayEquals(dayOfMonthList2.toArray(new Integer[]{}), new Integer[]{}); + Assertions.assertArrayEquals(new Integer[]{}, dayOfMonthList2.toArray(new Integer[]{})); } @Test @@ -75,11 +75,11 @@ public class RangeTest { final StringBuilder sb = new StringBuilder(); DateUtil.rangeConsume(start, end, DateField.DAY_OF_YEAR, a -> sb.append(DateTime.of(a).dayOfMonth()).append("#")); - Assertions.assertEquals(sb.toString(), "1#2#3#"); + Assertions.assertEquals("1#2#3#", sb.toString()); final StringBuilder sb2 = new StringBuilder(); DateUtil.rangeConsume(null, null, DateField.DAY_OF_YEAR, a -> sb2.append(DateTime.of(a).dayOfMonth()).append("#")); - Assertions.assertEquals(sb2.toString(), StrUtil.EMPTY); + Assertions.assertEquals(StrUtil.EMPTY, sb2.toString()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java index 4733e5d44..7f14addb9 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/DirectedWeightGraphTest.java @@ -55,8 +55,6 @@ public class DirectedWeightGraphTest { graph.removePoint("X"); - Assertions.assertThrows(DirectedWeightGraph.NegativeRingException.class, ()->{ - graph.bestPathMap("A"); - }); + Assertions.assertThrows(DirectedWeightGraph.NegativeRingException.class, ()-> graph.bestPathMap("A")); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java index 73854a2cc..c5bf01cd4 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/Issue2349Test.java @@ -29,8 +29,6 @@ public class Issue2349Test { final ConcurrentHashMap map = new ConcurrentHashMap<>(); // JDK9+ has been resolved JDK-8161372 bug, when cause dead then throw IllegalStateException - Assertions.assertThrows(IllegalStateException.class, () -> { - map.computeIfAbsent("AaAa", key -> map.computeIfAbsent("BBBB", key2 -> 42)); - }); + Assertions.assertThrows(IllegalStateException.class, () -> map.computeIfAbsent("AaAa", key -> map.computeIfAbsent("BBBB", key2 -> 42))); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java index e337e76d3..8b3453831 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapBuilderTest.java @@ -32,9 +32,9 @@ public class MapBuilderTest { .put(false, "d", () -> getValue(4)) .build(); - Assertions.assertEquals(map.get("a"), "1"); + Assertions.assertEquals("1", map.get("a")); Assertions.assertFalse(map.containsKey("b")); - Assertions.assertEquals(map.get("c"), "3"); + Assertions.assertEquals("3", map.get("c")); Assertions.assertFalse(map.containsKey("d")); } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java index 8a905fc39..fe02cdf4e 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/MapUtilTest.java @@ -691,7 +691,7 @@ public class MapUtilTest { //------getQuietly @Test public void getQuietlyMapIsNullReturnsDefaultValue() { - String result = MapUtil.getQuietly(null, "key1", new TypeReference() { + String result = MapUtil.getQuietly(null, "key1", new TypeReference<>() { }, "default"); assertEquals("default", result); result = MapUtil.getQuietly(null, "key1", String.class, "default"); @@ -703,7 +703,7 @@ public class MapUtilTest { final Map map = new HashMap<>(); map.put("key1", "value1"); map.put("key2", 123); - final String result = MapUtil.getQuietly(map, "key1", new TypeReference() { + final String result = MapUtil.getQuietly(map, "key1", new TypeReference<>() { }, "default"); assertEquals("value1", result); } @@ -713,7 +713,7 @@ public class MapUtilTest { final Map map = new HashMap<>(); map.put("key1", "value1"); map.put("key2", 123); - final String result = MapUtil.getQuietly(map, "key3", new TypeReference() { + final String result = MapUtil.getQuietly(map, "key3", new TypeReference<>() { }, "default"); assertEquals("default", result); } @@ -723,7 +723,7 @@ public class MapUtilTest { final Map map = new HashMap<>(); map.put("key1", "value1"); map.put("key2", 123); - final Integer result = MapUtil.getQuietly(map, "key1", new TypeReference() { + final Integer result = MapUtil.getQuietly(map, "key1", new TypeReference<>() { }, 0); assertEquals(0, result); } @@ -733,7 +733,7 @@ public class MapUtilTest { final Map map = new HashMap<>(); map.put("key1", "value1"); map.put("key2", 123); - final Integer result = MapUtil.getQuietly(map, "key2", new TypeReference() { + final Integer result = MapUtil.getQuietly(map, "key2", new TypeReference<>() { }, 0); assertEquals(123, result); } @@ -744,7 +744,7 @@ public class MapUtilTest { map.put("key1", "value1"); map.put("key2", 123); map.put("key3", null); - final String result = MapUtil.getQuietly(map, "key3", new TypeReference() { + final String result = MapUtil.getQuietly(map, "key3", new TypeReference<>() { }, "default"); assertEquals("default", result); } @@ -800,7 +800,7 @@ public class MapUtilTest { final Map map = new HashMap<>(); map.put("age", "18"); map.put("name", "Hutool"); - assertEquals("18", MapUtil.get(map, "age", new TypeReference() { + assertEquals("18", MapUtil.get(map, "age", new TypeReference<>() { }, "default")); } @@ -810,11 +810,11 @@ public class MapUtilTest { Map map = new HashMap<>(); map.put("age", "18"); map.put("name", "Hutool"); - assertEquals(18, MapUtil.get(map, "age", new TypeReference() { + assertEquals(18, MapUtil.get(map, "age", new TypeReference<>() { }, 0)); map = null; - assertEquals(0, MapUtil.get(map, "age", new TypeReference() { + assertEquals(0, MapUtil.get(map, "age", new TypeReference<>() { }, 0)); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java index aa36eada1..763162d64 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/map/reference/WeakConcurrentMapTest.java @@ -34,9 +34,7 @@ public class WeakConcurrentMapTest { map.computeIfAbsent("key2", key -> "value2"); // Test if the map can handle concurrent modifications - new Thread(() -> { - map.put("key2", "value2"); - }).start(); + new Thread(() -> map.put("key2", "value2")).start(); // Test if the map has correctly stored the value from the concurrent modification assertEquals("value2", map.get("key2")); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java index 6d95bb771..f7c27f11c 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/math/NumberUtilTest.java @@ -385,9 +385,7 @@ public class NumberUtilTest { @Test void emptyToBigDecimalTest(){ - assertThrows(IllegalArgumentException.class,()->{ - NumberUtil.toBigDecimal(""); - }); + assertThrows(IllegalArgumentException.class,()-> NumberUtil.toBigDecimal("")); } @Test @@ -694,9 +692,7 @@ public class NumberUtilTest { @Test public void rangeMinTest() { - assertThrows(NegativeArraySizeException.class, ()->{ - NumberUtil.range(0, Integer.MIN_VALUE); - }); + assertThrows(NegativeArraySizeException.class, ()-> NumberUtil.range(0, Integer.MIN_VALUE)); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java index 781f9fec3..ee0e3c77c 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/pool/PartitionObjectPoolTest.java @@ -35,7 +35,7 @@ public class PartitionObjectPoolTest { .setMaxIdle(5000) .setMaxWait(100); - final ObjectFactory factory = new ObjectFactory() { + final ObjectFactory factory = new ObjectFactory<>() { @Override public StringBuilder create() { return new StringBuilder(); diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java index 171781b3e..4348a51d9 100755 --- a/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/reflect/IssueI7CRIWTest.java @@ -27,11 +27,11 @@ public class IssueI7CRIWTest { void getTypeArgumentsTest() { // 无法从继承获取泛型，则从接口获取 Type type = TypeUtil.getTypeArgument(C.class); - Assertions.assertEquals(type, String.class); + Assertions.assertEquals(String.class, type); // 继承和第一个接口都非泛型接口，则从找到的第一个泛型接口获取 type = TypeUtil.getTypeArgument(D.class); - Assertions.assertEquals(type, String.class); + Assertions.assertEquals(String.class, type); } static class A{ diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java index da3d470ec..d3541e17a 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/spi/ListServiceLoaderTest.java @@ -40,9 +40,7 @@ public class ListServiceLoaderTest { @Test void getServiceClassNotExistTest() { final ListServiceLoader serviceLoader = ListServiceLoader.of(TestSPI1.class); - Assertions.assertThrows(HutoolException.class, ()->{ - serviceLoader.getServiceClass(0); - }); + Assertions.assertThrows(HutoolException.class, ()-> serviceLoader.getServiceClass(0)); } public interface TestSPI1{ diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java index c928d6ada..967866289 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/spi/MapServiceLoaderTest.java @@ -40,9 +40,7 @@ public class MapServiceLoaderTest { @Test void getServiceClassNotExistTest() { final MapServiceLoader serviceLoader = MapServiceLoader.of(TestSPI1.class); - Assertions.assertThrows(HutoolException.class, ()->{ - serviceLoader.getServiceClass("service2"); - }); + Assertions.assertThrows(HutoolException.class, ()-> serviceLoader.getServiceClass("service2")); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java index e43413d6a..dbe82dd4c 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -171,7 +171,7 @@ public class AbstractEnhancedWrappedStreamTest { @Test public void testGrouping() { final List list = asList(1, 2, 3); - final Map> map = new HashMap>() { + final Map> map = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; @@ -193,7 +193,7 @@ public class AbstractEnhancedWrappedStreamTest { @Test public void testPartitioning() { final List list = asList(1, 2, 3); - final Map> map = new HashMap>() { + final Map> map = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; @@ -636,7 +636,7 @@ public class AbstractEnhancedWrappedStreamTest { @Test public void testToEntries() { - final Map expect = new HashMap() { + final Map expect = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; 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 082cc4251..7ccd35e47 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 @@ -16,13 +16,12 @@ package cn.hutool.v7.core.stream; -import static java.util.Collections.singletonList; -import lombok.Builder; -import lombok.Data; import cn.hutool.v7.core.collection.ListUtil; import cn.hutool.v7.core.lang.Opt; import cn.hutool.v7.core.map.MapUtil; import cn.hutool.v7.core.math.NumberUtil; +import lombok.Builder; +import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -34,6 +33,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.Collections.singletonList; + /** * @author VampireAchao */ @@ -270,7 +271,7 @@ public class EasyStreamTest { .peek(e -> Assertions.assertEquals("four", e)) .map(String::toUpperCase) .peek(e -> Assertions.assertEquals("FOUR", e)) - .collect(Collectors.toList()); + .toList(); } @Test @@ -280,7 +281,7 @@ public class EasyStreamTest { .peekIdx((e, i) -> Assertions.assertEquals("four:0", e + ":" + i)) .map(String::toUpperCase) .peekIdx((e, i) -> Assertions.assertEquals("FOUR:0", e + ":" + i)) - .collect(Collectors.toList()); + .toList(); } @Test 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 a9f33cf67..ca7d3666f 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 @@ -137,6 +137,7 @@ public class EntryStreamTest { Assertions.assertEquals(2, count); } + @SuppressWarnings("ResultOfMethodCallIgnored") @Test public void testPeekKey() { final List keys = new ArrayList<>(); @@ -146,6 +147,7 @@ public class EntryStreamTest { Assertions.assertEquals(Arrays.asList(1, 1, 2, 2), keys); } + @SuppressWarnings("ResultOfMethodCallIgnored") @Test public void testPeekValue() { final List values = new ArrayList<>(); @@ -179,22 +181,24 @@ public class EntryStreamTest { @Test public void testAppend() { - final Map map1 = new HashMap(){ + final Map map1 = new HashMap<>() { @Serial private static final long serialVersionUID = 2091911960221937275L; { - put(1, 1); - put(2, 2); - }}; - final Map map2 = new HashMap(){ + put(1, 1); + put(2, 2); + } + }; + final Map map2 = new HashMap<>() { @Serial private static final long serialVersionUID = 4802315578432177802L; { - put(3, 3); - put(4, 4); - }}; + put(3, 3); + put(4, 4); + } + }; Assertions.assertEquals( new ArrayList>(){ @Serial @@ -213,22 +217,24 @@ public class EntryStreamTest { @Test public void testPrepend() { - final Map map1 = new HashMap(){ + final Map map1 = new HashMap<>() { @Serial private static final long serialVersionUID = -8772310525807986780L; { - put(1, 1); - put(2, 2); - }}; - final Map map2 = new HashMap(){ + put(1, 1); + put(2, 2); + } + }; + final Map map2 = new HashMap<>() { @Serial private static final long serialVersionUID = -8453400649627773936L; { - put(3, 3); - put(4, 4); - }}; + put(3, 3); + put(4, 4); + } + }; Assertions.assertEquals( new ArrayList>(){ @Serial @@ -249,7 +255,7 @@ public class EntryStreamTest { public void testSortByKey() { final List> entries = EntryStream.of(Arrays.asList(new Entry<>(3, 1), new Entry<>(2, 1), new Entry<>(4, 1), new Entry<>(1, 1))) .sortByKey(Comparator.comparingInt(Integer::intValue)) - .collect(Collectors.toList()); + .toList(); Assertions.assertEquals( Arrays.asList(1, 2, 3, 4), entries.stream().map(Map.Entry::getKey).collect(Collectors.toList()) @@ -260,7 +266,7 @@ public class EntryStreamTest { public void testSortByValue() { final List> entries = EntryStream.of(Arrays.asList(new Entry<>(4, 4), new Entry<>(2, 2), new Entry<>(1, 1), new Entry<>(3, 3))) .sortByValue(Comparator.comparingInt(Integer::intValue)) - .collect(Collectors.toList()); + .toList(); Assertions.assertEquals( Arrays.asList(1, 2, 3, 4), entries.stream().map(Map.Entry::getValue).collect(Collectors.toList()) diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java index 454bd3faf..1860222a2 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/RetryUtilTest.java @@ -59,9 +59,7 @@ public class RetryUtilTest { }, 3, Duration.ofSeconds(1), - () -> { - Console.log("兜底"); - }, + () -> Console.log("兜底"), ArithmeticException.class ); } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java index 54e7f3e2a..82c3b01cf 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/SimpleSchedulerTest.java @@ -27,7 +27,7 @@ public class SimpleSchedulerTest { public static void main(final String[] args) { // 新建一个定时任务，定时获取内存信息 - final SimpleScheduler scheduler = new SimpleScheduler<>(new SimpleScheduler.Job() { + final SimpleScheduler scheduler = new SimpleScheduler<>(new SimpleScheduler.Job<>() { private volatile long maxAvailable; @Override diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java index a073033f8..b27c113b7 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/thread/ThreadUtilTest.java @@ -37,9 +37,7 @@ public class ThreadUtilTest { public void testNewFixedExecutor(){ final ThreadPoolExecutor executor = ThreadUtil.newFixedExecutor(1, 2, "test-", true); for (int i = 0; i < 20; i++) { - executor.execute(()->{ - Console.log("执行任务1"); - }); + executor.execute(()-> Console.log("执行任务1")); } } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java index 2c0b3c515..055f6c707 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/ByteUtilTest.java @@ -153,7 +153,7 @@ public class ByteUtilTest { final byte[] bytes = ByteUtil.toBytes(short1, ByteOrder.BIG_ENDIAN); final short short2 = ByteUtil.toShort(bytes, ByteOrder.BIG_ENDIAN); - assertEquals(short2, short1); + assertEquals(short1, short2); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java index f6f68b33f..fec947303 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/util/RandomUtilTest.java @@ -34,13 +34,13 @@ public class RandomUtilTest { @Test public void randomEleSetTest(){ final Set set = RandomUtil.randomEleSet(ListUtil.of(1, 2, 3, 4, 5, 6), 2); - Assertions.assertEquals(set.size(), 2); + Assertions.assertEquals(2, set.size()); } @Test public void randomElesTest(){ final List result = RandomUtil.randomEles(ListUtil.of(1, 2, 3, 4, 5, 6), 2); - Assertions.assertEquals(result.size(), 2); + Assertions.assertEquals(2, result.size()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java index a0a46c8b3..9bb425988 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/xml/XmlUtilTest.java @@ -200,14 +200,16 @@ public class XmlUtilTest { @Test public void getByPathTest() { - final String xmlStr = "\n" + - "\n" + - " \n" + - " \n" + - " 2020/04/15 21:01:21\n" + - " \n" + - " \n" + - "\n"; + final String xmlStr = """ + + + + + 2020/04/15 21:01:21 + + + + """; final Document document = XmlUtil.readXml(xmlStr); final Object value = XPathUtil.getByXPath( @@ -337,9 +339,10 @@ public class XmlUtilTest { @Test public void getParamTest() { - final String xml = "\n" + - " 222222\n" + - ""; + final String xml = """ + + 222222 + """; final Document doc = XmlUtil.parseXml(xml); final String name = doc.getDocumentElement().getAttribute("name"); @@ -382,12 +385,13 @@ public class XmlUtilTest { @Test public void issue3139Test() { - final String xml = "\n" + - " \n" + - " 1\n" + - "

str

\n" + - " \n" + - ""; + final String xml = """ + + + 1 +

str

+ + """; final R r = XmlUtil.xmlToBean(XmlUtil.parseXml(xml), R.class); Assertions.assertEquals("1", r.getC().get(0).getS()); 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 66f7a2478..1f3b39642 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 @@ -211,11 +211,10 @@ public class Sign extends BaseAsymmetric { // If the certificate is of type X509Certificate, // we should check whether it has a Key Usage // extension marked as critical. - if (certificate instanceof X509Certificate) { + if (certificate instanceof X509Certificate cert) { // Check whether the cert has a key usage extension // marked as a critical extension. // The OID for KeyUsage extension is 2.5.29.15. - final X509Certificate cert = (X509Certificate) certificate; final Set critSet = cert.getCriticalExtensionOIDs(); if (CollUtil.isNotEmpty(critSet) && critSet.contains("2.5.29.15")) { diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java index 83033b9b3..5a2f7c7f7 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/asymmetric/SignAlgorithm.java @@ -18,39 +18,90 @@ package cn.hutool.v7.crypto.asymmetric; /** * 签名算法类型
- * see: https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#Signature + * see: Signature * * @author Looly */ public enum SignAlgorithm { // The RSA signature algorithm + /** + * RSA签名算法 + */ NONEwithRSA("NONEwithRSA"), // The MD2/MD5 with RSA Encryption signature algorithm + /** + * MD2withMD5签名算法 + */ MD2withRSA("MD2withRSA"), + /** + * MD5withRSA签名算法 + */ MD5withRSA("MD5withRSA"), // The signature algorithm with SHA-* and the RSA + /** + * SHA1withRSA签名算法 + */ SHA1withRSA("SHA1withRSA"), + /** + * SHA256withRSA签名算法 + */ SHA256withRSA("SHA256withRSA"), + /** + * SHA384withRSA签名算法 + */ SHA384withRSA("SHA384withRSA"), + /** + * SHA512withRSA签名算法 + */ SHA512withRSA("SHA512withRSA"), // The Digital Signature Algorithm + /** + * DSA签名算法 + */ NONEwithDSA("NONEwithDSA"), // The DSA with SHA-1 signature algorithm + /** + * DSAwithSHA1签名算法 + */ SHA1withDSA("SHA1withDSA"), // The ECDSA signature algorithms + /** + * ECDSA签名算法 + */ NONEwithECDSA("NONEwithECDSA"), + /** + * ECDSAwithSHA1签名算法 + */ SHA1withECDSA("SHA1withECDSA"), + /** + * ECDSAwithSHA256签名算法 + */ SHA256withECDSA("SHA256withECDSA"), + /** + * ECDSAwithSHA384签名算法 + */ SHA384withECDSA("SHA384withECDSA"), + /** + * ECDSAwithSHA512签名算法 + */ SHA512withECDSA("SHA512withECDSA"), // 需要BC库加入支持 + /** + * SHA256withRSA/PSS签名算法 + */ SHA256withRSA_PSS("SHA256WithRSA/PSS"), + /** + * SHA384withRSA/PSS签名算法 + */ SHA384withRSA_PSS("SHA384WithRSA/PSS"), + /** + * SHA512withRSA/PSS签名算法 + */ SHA512withRSA_PSS("SHA512WithRSA/PSS"); private final String value; diff --git a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java index ecb1d0aab..1bf7bf8a4 100644 --- a/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java +++ b/hutool-crypto/src/main/java/cn/hutool/v7/crypto/digest/BCrypt.java @@ -23,7 +23,7 @@ import java.security.SecureRandom; /** * BCrypt加密算法实现。由它加密的文件可在所有支持的操作系统和处理器上进行转移。它的口令必须是8至56个字符，并将在内部被转化为448位的密钥。 *

- * 此类来自于https://github.com/jeremyh/jBCrypt/ + * 此类来自于jBCrypt *

* 使用方法如下： *

@@ -225,7 +225,7 @@ public class BCrypt { if (c1 == -1 || c2 == -1) break; o = (byte) (c1 << 2); - o |= (c2 & 0x30) >> 4; + o |= (byte) ((c2 & 0x30) >> 4); rs.append((char) o); if (++olen >= maxolen || off >= slen) break; @@ -233,7 +233,7 @@ public class BCrypt { if (c3 == -1) break; o = (byte) ((c2 & 0x0f) << 4); - o |= (c3 & 0x3c) >> 2; + o |= (byte) ((c3 & 0x3c) >> 2); rs.append((char) o); if (++olen >= maxolen || off >= slen) break; @@ -337,7 +337,8 @@ public class BCrypt { } /** - * Perform the "enhanced key schedule" step described by Provos and Mazieres in "A Future-Adaptable Password Scheme" http://www.openbsd.org/papers/bcrypt-paper.ps + * Perform the "enhanced key schedule" step described by Provos and Mazieres in "A Future-Adaptable Password Scheme"
+ * 见：bcrypt-paper * * @param data salt information * @param key password information diff --git a/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java index e41f0fed8..ed5fb0112 100644 --- a/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/v7/crypto/SignUtilTest.java @@ -47,31 +47,32 @@ public class SignUtilTest { @Test void issueI6SRUFTest() { // pem格式 - final String publicKey = "-----BEGIN CERTIFICATE-----\n" + - "MIIEMTCCAxmgAwIBAgIGAXRTgcMnMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT\n" + - "AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK\n" + - "DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW\n" + - "YWxpZGF0aW9uIENBMB4XDTIwMTAxMDA1MjQxNFoXDTMwMTAwODA1MjQxNFowZTEL\n" + - "MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx\n" + - "FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu\n" + - "Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1zHL54HiI8d2sLJ\n" + - "lwoQji3/ln0nsvfZ/XVpOjuB+1YR6/0LdxEDMC/hxI6iH2Rm5MjwWz3dmN/6BZeI\n" + - "gwGeTOWJUZFARo8UduKrlhC6gWMRpAiiGC8wA8stikc5gYB+UeFVZi/aJ0WN0cpP\n" + - "JYCvPBhxhMvhVDnd4hNohnR1L7k0ypuWg0YwGjC25FaNAEFBYP9EYUyCJjE//9Z7\n" + - "sMzHR9SJYCqqo6r9bOH9G6sWKuEp+osuAh+kJIxJMHfipw7w3tEcWG0hce9u/el4\n" + - "cYJtg8/PPMVoccKmeCzMvarr7jdKP4lenJbtwlgyfs+JgNu60KMUJH8RS72wC9NY\n" + - "uFz09wIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo\n" + - "dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE\n" + - "BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh\n" + - "a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFJ2Kx9YZfmWpkKFnC33C0r5D\n" + - "K3rFMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA\n" + - "A4IBAQBZoeU0XyH9O0LGF9R+JyGwfU/O5amoB97VeM+5n9v2z8OCiIJ8eXVGKN9L\n" + - "tl9QkpTEanYwK30KkpHcJP1xfVkhPi/cCMgfTWQ5eKYC7Zm16zk7n4CP6IIgZIqm\n" + - "TVGsIGKk8RzWseyWPB3lfqMDR52V1tdA1S8lJ7a2Xnpt5M2jkDXoArl3SVSwCb4D\n" + - "AmThYhak48M++fUJNYII9JBGRdRGbfJ2GSFdPXgesUL2CwlReQwbW4GZkYGOg9LK\n" + - "CNPK6XShlNdvgPv0CCR08KCYRwC3HZ0y1F0NjaKzYdGNPrvOq9lA495ONZCvzYDo\n" + - "gmsu/kd6eqxTs/JwdaIYr4sCMg8Z\n" + - "-----END CERTIFICATE-----"; + final String publicKey = """ + -----BEGIN CERTIFICATE----- + MIIEMTCCAxmgAwIBAgIGAXRTgcMnMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNVBAYT + AkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMRcwFQYDVQQK + DA5MYWthbGEgQ28uLEx0ZDEqMCgGA1UEAwwhTGFrYWxhIE9yZ2FuaXphdGlvbiBW + YWxpZGF0aW9uIENBMB4XDTIwMTAxMDA1MjQxNFoXDTMwMTAwODA1MjQxNFowZTEL + MAkGA1UEBhMCQ04xEDAOBgNVBAgMB0JlaUppbmcxEDAOBgNVBAcMB0JlaUppbmcx + FzAVBgNVBAoMDkxha2FsYSBDby4sTHRkMRkwFwYDVQQDDBBBUElHVy5MQUtBTEEu + Q09NMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt1zHL54HiI8d2sLJ + lwoQji3/ln0nsvfZ/XVpOjuB+1YR6/0LdxEDMC/hxI6iH2Rm5MjwWz3dmN/6BZeI + gwGeTOWJUZFARo8UduKrlhC6gWMRpAiiGC8wA8stikc5gYB+UeFVZi/aJ0WN0cpP + JYCvPBhxhMvhVDnd4hNohnR1L7k0ypuWg0YwGjC25FaNAEFBYP9EYUyCJjE//9Z7 + sMzHR9SJYCqqo6r9bOH9G6sWKuEp+osuAh+kJIxJMHfipw7w3tEcWG0hce9u/el4 + cYJtg8/PPMVoccKmeCzMvarr7jdKP4lenJbtwlgyfs+JgNu60KMUJH8RS72wC9NY + uFz09wIDAQABo4HVMIHSMIGSBgNVHSMEgYowgYeAFCnH4DkZPR6CZxRn/kIqVsMo + dJHpoWekZTBjMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpSmluZzEQMA4GA1UE + BwwHQmVpSmluZzEXMBUGA1UECgwOTGFrYWxhIENvLixMdGQxFzAVBgNVBAMMDkxh + a2FsYSBSb290IENBggYBaiUALIowHQYDVR0OBBYEFJ2Kx9YZfmWpkKFnC33C0r5D + K3rFMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUA + A4IBAQBZoeU0XyH9O0LGF9R+JyGwfU/O5amoB97VeM+5n9v2z8OCiIJ8eXVGKN9L + tl9QkpTEanYwK30KkpHcJP1xfVkhPi/cCMgfTWQ5eKYC7Zm16zk7n4CP6IIgZIqm + TVGsIGKk8RzWseyWPB3lfqMDR52V1tdA1S8lJ7a2Xnpt5M2jkDXoArl3SVSwCb4D + AmThYhak48M++fUJNYII9JBGRdRGbfJ2GSFdPXgesUL2CwlReQwbW4GZkYGOg9LK + CNPK6XShlNdvgPv0CCR08KCYRwC3HZ0y1F0NjaKzYdGNPrvOq9lA495ONZCvzYDo + gmsu/kd6eqxTs/JwdaIYr4sCMg8Z + -----END CERTIFICATE-----"""; final PublicKey key = (PublicKey) PemUtil.readPemKey(IoUtil.toUtf8Stream(publicKey)); new Sign(SignAlgorithm.SHA256withRSA, new KeyPair(key, null)); 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 3f3cc2fe8..ccfb12872 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 @@ -431,8 +431,7 @@ public class Entity extends Dict { return SqlUtil.clobToStr((Clob) obj); } else if (obj instanceof Blob) { return SqlUtil.blobToStr((Blob) obj, charset); - } else if (obj instanceof RowId) { - final RowId rowId = (RowId) obj; + } else if (obj instanceof RowId rowId) { return StrUtil.str(rowId.getBytes(), charset); } return super.getStr(field, defaultValue); 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 793278a20..f1ee617bb 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 @@ -65,7 +65,7 @@ public class DruidDSFactory extends AbstractDSFactory { if(MapUtil.isNotEmpty(poolProps)){ final Props druidProps = new Props(); poolProps.forEach((key, value)-> druidProps.set(StrUtil.addPrefixIfNot(key.toString(), "druid."), value)); - ds.configFromPropeties(druidProps); + ds.configFromProperties(druidProps); //issue#I4ZKCW 某些非属性设置单独设置 // connectionErrorRetryAttempts diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java index 792665e86..94b79548f 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/ds/pooled/PooledDataSource.java @@ -115,7 +115,7 @@ public class PooledDataSource extends AbstractDataSource { * @return {@link ObjectFactory} */ private ObjectFactory createConnFactory(final ConnectionConfig config) { - return new ObjectFactory() { + return new ObjectFactory<>() { @Override public PooledConnection create() { return new PooledConnection(config, PooledDataSource.this); @@ -136,7 +136,7 @@ public class PooledDataSource extends AbstractDataSource { @Override public void destroy(final PooledConnection connection) { - if(null != connection){ + if (null != connection) { connection.destroy(); } } diff --git a/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java index e8861f7f2..297a689b1 100644 --- a/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java +++ b/hutool-db/src/test/java/cn/hutool/v7/db/MySQLTest.java @@ -58,17 +58,15 @@ public class MySQLTest { @Test @Disabled public void txTest() throws SQLException { - Assertions.assertThrows(SQLException.class, ()->{ - Db.of("mysql").tx(db -> { - final int update = db.update(Entity.of("user").set("text", "描述100"), Entity.of().set("id", 100)); - db.update(Entity.of("user").set("text", "描述101"), Entity.of().set("id", 101)); - if (1 == update) { - // 手动指定异常，然后测试回滚触发 - throw new RuntimeException("Error"); - } - db.update(Entity.of("user").set("text", "描述102"), Entity.of().set("id", 102)); - }); - }); + Assertions.assertThrows(SQLException.class, ()-> Db.of("mysql").tx(db -> { + final int update = db.update(Entity.of("user").set("text", "描述100"), Entity.of().set("id", 100)); + db.update(Entity.of("user").set("text", "描述101"), Entity.of().set("id", 101)); + if (1 == update) { + // 手动指定异常，然后测试回滚触发 + throw new RuntimeException("Error"); + } + db.update(Entity.of("user").set("text", "描述102"), Entity.of().set("id", 102)); + })); } @Test @@ -95,6 +93,6 @@ public class MySQLTest { db.upsert(Entity.of("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456")); final Entity user = db.get(Entity.of("testuser").set("id", 1)); System.out.println("user======="+user.getStr("account")+"___"+user.getStr("pass")); - Assertions.assertEquals(user.getStr("account"), "icefairy"); + Assertions.assertEquals("icefairy", user.getStr("account")); } } diff --git a/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java index da80e5092..471ac5feb 100644 --- a/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java +++ b/hutool-db/src/test/java/cn/hutool/v7/db/PageTest.java @@ -26,8 +26,8 @@ public class PageTest { public void addOrderTest() { final Page page = new Page(); page.addOrder(new Order("aaa")); - Assertions.assertEquals(page.getOrders().length, 1); + Assertions.assertEquals(1, page.getOrders().length); page.addOrder(new Order("aaa")); - Assertions.assertEquals(page.getOrders().length, 2); + Assertions.assertEquals(2, page.getOrders().length); } } diff --git a/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java index 711479d7e..6b6ea8947 100644 --- a/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java +++ b/hutool-db/src/test/java/cn/hutool/v7/db/QuoteWrapperTest.java @@ -34,7 +34,7 @@ public class QuoteWrapperTest { final String originalName = "name"; final String wrapName = wrapper.wrap(originalName); final String unWrapName = wrapper.unWrap(wrapName); - Assertions.assertEquals(unWrapName, originalName); + Assertions.assertEquals(originalName, unWrapName); } @Test @@ -44,7 +44,7 @@ public class QuoteWrapperTest { final String originalName = "name.age"; final String wrapName = wrapper.wrap(originalName); final String unWrapName = wrapper.unWrap(wrapName); - Assertions.assertEquals(unWrapName, originalName); + Assertions.assertEquals(originalName, unWrapName); } @Test @@ -54,6 +54,6 @@ public class QuoteWrapperTest { final String originalName = "name.age*"; final String wrapName = wrapper.wrap(originalName); final String unWrapName = wrapper.unWrap(wrapName); - Assertions.assertEquals(unWrapName, originalName); + Assertions.assertEquals(originalName, unWrapName); } } diff --git a/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java index 742f64c32..e83d09ac7 100644 --- a/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java +++ b/hutool-db/src/test/java/cn/hutool/v7/db/meta/MetaUtilTest.java @@ -56,7 +56,7 @@ public class MetaUtilTest { @Test public void getTableIndexInfoTest() { final Table table = MetaUtil.getTableMeta(ds, "user_1"); - Assertions.assertEquals(table.getIndexInfoList().size(), 2); + Assertions.assertEquals(2, table.getIndexInfoList().size()); } /** diff --git a/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java index 0e707dce0..1dd5cfbf5 100644 --- a/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java +++ b/hutool-db/src/test/java/cn/hutool/v7/db/sql/SqlFormatterTest.java @@ -34,9 +34,10 @@ public class SqlFormatterTest { final String sql = "select * from `order`"; final String format = SqlFormatter.format(sql); Assertions.assertEquals( - "select\n" + - " * \n" + - " from\n" + - " `order`", format); + """ + select + *\s + from + `order`""", format); } } diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/jms/JmsConsumer.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/jms/JmsConsumer.java index 707d7a66f..32c61c993 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/jms/JmsConsumer.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/mq/engine/jms/JmsConsumer.java @@ -65,30 +65,28 @@ public class JmsConsumer implements Consumer { @Override public void subscribe(final MessageHandler messageHandler) { try { - this.consumer.setMessageListener(message -> { - messageHandler.handle(new Message() { - @Override - public String topic() { - return consumerGroup; - } + this.consumer.setMessageListener(message -> messageHandler.handle(new Message() { + @Override + public String topic() { + return consumerGroup; + } - @Override - public byte[] content() { - try { - if (message instanceof TextMessage) { - // TODO 考虑编码 - return ByteUtil.toUtf8Bytes(((TextMessage) message).getText()); - } else if (message instanceof BytesMessage) { - return new byte[(int) ((BytesMessage) message).getBodyLength()]; - } else { - throw new IllegalArgumentException("Unsupported message type: " + message.getClass().getName()); - } - } catch (final JMSException e) { - throw new MQException(e); + @Override + public byte[] content() { + try { + if (message instanceof TextMessage) { + // TODO 考虑编码 + return ByteUtil.toUtf8Bytes(((TextMessage) message).getText()); + } else if (message instanceof BytesMessage) { + return new byte[(int) ((BytesMessage) message).getBodyLength()]; + } else { + throw new IllegalArgumentException("Unsupported message type: " + message.getClass().getName()); } + } catch (final JMSException e) { + throw new MQException(e); } - }); - }); + } + })); } catch (final JMSException e) { throw new MQException(e); } diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java index fb940d624..c661aa4f6 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/spring/SpringUtil.java @@ -288,8 +288,7 @@ public class SpringUtil implements ApplicationContextInitializer //TODO 需要定义复合资源加载器 createGroupTemplate(new CompositeResourceLoader()); - default -> new GroupTemplate(); }; } 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 c0ccca75f..a27ce0170 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 @@ -61,13 +61,15 @@ public class JetbrickTemplate implements Template, Serializable{ @Override public void render(final Map bindingMap, final Writer writer) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); rawTemplate.render(map, writer); } @Override public void render(final Map bindingMap, final OutputStream out) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); rawTemplate.render(map, out); } diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java index b7a34fdcc..74aec29f3 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/template/engine/pebble/PebbleTemplate.java @@ -64,7 +64,7 @@ public class PebbleTemplate implements Template { @Override public void render(final Map bindingMap, final Writer writer) { - final Map map = ConvertUtil.convert(new TypeReference>() { + final Map map = ConvertUtil.convert(new TypeReference<>() { }, bindingMap); try { this.template.evaluate(writer, map); @@ -82,7 +82,7 @@ public class PebbleTemplate implements Template { @Override public void render(final Map bindingMap, final OutputStream out) { - final Map map = ConvertUtil.convert(new TypeReference>() { + final Map map = ConvertUtil.convert(new TypeReference<>() { }, bindingMap); try { this.template.evaluate(new OutputStreamWriter(out), map); 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 1f5f63a85..66dfb8a95 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 @@ -59,7 +59,8 @@ public class RythmTemplate implements Template, Serializable { @Override public void render(final Map bindingMap, final Writer writer) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); rawTemplate.__setRenderArgs(map); rawTemplate.render(writer); } 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 344e71669..ae67e0c56 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 @@ -74,7 +74,8 @@ public class ThymeleafTemplate implements Template, Serializable { @Override public void render(final Map bindingMap, final Writer writer) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); final Context context = new Context(Locale.getDefault(), map); this.engine.process(this.template, context, writer); } 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 db4fd1351..53efea458 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 @@ -84,7 +84,8 @@ public class VelocityTemplate implements Template, Serializable { * @return {@link VelocityContext} */ private VelocityContext toContext(final Map bindingMap) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); return new VelocityContext(map); } 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 f8923f7fe..d6d8e94ba 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 @@ -58,13 +58,15 @@ public class WitTemplate implements cn.hutool.v7.extra.template.Template, Serial @Override public void render(final Map bindingMap, final Writer writer) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); rawTemplate.merge(map, writer); } @Override public void render(final Map bindingMap, final OutputStream out) { - final Map map = ConvertUtil.convert(new TypeReference>() {}, bindingMap); + final Map map = ConvertUtil.convert(new TypeReference<>() { + }, bindingMap); rawTemplate.merge(map, out); } diff --git a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java index 1628e3a45..478fffbbd 100644 --- a/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java +++ b/hutool-extra/src/main/java/cn/hutool/v7/extra/tokenizer/engine/hanlp/HanLPResult.java @@ -25,7 +25,7 @@ import java.util.List; /** * HanLP分词结果实现
- * 项目地址：https://github.com/hankcs/HanLP + * 项目地址：HanLP * * @author Looly * @@ -34,6 +34,11 @@ public class HanLPResult implements Result { Iterator result; + /** + * 构造 + * + * @param termList 分词结果列表 + */ public HanLPResult(final List termList) { this.result = termList.iterator(); } diff --git a/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java index afa7d7e12..cb79f0574 100644 --- a/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilTest.java @@ -98,7 +98,8 @@ public class SpringUtilTest { @Test public void getBeanWithTypeReferenceTest() { - final Map mapBean = SpringUtil.getBean(new TypeReference>() {}); + final Map mapBean = SpringUtil.getBean(new TypeReference<>() { + }); Assertions.assertNotNull(mapBean); Assertions.assertEquals("value1", mapBean.get("key1")); Assertions.assertEquals("value2", mapBean.get("key2")); diff --git a/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java index 0e6ec28e1..2fb0f3dcb 100644 --- a/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java +++ b/hutool-extra/src/test/java/cn/hutool/v7/extra/spring/SpringUtilWithAutoConfigTest.java @@ -59,7 +59,8 @@ public class SpringUtilWithAutoConfigTest { @Test public void getBeanWithTypeReferenceTest() { - final Map mapBean = SpringUtil.getBean(new TypeReference>() {}); + final Map mapBean = SpringUtil.getBean(new TypeReference<>() { + }); Assertions.assertNotNull(mapBean); Assertions.assertEquals("value1", mapBean.get("key1")); Assertions.assertEquals("value2", mapBean.get("key2")); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java index a4f2abcb5..7c7274efc 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/HeaderOperation.java @@ -152,9 +152,7 @@ public interface HeaderOperation> { return (T) this; } final Map> headerMaps = new LinkedHashMap<>(headers().size()); - headerMap.forEach((key, value) -> { - headerMaps.put(key, ListUtil.of(value)); - }); + headerMap.forEach((key, value) -> headerMaps.put(key, ListUtil.of(value))); return header(headerMaps, true); } diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java index cb7ed1d8b..9221bfb89 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/cookie/ThreadLocalCookieStore.java @@ -29,7 +29,7 @@ import java.util.List; */ public class ThreadLocalCookieStore implements CookieStoreSpi { - private final static ThreadLocal STORES = new ThreadLocal() { + private final static ThreadLocal STORES = new ThreadLocal<>() { @Override protected synchronized CookieStoreSpi initialValue() { /* InMemoryCookieStore */ diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java index 2a0341cb7..ac6efdccb 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient4/HttpClient4Engine.java @@ -170,8 +170,7 @@ public class HttpClient4Engine extends AbstractClientEngine { ); // 连接池配置 - if (config instanceof ApacheHttpClientConfig) { - final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; + if (config instanceof ApacheHttpClientConfig apacheHttpClientConfig) { final int maxTotal = apacheHttpClientConfig.getMaxTotal(); if (maxTotal > 0) { manager.setMaxTotal(maxTotal); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java index 0101cc2cb..3ec785507 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/httpclient5/HttpClient5Engine.java @@ -189,8 +189,7 @@ public class HttpClient5Engine extends AbstractClientEngine { connectionManagerBuilder.setDefaultConnectionConfig(connectionConfigBuilder.build()); // 连接池配置 - if (config instanceof ApacheHttpClientConfig) { - final ApacheHttpClientConfig apacheHttpClientConfig = (ApacheHttpClientConfig) config; + if (config instanceof ApacheHttpClientConfig apacheHttpClientConfig) { final int maxTotal = apacheHttpClientConfig.getMaxTotal(); if (maxTotal > 0) { connectionManagerBuilder.setMaxConnTotal(maxTotal); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java index 42ec335ef..0fff05747 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/client/engine/jdk/JdkHttpConnection.java @@ -219,9 +219,8 @@ public class JdkHttpConnection implements HeaderOperation, Cl public JdkHttpConnection setSSLInfo(final SSLInfo sslInfo) throws HttpException { final HttpURLConnection conn = this.conn; - if (conn instanceof HttpsURLConnection) { + if (conn instanceof HttpsURLConnection httpsConn) { // Https请求 - final HttpsURLConnection httpsConn = (HttpsURLConnection) conn; // 验证域 Opt.ofNullable(sslInfo.getHostnameVerifier()).ifPresent(httpsConn::setHostnameVerifier); Opt.ofNullable(sslInfo.getSocketFactory()).ifPresent(httpsConn::setSSLSocketFactory); diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java b/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java index 0f5fc007f..a9b11bba4 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/meta/Method.java @@ -22,7 +22,42 @@ package cn.hutool.v7.http.meta; * @author Looly */ public enum Method { - GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE, CONNECT, PATCH; + /** + * GET 请求 + */ + GET, + /** + * POST 请求 + */ + POST, + /** + * HEAD 请求 + */ + HEAD, + /** + * OPTIONS 请求 + */ + OPTIONS, + /** + * PUT 请求 + */ + PUT, + /** + * DELETE 请求 + */ + DELETE, + /** + * TRACE 请求 + */ + TRACE, + /** + * CONNECT 请求 + */ + CONNECT, + /** + * PATCH 请求 + */ + PATCH; /** * 是否忽略读取响应body部分
diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java index 02fc32f15..b7bd772cd 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/undertow/UndertowEngine.java @@ -100,11 +100,9 @@ public class UndertowEngine extends AbstractServerEngine { } // 请求处理器 - builder.setHandler(exchange -> { - this.handler.handle( - new UndertowRequest(exchange), - new UndertowResponse(exchange)); - }); + builder.setHandler(exchange -> this.handler.handle( + new UndertowRequest(exchange), + new UndertowResponse(exchange))); this.undertow = builder.build(); } } diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java index d18c65f7c..068943216 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/servlet/ServletUtil.java @@ -131,7 +131,7 @@ public class ServletUtil { */ public static T fillBean(final ServletRequest request, final T bean, final CopyOptions copyOptions) { final String beanName = StrUtil.lowerFirst(bean.getClass().getSimpleName()); - return BeanUtil.fillBean(bean, new ValueProvider() { + return BeanUtil.fillBean(bean, new ValueProvider<>() { @Override public Object value(final String key, final Type valueType) { String[] values = request.getParameterValues(key); diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java index d2795a8ee..59ed44173 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/engine/jackson/JacksonEngine.java @@ -146,7 +146,7 @@ public class JacksonEngine extends AbstractJSONEngine implements Wrapper, MatcherJS * @param elementType 元素类型 */ private static void fill(final JSONObject json, final Collection result, final Type elementType) { - json.forEach((key, value)->{ - result.add(null == value ? null : value.toBean(elementType)); - }); + json.forEach((key, value)-> result.add(null == value ? null : value.toBean(elementType))); } /** @@ -140,8 +138,6 @@ public class IterTypeAdapter implements MatcherJSONSerializer, MatcherJS * @param elementType 元素类型 */ private static void fill(final JSONArray json, final Collection result, final Type elementType) { - json.forEach((element)->{ - result.add(null == element ? null : element.toBean(elementType)); - }); + json.forEach((element)-> result.add(null == element ? null : element.toBean(elementType))); } } diff --git a/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java index 3e30211fa..cc200fd02 100644 --- a/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java +++ b/hutool-json/src/main/java/cn/hutool/v7/json/serializer/impl/TemporalTypeAdapter.java @@ -134,13 +134,11 @@ public class TemporalTypeAdapter implements MatcherJSONSerializer { final BeanPath next = beanPath.next(); if (null != next) { final Node node = next.getNode(); - if (node instanceof NameNode) { - final NameNode nameNode = (NameNode) node; + if (node instanceof NameNode nameNode) { if (nameNode.isNumber()) { return JSONUtil.ofArray(config); } diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java index 7f05a305d..09e94f0ab 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONArrayTest.java @@ -74,14 +74,14 @@ public class JSONArrayTest { array.addValue("value2"); array.addValue("value3"); - assertEquals(array.getObj(0), "value1"); + assertEquals("value1", array.getObj(0)); } @Test public void parseTest() { final String jsonStr = "[\"value1\", \"value2\", \"value3\"]"; final JSONArray array = JSONUtil.parseArray(jsonStr); - assertEquals(array.getObj(0), "value1"); + assertEquals("value1", array.getObj(0)); } @Test diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java b/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java index 975344f43..ae5bb9e6b 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/JSONConvertTest.java @@ -71,7 +71,7 @@ public class JSONConvertTest { final UserInfoDict userInfoDict = jsonObject.toBean(UserInfoDict.class); assertEquals(userInfoDict.getId(), Integer.valueOf(1)); - assertEquals(userInfoDict.getRealName(), "质量过关"); + assertEquals("质量过关", userInfoDict.getRealName()); //============ 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 0ca0bb4fc..830e8f4b3 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 @@ -37,16 +37,12 @@ public class JSONUtilTest { @Test public void parseInvalid() { - assertThrows(JSONException.class, () -> { - JSONUtil.parse("'abc"); - }); + assertThrows(JSONException.class, () -> JSONUtil.parse("'abc")); } @Test public void parseInvalid3() { - assertThrows(JSONException.class, () -> { - JSONUtil.parse("\"abc"); - }); + assertThrows(JSONException.class, () -> JSONUtil.parse("\"abc")); } @Test @@ -94,9 +90,7 @@ public class JSONUtilTest { */ @Test public void parseTest() { - assertThrows(JSONException.class, () -> { - JSONUtil.parseArray("[{\"a\":\"a\\x]"); - }); + assertThrows(JSONException.class, () -> JSONUtil.parseArray("[{\"a\":\"a\\x]")); } /** @@ -115,10 +109,8 @@ public class JSONUtilTest { */ @Test public void parseNumberToJSONArrayTest2() { - Assertions.assertThrows(JSONException.class, ()->{ - JSONUtil.parseArray(123L, - JSONConfig.of().setIgnoreError(false)); - }); + Assertions.assertThrows(JSONException.class, ()-> JSONUtil.parseArray(123L, + JSONConfig.of().setIgnoreError(false))); final JSONArray json = JSONUtil.parseArray(123L, JSONConfig.of().setIgnoreError(true)); @@ -222,7 +214,7 @@ public class JSONUtilTest { @Test public void toJsonStrFromSortedTest() { //noinspection SerializableInnerClassWithNonSerializableOuterClass - final SortedMap sortedMap = new TreeMap() { + 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/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java index 370d0b2d3..4c3bcb858 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue1101Test.java @@ -38,7 +38,7 @@ public class Issue1101Test { public void treeMapConvertTest(){ final String json = "[{\"nodeName\":\"admin\",\"treeNodeId\":\"00010001_52c95b83-2083-4138-99fb-e6e21f0c1277\",\"sort\":0,\"type\":10,\"parentId\":\"00010001\",\"children\":[],\"id\":\"52c95b83-2083-4138-99fb-e6e21f0c1277\",\"status\":true},{\"nodeName\":\"test\",\"treeNodeId\":\"00010001_97054a82-f8ff-46a1-b76c-cbacf6d18045\",\"sort\":0,\"type\":10,\"parentId\":\"00010001\",\"children\":[],\"id\":\"97054a82-f8ff-46a1-b76c-cbacf6d18045\",\"status\":true}]"; final JSONArray objects = JSONUtil.parseArray(json); - final TreeSet convert = ConvertUtil.convert(new TypeReference>() { + final TreeSet convert = ConvertUtil.convert(new TypeReference<>() { }, objects); Assertions.assertEquals(2, convert.size()); } 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 f84457ed5..676850306 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 @@ -27,14 +27,16 @@ import java.util.TreeMap; public class Issue3058Test { @Test void toJsonStrTest() { - final SortedMap sortedMap = new TreeMap() { + final SortedMap sortedMap = new TreeMap<>() { @Serial private static final long serialVersionUID = 1L; + { put("attributes", "a"); put("b", "b"); put("c", "c"); - }}; + } + }; final String jsonStr = JSONUtil.toJsonStr(sortedMap); Assertions.assertEquals("{\"attributes\":\"a\",\"b\":\"b\",\"c\":\"c\"}", jsonStr); diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java index 54582f6f9..e045300af 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3506Test.java @@ -40,7 +40,7 @@ public class Issue3506Test { final Languages bean = jsonObject.toBean(Languages.class); Assertions.assertNotNull(bean); - Assertions.assertEquals(bean.getLanguageType(), Java.class); + Assertions.assertEquals(Java.class, bean.getLanguageType()); } @Data diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java index cd43fc521..9b2b8e1a6 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/Issue3795Test.java @@ -28,8 +28,6 @@ public class Issue3795Test { @Test void toBeanTest() { final String fieldMapping = "[{\"lable\":\"id\",\"value\":\"id\"},{\"lable\":\"name\",\"value\":\"name\"},{\"lable\":\"age\",\"value\":\"age\"}]"; - Assertions.assertThrows(JSONException.class, ()->{ - JSONUtil.toBean(fieldMapping, new TypeReference>() {}); - }); + Assertions.assertThrows(JSONException.class, ()-> JSONUtil.toBean(fieldMapping, new TypeReference>() {})); } } diff --git a/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java index 8a9815b16..0f73977e3 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/issues/issueIVMD5/IssueIVMD5Test.java @@ -34,7 +34,8 @@ public class IssueIVMD5Test { public void toBeanTest() { final String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json"); - final TypeReference> typeReference = new TypeReference>() {}; + final TypeReference> typeReference = new TypeReference<>() { + }; final BaseResult bean = JSONUtil.toBean(jsonStr, JSONConfig.of(), typeReference.getType()); final StudentInfo data2 = bean.getData2(); @@ -48,7 +49,8 @@ public class IssueIVMD5Test { public void toBeanTest2() { final String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json"); - final TypeReference> typeReference = new TypeReference>() {}; + final TypeReference> typeReference = new TypeReference<>() { + }; final BaseResult bean = JSONUtil.toBean(jsonStr, JSONConfig.of(), typeReference.getType()); final List data = bean.getData(); 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 6f6271588..4b473901e 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 @@ -138,9 +138,10 @@ public class JWTTest { map.put("test1", "1"); map.put("test2", "2"); - final Map payload = new HashMap() { + final Map payload = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; + { put("username", username); put("bean", bean); @@ -161,7 +162,7 @@ public class JWTTest { final Map mapRes = jwt.getPayload("map", new TypeReference>(){}); Assertions.assertEquals(bean, beanRes); - Assertions.assertEquals(numRes, num); + Assertions.assertEquals(num, numRes); Assertions.assertEquals(username, strRes); Assertions.assertEquals(list.toString(), listRes.toString()); 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 6ab574fed..3cd677895 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 @@ -28,9 +28,10 @@ public class JWTUtilTest { @Test public void createTest(){ final byte[] key = "1234".getBytes(); - final Map map = new HashMap() { + final Map map = new HashMap<>() { @Serial private static final long serialVersionUID = 1L; + { put("uid", Integer.parseInt("123")); put("expire_time", System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 15); 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 12519380b..804875f47 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 @@ -34,7 +34,7 @@ public class PerfectEvaluationProductResVo extends ProductResBase { @Serial private static final long serialVersionUID = 1L; - public static final Map KEY_TO_KEY = new HashMap() { + 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/xml/Issue2748Test.java b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java index 475181ed1..9ac2f1a10 100644 --- a/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java +++ b/hutool-json/src/test/java/cn/hutool/v7/json/xml/Issue2748Test.java @@ -27,8 +27,6 @@ public class Issue2748Test { void toJSONObjectTest() { final String s = StrUtil.repeat("", 600); - Assertions.assertThrows(JSONException.class, () -> { - JSONXMLUtil.toJSONObject(s, ParseConfig.of().setMaxNestingDepth(512)); - }); + Assertions.assertThrows(JSONException.class, () -> JSONXMLUtil.toJSONObject(s, ParseConfig.of().setMaxNestingDepth(512))); } } diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java index affa49d2f..f0964cdc7 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/ExcelBase.java @@ -219,9 +219,8 @@ public class ExcelBase, C extends ExcelConfig> impleme @SuppressWarnings("unchecked") public T cloneSheet(final int sheetIndex, final String newSheetName, final boolean setAsCurrentSheet) { final Sheet sheet; - if (this.workbook instanceof XSSFWorkbook) { - final XSSFWorkbook workbook = (XSSFWorkbook) this.workbook; - sheet = workbook.cloneSheet(sheetIndex, newSheetName); + if (this.workbook instanceof XSSFWorkbook xssfWorkbook) { + sheet = xssfWorkbook.cloneSheet(sheetIndex, newSheetName); } else { sheet = this.workbook.cloneSheet(sheetIndex); // issue#I8QIBB，clone后的sheet的index应该重新获取 diff --git a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java index d561f6de2..66defbfa1 100644 --- a/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java +++ b/hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java @@ -210,9 +210,8 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader, * @return Bean */ public T toBean(final CharSequence group, final T bean) { - return BeanUtil.fillBean(bean, new ValueProvider() { + return BeanUtil.fillBean(bean, new ValueProvider<>() { @Override public Object value(final String key, final Type valueType) { diff --git a/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java index 9f23209d7..167f78371 100644 --- a/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java +++ b/hutool-setting/src/main/java/cn/hutool/v7/setting/toml/TomlWriter.java @@ -152,8 +152,7 @@ public class TomlWriter { for (final Map.Entry entry : table.entrySet()) { final String name = entry.getKey(); final Object value = entry.getValue(); - if (value instanceof Collection) {// array - final Collection c = (Collection) value; + if (value instanceof Collection c) {// array if (!c.isEmpty() && c.iterator().next() instanceof Map) {// array of tables if (simpleValues) { continue; @@ -179,8 +178,7 @@ public class TomlWriter { write(" = "); writeArray(c); } - } else if (value instanceof Object[]) {// array - final Object[] array = (Object[]) value; + } else if (value instanceof Object[] array) {// array if (array.length > 0 && array[0] instanceof Map) {// array of tables if (simpleValues) { continue; diff --git a/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java index d0f6861d2..99c1f7610 100644 --- a/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java +++ b/hutool-setting/src/test/java/cn/hutool/v7/setting/props/PropsTest.java @@ -40,10 +40,10 @@ public class PropsTest { //noinspection MismatchedQueryAndUpdateOfCollection final Props props = new Props("test.properties"); final String user = props.getProperty("user"); - Assertions.assertEquals(user, "root"); + Assertions.assertEquals("root", user); final String driver = props.getStr("driver"); - Assertions.assertEquals(driver, "com.mysql.jdbc.Driver"); + Assertions.assertEquals("com.mysql.jdbc.Driver", driver); } @Test @@ -52,10 +52,10 @@ public class PropsTest { //noinspection MismatchedQueryAndUpdateOfCollection final Props props = new Props("d:/test.properties"); final String user = props.getProperty("user"); - Assertions.assertEquals(user, "root"); + Assertions.assertEquals("root", user); final String driver = props.getStr("driver"); - Assertions.assertEquals(driver, "com.mysql.jdbc.Driver"); + Assertions.assertEquals("com.mysql.jdbc.Driver", driver); } @Test diff --git a/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java index c263fe2bf..924f3b6a3 100644 --- a/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java +++ b/hutool-socket/src/main/java/cn/hutool/v7/socket/protocol/Protocol.java @@ -25,6 +25,7 @@ package cn.hutool.v7.socket.protocol; *

* * @author Looly + * @param 消息类型 */ public interface Protocol extends MsgEncoder, MsgDecoder { diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java index 7bac1aedf..6969a09c5 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/RobotUtil.java @@ -96,8 +96,8 @@ public class RobotUtil { * @since 4.5.7 */ public static void click() { - ROBOT.mousePress(InputEvent.BUTTON1_MASK); - ROBOT.mouseRelease(InputEvent.BUTTON1_MASK); + ROBOT.mousePress(InputEvent.BUTTON1_DOWN_MASK); + ROBOT.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); delay(); } @@ -108,8 +108,8 @@ public class RobotUtil { * @since 4.5.7 */ public static void rightClick() { - ROBOT.mousePress(InputEvent.BUTTON3_MASK); - ROBOT.mouseRelease(InputEvent.BUTTON3_MASK); + ROBOT.mousePress(InputEvent.BUTTON3_DOWN_MASK); + ROBOT.mouseRelease(InputEvent.BUTTON3_DOWN_MASK); delay(); }