From 8e2c06c671f985ea3c34d123164e0f3fd14cf1b9 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 28 Apr 2022 03:20:23 +0800 Subject: [PATCH] fix code --- .../core/collection/TransCollection.java | 2 +- .../hutool/core/exceptions/CheckedUtil.java | 8 +++- .../cn/hutool/core/lang/ConsistentHash.java | 2 +- .../main/java/cn/hutool/core/lang/Dict.java | 2 +- .../main/java/cn/hutool/core/lang/Filter.java | 2 +- .../java/cn/hutool/core/lang/PatternPool.java | 0 .../java/cn/hutool/core/lang/RegexPool.java | 0 .../java/cn/hutool/core/lang/SimpleCache.java | 0 .../java/cn/hutool/core/lang/Singleton.java | 0 .../java/cn/hutool/core/lang/Snowflake.java | 2 +- .../hutool/core/lang/ansi/Ansi8BitColor.java | 0 .../hutool/core/lang/ansi/AnsiBackground.java | 0 .../cn/hutool/core/lang/ansi/AnsiColor.java | 0 .../cn/hutool/core/lang/ansi/AnsiElement.java | 0 .../cn/hutool/core/lang/ansi/AnsiEncoder.java | 0 .../cn/hutool/core/lang/ansi/AnsiStyle.java | 0 .../hutool/core/lang/ansi/package-info.java | 0 .../hutool/core/lang/caller/CallerUtil.java | 0 .../hutool/core/lang/caller/package-info.java | 2 +- .../hutool/core/lang/copier/package-info.java | 2 +- .../cn/hutool/core/lang/func/LambdaUtil.java | 0 .../cn/hutool/core/lang/func/Supplier1.java | 0 .../cn/hutool/core/lang/func/Supplier2.java | 0 .../cn/hutool/core/lang/func/Supplier3.java | 0 .../cn/hutool/core/lang/func/Supplier4.java | 0 .../cn/hutool/core/lang/func/Supplier5.java | 0 .../hutool/core/lang/func/package-info.java | 2 +- .../core/lang/generator/UUIDGenerator.java | 2 +- .../core/lang/generator/package-info.java | 2 +- .../cn/hutool/core/lang/hash/KetamaHash.java | 0 .../hutool/core/lang/hash/package-info.java | 2 +- .../hutool/core/{util => lang/id}/IdUtil.java | 5 ++- .../java/cn/hutool/core/lang/id/NanoId.java | 2 +- .../cn/hutool/core/lang/{ => id}/Pid.java | 2 +- .../cn/hutool/core/lang/{ => id}/UUID.java | 2 +- .../cn/hutool/core/lang/id/package-info.java | 0 .../cn/hutool/core/lang/intern/Interner.java | 2 +- .../hutool/core/lang/intern/WeakInterner.java | 0 .../hutool/core/lang/intern/package-info.java | 2 +- .../core/lang/loader/LazyFunLoader.java | 2 +- .../hutool/core/lang/loader/package-info.java | 2 +- .../cn/hutool/core/lang/mutable/Mutable.java | 2 +- .../core/lang/mutable/package-info.java | 2 +- .../cn/hutool/core/lang/package-info.java | 2 +- .../lang/reflect/ActualTypeMapperPool.java | 0 .../core/lang/reflect/LookupFactory.java | 0 .../core/lang/reflect/MethodHandleUtil.java | 2 +- .../core/lang/reflect/package-info.java | 2 +- .../hutool/core/lang/tree/package-info.java | 2 +- .../java/cn/hutool/core/util/RuntimeUtil.java | 2 +- .../java/cn/hutool/core/util/StrUtil.java | 1 + .../core/date/LocalDateTimeUtilTest.java | 1 - .../cn/hutool/core/io/WatchMonitorTest.java | 10 ++--- .../java/cn/hutool/core/lang/AssertTest.java | 10 ++--- .../cn/hutool/core/lang/ObjectIdTest.java | 8 ++-- .../cn/hutool/core/lang/SnowflakeTest.java | 2 +- .../java/cn/hutool/core/lang/UUIDTest.java | 1 + .../cn/hutool/core/lang/ValidatorTest.java | 2 +- .../hutool/core/lang/caller/CallerTest.java | 10 ++--- .../core/lang/caller/CallerUtilTest.java | 2 +- .../hutool/core/lang/tree/TreeSearchTest.java | 2 +- .../cn/hutool/core/math/ArrangementTest.java | 16 +++---- .../java/cn/hutool/core/util/IdUtilTest.java | 1 + .../src/test/resources/test-compile/a/A.java | 2 +- .../main/java/cn/hutool/cron/Scheduler.java | 2 +- .../hutool/cron/pattern/CronPatternUtil.java | 12 ++--- .../java/cn/hutool/cron/TaskTableTest.java | 2 +- .../cron/demo/AddAndRemoveMainTest.java | 2 +- .../java/cn/hutool/cron/demo/TestJob.java | 2 +- .../java/cn/hutool/cron/demo/TestJob2.java | 2 +- .../main/java/cn/hutool/db/ActiveEntity.java | 44 +++++++++---------- .../test/java/cn/hutool/db/ConcurentTest.java | 10 ++--- .../src/test/java/cn/hutool/db/MySQLTest.java | 1 - .../test/java/cn/hutool/db/OracleTest.java | 2 +- .../test/java/cn/hutool/db/SqlServerTest.java | 4 +- .../template/engine/enjoy/EnjoyEngine.java | 2 +- .../template/engine/rythm/RythmTemplate.java | 10 ++--- .../engine/thymeleaf/ThymeleafTemplate.java | 6 +-- .../tokenizer/engine/TokenizerFactory.java | 6 +-- .../cn/hutool/extra/ssh/JschUtilTest.java | 4 +- .../hutool/extra/template/ThymeleafTest.java | 2 +- .../java/cn/hutool/json/Issue488Test.java | 6 +-- .../json/issueIVMD5/IssueIVMD5Test.java | 12 ++--- .../src/main/java/cn/hutool/log/Log.java | 2 +- .../hutool/log/dialect/jdk/JdkLogFactory.java | 6 +-- .../java/cn/hutool/poi/excel/ExcelWriter.java | 2 +- .../java/cn/hutool/poi/word/TableUtil.java | 24 +++++----- .../cn/hutool/poi/excel/CellUtilTest.java | 2 +- .../cn/hutool/poi/excel/ExcelWriteTest.java | 2 +- .../hutool/setting/profile/GlobalProfile.java | 2 +- .../cn/hutool/setting/profile/Profile.java | 18 ++++---- .../cn/hutool/socket/aio/AioClientTest.java | 6 +-- .../cn/hutool/socket/aio/AioServerTest.java | 10 ++--- .../cn/hutool/socket/nio/NioClientTest.java | 2 +- .../cn/hutool/socket/nio/NioServerTest.java | 2 +- .../cn/hutool/swing/ClipboardMonitorTest.java | 2 +- 96 files changed, 175 insertions(+), 167 deletions(-) mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiBackground.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColor.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier1.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier2.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier3.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier4.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier5.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java rename hutool-core/src/main/java/cn/hutool/core/{util => lang/id}/IdUtil.java (98%) rename hutool-core/src/main/java/cn/hutool/core/lang/{ => id}/Pid.java (97%) mode change 100755 => 100644 rename hutool-core/src/main/java/cn/hutool/core/lang/{ => id}/UUID.java (99%) mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakInterner.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java mode change 100755 => 100644 hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java b/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java index 500d9d3db..5408483ac 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/TransCollection.java @@ -70,4 +70,4 @@ public class TransCollection extends AbstractCollection { public int size() { return fromCollection.size(); } -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java b/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java index ae595168a..c1ff0cbdc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/exceptions/CheckedUtil.java @@ -1,6 +1,12 @@ package cn.hutool.core.exceptions; -import cn.hutool.core.lang.func.*; +import cn.hutool.core.lang.func.Func; +import cn.hutool.core.lang.func.Func0; +import cn.hutool.core.lang.func.Func1; +import cn.hutool.core.lang.func.Supplier1; +import cn.hutool.core.lang.func.VoidFunc; +import cn.hutool.core.lang.func.VoidFunc0; +import cn.hutool.core.lang.func.VoidFunc1; import java.util.Objects; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java index d8e50fb65..fee25398b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ConsistentHash.java @@ -98,4 +98,4 @@ public class ConsistentHash implements Serializable{ //正好命中 return circle.get(hash); } -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java index 058aeba4c..2d3ec7796 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Dict.java @@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanPath; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.getter.BasicTypeGetter; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.func.LambdaUtil; +import cn.hutool.core.getter.BasicTypeGetter; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java b/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java index f7b98fe8f..ffc0aec0e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Filter.java @@ -14,4 +14,4 @@ public interface Filter { * @return 是否接受对象 */ boolean accept(T t); -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java b/hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java b/hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java b/hutool-core/src/main/java/cn/hutool/core/lang/Singleton.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java b/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java index c9eeac826..c676d0afa 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang; import cn.hutool.core.date.SystemClock; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/Ansi8BitColor.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiBackground.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiBackground.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColor.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColor.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiElement.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiEncoder.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiStyle.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/package-info.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java index 5380baf72..411d32358 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.caller; \ No newline at end of file +package cn.hutool.core.lang.caller; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java index 75f0babd3..c3fb07257 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.copier; \ No newline at end of file +package cn.hutool.core.lang.copier; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier1.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier1.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier2.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier2.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier3.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier3.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier4.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier4.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier5.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Supplier5.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java index 84fc234e6..f6c24fe5c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java @@ -7,4 +7,4 @@ * @author looly * */ -package cn.hutool.core.lang.func; \ No newline at end of file +package cn.hutool.core.lang.func; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java index ad6c33b47..a2bbad468 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/UUIDGenerator.java @@ -1,6 +1,6 @@ package cn.hutool.core.lang.generator; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; /** * UUID生成器 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java index 76ab4d9d0..8e59aa348 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.generator; \ No newline at end of file +package cn.hutool.core.lang.generator; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/KetamaHash.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java index 08ec2a52e..55e825f3b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.hash; \ No newline at end of file +package cn.hutool.core.lang.hash; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java rename to hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java index 3e8ebd45f..5bacfb1e5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/IdUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/IdUtil.java @@ -1,13 +1,14 @@ -package cn.hutool.core.util; +package cn.hutool.core.lang.id; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.ObjectId; import cn.hutool.core.lang.Singleton; import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.lang.UUID; +import cn.hutool.core.lang.id.UUID; import cn.hutool.core.lang.id.NanoId; import cn.hutool.core.net.NetUtil; +import cn.hutool.core.util.RuntimeUtil; /** * ID生成器工具类，此工具类中主要封装： diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java index 67045b9e4..a23b5363d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/NanoId.java @@ -15,7 +15,7 @@ import java.util.Random; * * *

- * 此实现的逻辑基于JavaScript的NanoId实现，见：https://github.com/ai/nanoid + * 此实现的逻辑基于JavaScript的NanoId实现，见：https://github.com/ai/nanoid * * @author David Klebanoff */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/Pid.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java old mode 100755 new mode 100644 similarity index 97% rename from hutool-core/src/main/java/cn/hutool/core/lang/Pid.java rename to hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java index 38a5eec2b..95ed6f94d --- a/hutool-core/src/main/java/cn/hutool/core/lang/Pid.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/Pid.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.id; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/UUID.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java similarity index 99% rename from hutool-core/src/main/java/cn/hutool/core/lang/UUID.java rename to hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java index 56b39b813..b7774bfce 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/UUID.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/id/UUID.java @@ -1,4 +1,4 @@ -package cn.hutool.core.lang; +package cn.hutool.core.lang.id; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/id/package-info.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java b/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java index b5276a6e8..c7f4563b8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/intern/Interner.java @@ -18,4 +18,4 @@ public interface Interner { * @return 样例对象 */ T intern(T sample); -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakInterner.java b/hutool-core/src/main/java/cn/hutool/core/lang/intern/WeakInterner.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java index 95e8d00d2..b709e4b09 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/intern/package-info.java @@ -5,4 +5,4 @@ * * @author looly */ -package cn.hutool.core.lang.intern; \ No newline at end of file +package cn.hutool.core.lang.intern; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java index df112f2f0..0d57c5b14 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyFunLoader.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; * * @param 被加载对象类型 * @author Mr.Po - * @see cn.hutool.core.lang.loader.LazyLoader + * @see LazyLoader * @since 5.6.1 */ public class LazyFunLoader extends LazyLoader { diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java index 70a00685d..5a70cfdcf 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.loader; \ No newline at end of file +package cn.hutool.core.lang.loader; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java index e14914014..ed9b95a25 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java @@ -20,4 +20,4 @@ public interface Mutable { */ void set(T value); -} \ No newline at end of file +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java index f2a6e86b5..f396e67a7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang.mutable; \ No newline at end of file +package cn.hutool.core.lang.mutable; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java index 21575f382..93151ca55 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/package-info.java @@ -4,4 +4,4 @@ * @author looly * */ -package cn.hutool.core.lang; \ No newline at end of file +package cn.hutool.core.lang; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/ActualTypeMapperPool.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/LookupFactory.java old mode 100755 new mode 100644 diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java old mode 100755 new mode 100644 index fbfa2ded3..1914a096f --- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/MethodHandleUtil.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang.reflect; -import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Assert; +import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java index 918772a1a..1d46de461 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/reflect/package-info.java @@ -4,4 +4,4 @@ * @author looly * @since 5.4.2 */ -package cn.hutool.core.lang.reflect; \ No newline at end of file +package cn.hutool.core.lang.reflect; diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java index efb648a0c..a4fe660b2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/tree/package-info.java @@ -11,4 +11,4 @@ * @author liangbaikai（https://gitee.com/liangbaikai00/） * @since 5.2.1 */ -package cn.hutool.core.lang.tree; \ No newline at end of file +package cn.hutool.core.lang.tree; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java index ed927a440..3b95b6cd9 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java @@ -3,7 +3,7 @@ package cn.hutool.core.util; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.Pid; +import cn.hutool.core.lang.id.Pid; import cn.hutool.core.text.StrBuilder; import java.io.File; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java index 9d8d72f32..59d7c1561 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/StrUtil.java @@ -1,5 +1,6 @@ package cn.hutool.core.util; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrBuilder; import cn.hutool.core.text.StrFormatter; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java index 08a89b122..269bf37f7 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalAccessor; -import java.util.Date; public class LocalDateTimeUtilTest { diff --git a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java index ae10dbf98..d1e372a7a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java @@ -11,7 +11,7 @@ import cn.hutool.core.lang.Console; /** * 文件监听单元测试 - * + * * @author Looly * */ @@ -43,12 +43,12 @@ public class WatchMonitorTest { Console.log("Overflow：{}-> {}", currentPath, obj); } }; - + WatchMonitor monitor = WatchMonitor.createAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500)); - + monitor.setMaxDepth(0); monitor.start(); } - - + + } diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java index e20ef6e96..eb8080820 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java @@ -3,30 +3,30 @@ package cn.hutool.core.lang; import org.junit.Test; public class AssertTest { - + @Test public void isNullTest(){ String a = null; - cn.hutool.core.lang.Assert.isNull(a); + Assert.isNull(a); } @Test public void notNullTest(){ String a = null; - cn.hutool.core.lang.Assert.isNull(a); + Assert.isNull(a); } @Test(expected = IllegalArgumentException.class) public void isTrueTest() { int i = 0; //noinspection ConstantConditions - cn.hutool.core.lang.Assert.isTrue(i > 0, IllegalArgumentException::new); + Assert.isTrue(i > 0, IllegalArgumentException::new); } @Test(expected = IndexOutOfBoundsException.class) public void isTrueTest2() { int i = -1; //noinspection ConstantConditions - cn.hutool.core.lang.Assert.isTrue(i >= 0, IndexOutOfBoundsException::new); + Assert.isTrue(i >= 0, IndexOutOfBoundsException::new); } @Test(expected = IndexOutOfBoundsException.class) diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java index c7abdc4b6..dbf9c0446 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java @@ -8,12 +8,12 @@ import org.junit.Test; /** * ObjectId单元测试 - * + * * @author looly * */ public class ObjectIdTest { - + @Test public void distinctTest() { //生成10000个id测试是否重复 @@ -21,10 +21,10 @@ public class ObjectIdTest { for(int i = 0; i < 10000; i++) { set.add(ObjectId.next()); } - + Assert.assertEquals(10000, set.size()); } - + @Test @Ignore public void nextTest() { diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java index ca02e5e67..9bbb25db3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java @@ -3,7 +3,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.StrUtil; import org.junit.Assert; import org.junit.Ignore; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java index 2695b80f5..c5ba476f3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java @@ -1,6 +1,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.ConcurrentHashSet; +import cn.hutool.core.lang.id.UUID; import cn.hutool.core.thread.ThreadUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java index bfd6c7ddb..bae67d22a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java @@ -1,7 +1,7 @@ package cn.hutool.core.lang; import cn.hutool.core.exceptions.ValidateException; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java index 80df6f955..1ab0890ee 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java @@ -9,25 +9,25 @@ import org.junit.Test; * */ public class CallerTest { - + @Test public void getCallerTest() { Class caller = CallerUtil.getCaller(); Assert.assertEquals(this.getClass(), caller); - + Class caller0 = CallerUtil.getCaller(0); Assert.assertEquals(CallerUtil.class, caller0); - + Class caller1 = CallerUtil.getCaller(1); Assert.assertEquals(this.getClass(), caller1); } - + @Test public void getCallerCallerTest() { Class callerCaller = CallerTestClass.getCaller(); Assert.assertEquals(this.getClass(), callerCaller); } - + private static class CallerTestClass{ public static Class getCaller(){ return CallerUtil.getCallerCaller(); diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java index 4ef3d44b5..d1508c837 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java @@ -13,4 +13,4 @@ public class CallerUtilTest { final String fullCallerMethodName = CallerUtil.getCallerMethodName(true); Assert.assertEquals("cn.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName); } -} \ No newline at end of file +} diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java index 7ef3bacc5..02b8b560b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java @@ -27,7 +27,7 @@ public class TreeSearchTest { @Test public void searchNode() { - List> treeItems=TreeUtil.build(all_menu, 0L); + List> treeItems= TreeUtil.build(all_menu, 0L); Tree tree=treeItems.get(0); Tree searchResult=tree.getNode(3L); diff --git a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java b/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java index cf5112cc8..2cf93f64d 100644 --- a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java @@ -14,22 +14,22 @@ import cn.hutool.core.lang.Console; * */ public class ArrangementTest { - + @Test public void arrangementTest() { long result = Arrangement.count(4, 2); Assert.assertEquals(12, result); - + result = Arrangement.count(4, 1); Assert.assertEquals(4, result); - + result = Arrangement.count(4, 0); Assert.assertEquals(1, result); - + long resultAll = Arrangement.countAll(4); Assert.assertEquals(64, resultAll); } - + @Test public void selectTest() { Arrangement arrangement = new Arrangement(new String[] { "1", "2", "3", "4" }); @@ -47,14 +47,14 @@ public class ArrangementTest { Assert.assertArrayEquals(new String[] {"4", "1"}, list.get(9)); Assert.assertArrayEquals(new String[] {"4", "2"}, list.get(10)); Assert.assertArrayEquals(new String[] {"4", "3"}, list.get(11)); - + List selectAll = arrangement.selectAll(); Assert.assertEquals(Arrangement.countAll(4), selectAll.size()); - + List list2 = arrangement.select(0); Assert.assertEquals(1, list2.size()); } - + @Test @Ignore public void selectTest2() { diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java index f0dd9c5ab..a900bf071 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.TimeInterval; import cn.hutool.core.exceptions.UtilException; import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.thread.ThreadUtil; import org.junit.Assert; import org.junit.Ignore; diff --git a/hutool-core/src/test/resources/test-compile/a/A.java b/hutool-core/src/test/resources/test-compile/a/A.java index 8424934d5..f87d54642 100644 --- a/hutool-core/src/test/resources/test-compile/a/A.java +++ b/hutool-core/src/test/resources/test-compile/a/A.java @@ -21,4 +21,4 @@ public class A { t.print(); }}; } -} \ No newline at end of file +} diff --git a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java index e2111b6a1..07da4ff1b 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java @@ -4,7 +4,7 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.thread.ExecutorBuilder; import cn.hutool.core.thread.ThreadFactoryBuilder; import cn.hutool.core.util.CharUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.cron.listener.TaskListener; import cn.hutool.cron.listener.TaskListenerManager; diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java index 1659923a2..ee1123e74 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/pattern/CronPatternUtil.java @@ -11,7 +11,7 @@ import java.util.List; /** * 定时任务表达式工具类 - * + * * @author looly * */ @@ -19,7 +19,7 @@ public class CronPatternUtil { /** * 列举指定日期之后（到开始日期对应年年底）内第一个匹配表达式的日期 - * + * * @param pattern 表达式 * @param start 起始时间 * @param isMatchSecond 是否匹配秒 @@ -36,7 +36,7 @@ public class CronPatternUtil { /** * 列举指定日期之后（到开始日期对应年年底）内所有匹配表达式的日期 - * + * * @param patternStr 表达式字符串 * @param start 起始时间 * @param count 列举数量 @@ -49,7 +49,7 @@ public class CronPatternUtil { /** * 列举指定日期范围内所有匹配表达式的日期 - * + * * @param patternStr 表达式字符串 * @param start 起始时间 * @param end 结束时间 @@ -63,7 +63,7 @@ public class CronPatternUtil { /** * 列举指定日期范围内所有匹配表达式的日期 - * + * * @param patternStr 表达式字符串 * @param start 起始时间 * @param end 结束时间 @@ -77,7 +77,7 @@ public class CronPatternUtil { /** * 列举指定日期范围内所有匹配表达式的日期 - * + * * @param pattern 表达式 * @param start 起始时间 * @param end 结束时间 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java index 318a25e1f..8612b3956 100644 --- a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java +++ b/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java @@ -1,7 +1,7 @@ package cn.hutool.cron; import cn.hutool.core.lang.Console; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.cron.pattern.CronPattern; import org.junit.Ignore; import org.junit.Test; diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java index cd54515e8..3f66a2dd9 100644 --- a/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java +++ b/hutool-cron/src/test/java/cn/hutool/cron/demo/AddAndRemoveMainTest.java @@ -5,7 +5,7 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.cron.CronUtil; public class AddAndRemoveMainTest { - + public static void main(String[] args) { CronUtil.setMatchSecond(true); CronUtil.start(false); diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java index 3ca061f97..11c2f6b42 100644 --- a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java +++ b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob.java @@ -3,7 +3,7 @@ package cn.hutool.cron.demo; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; /** * 测试定时任务，当触发到定时的时间点时，执行doTest方法 diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java index eb9c070dd..1d3030c7e 100644 --- a/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java +++ b/hutool-cron/src/test/java/cn/hutool/cron/demo/TestJob2.java @@ -7,7 +7,7 @@ import cn.hutool.core.thread.ThreadUtil; /** * 测试定时任务，当触发到定时的时间点时，执行doTest方法 - * + * * @author looly * */ diff --git a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java b/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java index 735174958..d21655eb1 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java +++ b/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java @@ -9,7 +9,7 @@ import cn.hutool.core.map.MapUtil; /** * 动态实体类
* 提供了针对自身实体的增删改方法 - * + * * @author Looly * */ @@ -21,7 +21,7 @@ public class ActiveEntity extends Entity { // --------------------------------------------------------------- Static method start /** * 创建ActiveEntity - * + * * @return ActiveEntity */ public static ActiveEntity create() { @@ -30,7 +30,7 @@ public class ActiveEntity extends Entity { /** * 创建ActiveEntity - * + * * @param tableName 表名 * @return ActiveEntity */ @@ -40,7 +40,7 @@ public class ActiveEntity extends Entity { /** * 将PO对象转为Entity - * + * * @param Bean对象类型 * @param bean Bean对象 * @return ActiveEntity @@ -51,7 +51,7 @@ public class ActiveEntity extends Entity { /** * 将PO对象转为ActiveEntity - * + * * @param Bean对象类型 * @param bean Bean对象 * @param isToUnderlineCase 是否转换为下划线模式 @@ -64,7 +64,7 @@ public class ActiveEntity extends Entity { /** * 将PO对象转为ActiveEntity,并采用下划线法转换字段 - * + * * @param Bean对象类型 * @param bean Bean对象 * @return ActiveEntity @@ -84,7 +84,7 @@ public class ActiveEntity extends Entity { /** * 构造 - * + * * @param tableName 表名 */ public ActiveEntity(String tableName) { @@ -93,7 +93,7 @@ public class ActiveEntity extends Entity { /** * 构造 - * + * * @param entity 非动态实体 */ public ActiveEntity(Entity entity) { @@ -102,7 +102,7 @@ public class ActiveEntity extends Entity { /** * 构造 - * + * * @param db {@link Db} * @param tableName 表名 */ @@ -113,7 +113,7 @@ public class ActiveEntity extends Entity { /** * 构造 - * + * * @param db {@link Db} * @param entity 非动态实体 */ @@ -123,17 +123,17 @@ public class ActiveEntity extends Entity { this.db = db; } // -------------------------------------------------------------------------- Constructor end - + @Override public ActiveEntity setTableName(String tableName) { return (ActiveEntity) super.setTableName(tableName); } - + @Override public ActiveEntity setFieldNames(Collection fieldNames) { return (ActiveEntity) super.setFieldNames(fieldNames); } - + @Override public ActiveEntity setFieldNames(String... fieldNames) { return (ActiveEntity) super.setFieldNames(fieldNames); @@ -153,27 +153,27 @@ public class ActiveEntity extends Entity { public ActiveEntity addFieldNames(String... fieldNames) { return (ActiveEntity) super.addFieldNames(fieldNames); } - + @Override public ActiveEntity parseBean(T bean) { return (ActiveEntity) super.parseBean(bean); } - + @Override public ActiveEntity parseBean(T bean, boolean isToUnderlineCase, boolean ignoreNullValue) { return (ActiveEntity) super.parseBean(bean, isToUnderlineCase, ignoreNullValue); } - + @Override public ActiveEntity set(String field, Object value) { return (ActiveEntity) super.set(field, value); } - + @Override public ActiveEntity setIgnoreNull(String field, Object value) { return (ActiveEntity) super.setIgnoreNull(field, value); } - + @Override public ActiveEntity clone() { return (ActiveEntity) super.clone(); @@ -182,7 +182,7 @@ public class ActiveEntity extends Entity { // -------------------------------------------------------------------------- CRUD start /** * 根据Entity中现有字段条件从数据库中增加一条数据 - * + * * @return this */ public ActiveEntity add() { @@ -196,7 +196,7 @@ public class ActiveEntity extends Entity { /** * 根据Entity中现有字段条件从数据库中加载一个Entity对象 - * + * * @return this */ public ActiveEntity load() { @@ -213,7 +213,7 @@ public class ActiveEntity extends Entity { /** * 根据现有Entity中的条件删除与之匹配的数据库记录 - * + * * @return this */ public ActiveEntity del() { @@ -227,7 +227,7 @@ public class ActiveEntity extends Entity { /** * 根据现有Entity中的条件删除与之匹配的数据库记录 - * + * * @param primaryKey 主键名 * @return this */ diff --git a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java index f861cbd3e..348dde92e 100644 --- a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java @@ -13,20 +13,20 @@ import java.util.List; /** * SqlRunner线程安全测试 - * + * * @author looly * */ @Ignore public class ConcurentTest { - + private Db db; - + @Before public void init() { db = Db.use("test"); } - + @Test public void findTest() { for(int i = 0; i < 10000; i++) { @@ -40,7 +40,7 @@ public class ConcurentTest { Console.log(find); }); } - + //主线程关闭会导致连接池销毁，sleep避免此情况引起的问题 ThreadUtil.sleep(5000); } diff --git a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java index 8ecebb74e..c7aa2e4bf 100644 --- a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java @@ -1,7 +1,6 @@ package cn.hutool.db; import cn.hutool.core.lang.Console; -import cn.hutool.core.util.ArrayUtil; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java index f042e7549..618b8eb2b 100644 --- a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java @@ -12,7 +12,7 @@ import java.sql.SQLException; /** * Oracle操作单元测试 - * + * * @author looly * */ diff --git a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java b/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java index c9842b458..7605e3478 100644 --- a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java @@ -9,12 +9,12 @@ import cn.hutool.core.lang.Console; /** * SQL Server操作单元测试 - * + * * @author looly * */ public class SqlServerTest { - + @Test @Ignore public void createTableTest() throws SQLException { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java index 59c1c815e..e7cc95244 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java @@ -1,7 +1,7 @@ package cn.hutool.extra.template.engine.enjoy; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java index 3e54e6593..4e3df13cc 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmTemplate.java @@ -11,7 +11,7 @@ import java.util.Map; /** * Rythm模板包装 - * + * * @author looly * */ @@ -19,20 +19,20 @@ public class RythmTemplate extends AbstractTemplate implements Serializable { private static final long serialVersionUID = -132774960373894911L; private final org.rythmengine.template.ITemplate rawTemplate; - + /** * 包装Rythm模板 - * + * * @param template Rythm的模板对象 {@link org.rythmengine.template.ITemplate} * @return {@link RythmTemplate} */ public static RythmTemplate wrap(org.rythmengine.template.ITemplate template) { return (null == template) ? null : new RythmTemplate(template); } - + /** * 构造 - * + * * @param rawTemplate Velocity模板对象 */ public RythmTemplate(org.rythmengine.template.ITemplate rawTemplate) { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java index d74686f23..720992fe5 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java @@ -18,7 +18,7 @@ import java.util.Map; /** * Thymeleaf模板实现 - * + * * @author looly * @since 4.1.11 */ @@ -31,7 +31,7 @@ public class ThymeleafTemplate extends AbstractTemplate implements Serializable /** * 包装Thymeleaf模板 - * + * * @param engine Thymeleaf的模板引擎对象 {@link TemplateEngine} * @param template 模板路径或模板内容 * @param charset 编码 @@ -43,7 +43,7 @@ public class ThymeleafTemplate extends AbstractTemplate implements Serializable /** * 构造 - * + * * @param engine Thymeleaf的模板对象 {@link TemplateEngine} * @param template 模板路径或模板内容 * @param charset 编码 diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java index 6440eac2a..515b074b3 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/engine/TokenizerFactory.java @@ -9,7 +9,7 @@ import cn.hutool.log.StaticLog; /** * 简单分词引擎工厂，用于根据用户引入的分词引擎jar，自动创建对应的引擎 - * + * * @author looly * */ @@ -28,7 +28,7 @@ public class TokenizerFactory { /** * 根据用户引入的分词引擎jar，自动创建对应的分词引擎对象 - * + * * @return {@link TokenizerEngine} */ public static TokenizerEngine create() { @@ -39,7 +39,7 @@ public class TokenizerFactory { /** * 根据用户引入的分词引擎jar，自动创建对应的分词引擎对象 - * + * * @return {@link TokenizerEngine} */ private static TokenizerEngine doCreate() { diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java index d43f7f2fe..7d80dc9a3 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java @@ -9,7 +9,7 @@ import org.junit.Test; /** * Jsch工具类单元测试 - * + * * @author looly * */ @@ -47,7 +47,7 @@ public class JschUtilTest { sftp.mkDirs("/opt/test/aaa/bbb"); Console.log("OK"); } - + @Test @Ignore public void reconnectIfTimeoutTest() throws InterruptedException { diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java index 6101fa908..ccb20c81d 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java @@ -19,7 +19,7 @@ import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine; /** * Thymeleaf单元测试 - * + * * @author looly * */ diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java index d7244624e..867f49ed9 100644 --- a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java @@ -14,12 +14,12 @@ public class Issue488Test { @Test public void toBeanTest() { String jsonStr = ResourceUtil.readUtf8Str("issue488.json"); - + ResultSuccess> result = JSONUtil.toBean(jsonStr, new TypeReference>>() {}, false); - + Assert.assertEquals("https://graph.microsoft.com/beta/$metadata#Collection(microsoft.graph.emailAddress)", result.getContext()); - + List adds = result.getValue(); Assert.assertEquals("会议室101", adds.get(0).getName()); Assert.assertEquals("MeetingRoom101@abc.com", adds.get(0).getAddress()); diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java index 0b934170d..c17a80242 100644 --- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java @@ -10,31 +10,31 @@ import cn.hutool.core.lang.TypeReference; import cn.hutool.json.JSONUtil; public class IssueIVMD5Test { - + /** * 测试泛型对象中有泛型字段的转换成功与否 */ @Test public void toBeanTest() { String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json"); - + TypeReference> typeReference = new TypeReference>() {}; BaseResult bean = JSONUtil.toBean(jsonStr, typeReference.getType(), false); - + StudentInfo data2 = bean.getData2(); Assert.assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", data2.getAccountId()); } - + /** * 测试泛型对象中有包含泛型字段的类型的转换成功与否，比如List<T> list */ @Test public void toBeanTest2() { String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json"); - + TypeReference> typeReference = new TypeReference>() {}; BaseResult bean = JSONUtil.toBean(jsonStr, typeReference.getType(), false); - + List data = bean.getData(); StudentInfo studentInfo = data.get(0); Assert.assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", studentInfo.getAccountId()); diff --git a/hutool-log/src/main/java/cn/hutool/log/Log.java b/hutool-log/src/main/java/cn/hutool/log/Log.java index db50768c9..888146468 100644 --- a/hutool-log/src/main/java/cn/hutool/log/Log.java +++ b/hutool-log/src/main/java/cn/hutool/log/Log.java @@ -10,7 +10,7 @@ import cn.hutool.log.level.WarnLog; /** * 日志统一接口 - * + * * @author Looly * */ diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java index 89b1a52a3..7c5e3882e 100644 --- a/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java +++ b/hutool-log/src/main/java/cn/hutool/log/dialect/jdk/JdkLogFactory.java @@ -16,7 +16,7 @@ import cn.hutool.log.LogFactory; * */ public class JdkLogFactory extends LogFactory{ - + public JdkLogFactory() { super("JDK Logging"); readConfig(); @@ -31,7 +31,7 @@ public class JdkLogFactory extends LogFactory{ public Log createLog(Class clazz) { return new JdkLog(clazz); } - + /** * 读取ClassPath下的logging.properties配置文件 */ @@ -42,7 +42,7 @@ public class JdkLogFactory extends LogFactory{ System.err.println("[WARN] Can not find [logging.properties], use [%JRE_HOME%/lib/logging.properties] as default!"); return; } - + try { LogManager.getLogManager().readConfiguration(in); } catch (Exception e) { diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java index 7087c14c0..cd93ae0f3 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java @@ -12,7 +12,7 @@ import cn.hutool.core.map.TableMap; import cn.hutool.core.map.multi.RowKeyTable; import cn.hutool.core.map.multi.Table; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.poi.excel.cell.CellLocation; diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java index ef0bd8d17..4d27b5294 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java @@ -16,15 +16,15 @@ import java.util.Map; /** * Word中表格相关工具 - * + * * @author Looly * @since 4.5.14 */ public class TableUtil { - + /** * 创建空表，只有一行 - * + * * @param doc {@link XWPFDocument} * @return {@link XWPFTable} */ @@ -34,7 +34,7 @@ public class TableUtil { /** * 创建表格并填充数据，默认表格 - * + * * @param doc {@link XWPFDocument} * @param data 数据 * @return {@link XWPFTable} @@ -72,10 +72,10 @@ public class TableUtil { return table; } - + /** * 写一行数据 - * + * * @param row 行 * @param rowBean 行数据 * @param isWriteKeyAsHead 如果为Map或者Bean，是否写标题 @@ -86,7 +86,7 @@ public class TableUtil { writeRow(row, (Iterable) rowBean); return; } - + Map rowMap; if(rowBean instanceof Map) { rowMap = (Map) rowBean; @@ -100,10 +100,10 @@ public class TableUtil { writeRow(row, rowMap, isWriteKeyAsHead); } - + /** * 写行数据 - * + * * @param row 行 * @param rowMap 行数据 * @param isWriteKeyAsHead 是否写标题 @@ -122,7 +122,7 @@ public class TableUtil { /** * 写行数据 - * + * * @param row 行 * @param rowData 行数据 */ @@ -139,7 +139,7 @@ public class TableUtil { /** * 获取或创建新行
* 存在则直接返回，不存在创建新的行 - * + * * @param table {@link XWPFTable} * @param index 索引（行号），从0开始 * @return {@link XWPFTableRow} @@ -156,7 +156,7 @@ public class TableUtil { /** * 获取或创建新单元格
* 存在则直接返回，不存在创建新的单元格 - * + * * @param row {@link XWPFTableRow} 行 * @param index index 索引（列号），从0开始 * @return {@link XWPFTableCell} diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java index e1da42df1..1e5602409 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import cn.hutool.core.lang.Console; public class CellUtilTest { - + @Test @Ignore public void isDateTest() { diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java index ab47b91b9..dd9e80704 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java @@ -7,7 +7,7 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.IdUtil; +import cn.hutool.core.lang.id.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.poi.excel.cell.setters.EscapeStrCellSetter; import cn.hutool.poi.excel.style.StyleUtil; diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java b/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java index 5280031c2..c979b8269 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/profile/GlobalProfile.java @@ -5,7 +5,7 @@ import cn.hutool.setting.Setting; /** * 全局的Profile配置中心 - * + * * @author Looly * */ diff --git a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java index c66c82b8f..70af757c6 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/profile/Profile.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; *

  • develop =》 ${classpath}/develop/db.setting
    • *
  • production =》 ${classpath}/production/db.setting
    • * - * + * * @author Looly * */ @@ -48,7 +48,7 @@ public class Profile implements Serializable { /** * 构造，编码UTF-8，不使用变量 - * + * * @param profile 环境 */ public Profile(String profile) { @@ -57,7 +57,7 @@ public class Profile implements Serializable { /** * 构造 - * + * * @param profile 环境 * @param charset 编码 * @param useVar 是否使用变量 @@ -71,7 +71,7 @@ public class Profile implements Serializable { /** * 获取当前环境下的配置文件 - * + * * @param name 文件名，如果没有扩展名，默认为.setting * @return 当前环境下配置文件 */ @@ -87,7 +87,7 @@ public class Profile implements Serializable { /** * 设置环境 - * + * * @param profile 环境 * @return 自身 */ @@ -98,7 +98,7 @@ public class Profile implements Serializable { /** * 设置编码 - * + * * @param charset 编码 * @return 自身 */ @@ -109,7 +109,7 @@ public class Profile implements Serializable { /** * 设置是否使用变量 - * + * * @param useVar 变量 * @return 自身 */ @@ -120,7 +120,7 @@ public class Profile implements Serializable { /** * 清空所有环境的配置文件 - * + * * @return 自身 */ public Profile clear() { @@ -131,7 +131,7 @@ public class Profile implements Serializable { // -------------------------------------------------------------------------------- Private method start /** * 修正文件名 - * + * * @param name 文件名 * @return 修正后的文件名 */ diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java index f0694a080..da8d9947d 100644 --- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java +++ b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioClientTest.java @@ -9,7 +9,7 @@ import java.nio.ByteBuffer; public class AioClientTest { public static void main(String[] args) { AioClient client = new AioClient(new InetSocketAddress("localhost", 8899), new SimpleIoAction() { - + @Override public void doAction(AioSession session, ByteBuffer data) { if(data.hasRemaining()) { @@ -19,10 +19,10 @@ public class AioClientTest { Console.log("OK"); } }); - + client.write(ByteBuffer.wrap("Hello".getBytes())); client.read(); - + client.close(); } } diff --git a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java index fa3561aa8..06c43472f 100644 --- a/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java +++ b/hutool-socket/src/test/java/cn/hutool/socket/aio/AioServerTest.java @@ -9,23 +9,23 @@ import cn.hutool.log.StaticLog; import java.nio.ByteBuffer; public class AioServerTest { - + public static void main(String[] args) { - + @SuppressWarnings("resource") AioServer aioServer = new AioServer(8899); aioServer.setIoAction(new SimpleIoAction() { - + @Override public void accept(AioSession session) { StaticLog.debug("【客户端】：{} 连接。", session.getRemoteAddress()); session.write(BufferUtil.createUtf8("=== Welcome to Hutool socket server. ===")); } - + @Override public void doAction(AioSession session, ByteBuffer data) { Console.log(data); - + if(false == data.hasRemaining()) { StringBuilder response = StrUtil.builder()// .append("HTTP/1.1 200 OK\r\n")// diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java index e993e4bb3..a136a15c6 100644 --- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java +++ b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioClientTest.java @@ -47,4 +47,4 @@ public class NioClientTest { } } } -} \ No newline at end of file +} diff --git a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java index f1d74b3ea..3a6e5d82f 100644 --- a/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java +++ b/hutool-socket/src/test/java/cn/hutool/socket/nio/NioServerTest.java @@ -47,4 +47,4 @@ public class NioServerTest { //将缓冲数据写入渠道，返回给客户端 channel.write(BufferUtil.createUtf8(response)); } -} \ No newline at end of file +} diff --git a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java index 693b5e043..3a952782a 100644 --- a/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java +++ b/hutool-swing/src/test/java/cn/hutool/swing/ClipboardMonitorTest.java @@ -16,7 +16,7 @@ public class ClipboardMonitorTest { Console.log("1# {}", object); return contents; }, false); - + // 第二个监听 ClipboardUtil.listen((clipboard, contents) -> { Object object = ClipboardUtil.getStr(contents);