From 1ee014bdaefaf37e4f4214c24e2121be92986c62 Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 21 Jun 2022 18:42:52 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/Hutool.java | 2 +- .../hutool/core/cache/GlobalPruneTimer.java | 6 +-- .../hutool/core/collection/UniqueKeySet.java | 4 +- .../cn/hutool/core/compiler/CompilerUtil.java | 4 +- .../core/compiler/JavaSourceCompiler.java | 2 +- .../core/convert/impl/BeanConverter.java | 2 +- .../core/date/{ => chinese}/ChineseDate.java | 7 +++- .../hutool/core/date/chinese/SolarTerms.java | 1 - .../java/cn/hutool/core/io/BufferUtil.java | 8 ++-- .../hutool/core/io/file/FileSystemUtil.java | 2 +- .../cn/hutool/core/io/watch/WatchMonitor.java | 18 ++++----- .../cn/hutool/core/io/watch/WatchUtil.java | 38 +++++++++---------- .../core/io/watch/watchers/WatcherChain.java | 2 +- .../cn/hutool/core/lang/ConsoleTable.java | 2 +- .../cn/hutool/core/lang/WeightRandom.java | 2 +- .../java/cn/hutool/core/map/CamelCaseMap.java | 2 +- .../hutool/core/map/CaseInsensitiveMap.java | 2 +- .../main/java/cn/hutool/core/map/Dict.java | 8 ++-- .../java/cn/hutool/core/map/MapBuilder.java | 10 ++--- .../java/cn/hutool/core/map/MapProxy.java | 2 +- .../main/java/cn/hutool/core/map/MapUtil.java | 2 +- .../cn/hutool/core/net/SSLContextBuilder.java | 2 +- .../main/java/cn/hutool/core/net/SSLUtil.java | 4 +- .../cn/hutool/core/net/url/UrlBuilder.java | 2 +- .../core/thread/ThreadFactoryBuilder.java | 2 +- .../cn/hutool/core/thread/ThreadUtil.java | 4 +- .../cn/hutool/core/util/ReferenceUtil.java | 6 +-- .../cn/hutool/core/bean/BeanUtilTest.java | 2 +- .../hutool/core/collection/CollUtilTest.java | 6 +-- .../hutool/core/collection/MapProxyTest.java | 2 +- .../hutool/core/convert/MapConvertTest.java | 2 +- .../cn/hutool/core/date/ChineseDateTest.java | 1 + .../java/cn/hutool/core/date/GanzhiTest.java | 1 + .../core/date/chinese/SolarTermsTest.java | 1 - .../cn/hutool/core/io/WatchMonitorTest.java | 2 +- .../cn/hutool/core/lang/ConsoleTableTest.java | 10 ++--- .../java/cn/hutool/core/lang/DictTest.java | 4 +- .../cn/hutool/core/lang/WeightRandomTest.java | 2 +- .../cn/hutool/core/map/MapBuilderTest.java | 2 +- .../java/cn/hutool/core/map/MapUtilTest.java | 4 +- .../cn/hutool/core/net/UrlBuilderTest.java | 16 ++++---- .../cn/hutool/core/text/NamingCaseTest.java | 6 +-- .../hutool/core/util/ReferenceUtilTest.java | 6 +-- .../java/cn/hutool/core/util/StrUtilTest.java | 4 +- .../java/cn/hutool/core/util/XmlUtilTest.java | 6 +-- .../main/java/cn/hutool/cron/Scheduler.java | 2 +- .../java/cn/hutool/crypto/digest/MD5.java | 2 +- .../java/cn/hutool/crypto/digest/SM3.java | 2 +- .../main/java/cn/hutool/db/AbstractDb.java | 6 +-- .../main/java/cn/hutool/db/ActiveEntity.java | 10 ++--- .../java/cn/hutool/db/dialect/Dialect.java | 2 +- .../db/dialect/impl/AnsiSqlDialect.java | 10 ++--- .../cn/hutool/db/dialect/impl/H2Dialect.java | 2 +- .../hutool/db/dialect/impl/MysqlDialect.java | 2 +- .../db/dialect/impl/PostgresqlDialect.java | 2 +- .../main/java/cn/hutool/db/ds/DSFactory.java | 2 +- .../java/cn/hutool/db/ds/GlobalDSFactory.java | 2 +- .../cn/hutool/db/handler/BeanHandler.java | 2 +- .../cn/hutool/db/handler/BeanListHandler.java | 2 +- .../cn/hutool/db/handler/EntityHandler.java | 2 +- .../hutool/db/handler/EntityListHandler.java | 2 +- .../hutool/db/handler/EntitySetHandler.java | 2 +- .../cn/hutool/db/handler/NumberHandler.java | 2 +- .../hutool/db/handler/PageResultHandler.java | 2 +- .../cn/hutool/db/handler/StringHandler.java | 2 +- .../hutool/db/handler/ValueListHandler.java | 2 +- .../main/java/cn/hutool/db/meta/Column.java | 2 +- .../cn/hutool/db/meta/ColumnIndexInfo.java | 2 +- .../main/java/cn/hutool/db/meta/MetaUtil.java | 6 +-- .../main/java/cn/hutool/db/meta/Table.java | 2 +- .../java/cn/hutool/db/sql/SqlBuilder.java | 6 +-- .../test/java/cn/hutool/db/OracleTest.java | 4 +- .../java/cn/hutool/db/sql/SqlBuilderTest.java | 10 ++--- .../hutool/extra/aop/proxy/ProxyFactory.java | 4 +- .../hutool/extra/compress/CompressUtil.java | 4 +- .../compress/archiver/StreamArchiver.java | 4 +- .../expression/engine/ExpressionFactory.java | 4 +- .../main/java/cn/hutool/extra/ftp/Ftp.java | 2 +- .../java/cn/hutool/extra/ftp/FtpConfig.java | 2 +- .../cn/hutool/extra/ftp/SimpleFtpServer.java | 2 +- .../main/java/cn/hutool/extra/mail/Mail.java | 4 +- .../java/cn/hutool/extra/mail/MailUtil.java | 2 +- .../extra/pinyin/engine/PinyinFactory.java | 4 +- .../java/cn/hutool/extra/qrcode/QrConfig.java | 2 +- .../main/java/cn/hutool/extra/ssh/Sftp.java | 8 ++-- .../hutool/extra/template/TemplateUtil.java | 4 +- .../template/engine/TemplateFactory.java | 8 ++-- .../extra/template/engine/wit/WitEngine.java | 2 +- .../hutool/extra/tokenizer/TokenizerUtil.java | 6 +-- .../tokenizer/engine/TokenizerFactory.java | 4 +- .../hutool/extra/compress/ArchiverTest.java | 6 +-- .../hutool/extra/expression/AviatorTest.java | 6 +-- .../extra/expression/ExpressionUtilTest.java | 12 +++--- .../hutool/extra/ftp/SimpleFtpServerTest.java | 2 +- .../cn/hutool/extra/mail/MailAccountTest.java | 2 +- .../hutool/extra/qrcode/QrCodeUtilTest.java | 4 +- .../hutool/extra/template/JetbrickTest.java | 4 +- .../extra/template/TemplateUtilTest.java | 34 ++++++++--------- .../hutool/extra/template/ThymeleafTest.java | 2 +- .../hutool/extra/template/VelocityTest.java | 2 +- .../main/java/cn/hutool/http/HttpConfig.java | 2 +- .../java/cn/hutool/http/HttpConnection.java | 6 +-- .../main/java/cn/hutool/http/HttpRequest.java | 10 ++--- .../java/cn/hutool/http/body/BytesBody.java | 2 +- .../hutool/http/body/FormUrlEncodedBody.java | 2 +- .../cn/hutool/http/body/MultipartBody.java | 2 +- .../cn/hutool/http/webservice/SoapClient.java | 6 +-- .../cn/hutool/http/webservice/SoapUtil.java | 6 +-- .../hutool/http/body/MultipartBodyTest.java | 2 +- .../http/webservice/SoapClientTest.java | 4 +- .../src/main/java/cn/hutool/json/jwt/JWT.java | 2 +- .../main/java/cn/hutool/json/jwt/JWTUtil.java | 4 +- .../cn/hutool/json/jwt/JWTSignerTest.java | 2 +- .../test/java/cn/hutool/json/jwt/JWTTest.java | 8 ++-- .../cn/hutool/json/jwt/JWTValidatorTest.java | 14 +++---- .../java/cn/hutool/log/GlobalLogFactory.java | 2 +- .../main/java/cn/hutool/log/LogFactory.java | 2 +- .../log/dialect/console/ConsoleLog.java | 2 +- .../main/java/cn/hutool/setting/Setting.java | 2 +- .../java/cn/hutool/setting/dialect/Props.java | 2 +- .../cn/hutool/setting/yaml/YamlUtilTest.java | 2 +- .../java/cn/hutool/socket/ChannelUtil.java | 2 +- .../java/cn/hutool/socket/aio/AioServer.java | 2 +- 123 files changed, 275 insertions(+), 270 deletions(-) rename hutool-core/src/main/java/cn/hutool/core/date/{ => chinese}/ChineseDate.java (98%) diff --git a/hutool-all/src/main/java/cn/hutool/Hutool.java b/hutool-all/src/main/java/cn/hutool/Hutool.java index 8c691b086..2469d1e2d 100644 --- a/hutool-all/src/main/java/cn/hutool/Hutool.java +++ b/hutool-all/src/main/java/cn/hutool/Hutool.java @@ -63,7 +63,7 @@ public class Hutool { */ public static void printAllUtils() { final Set> allUtils = getAllUtils(); - final ConsoleTable consoleTable = ConsoleTable.create().addHeader("工具类名", "所在包"); + final ConsoleTable consoleTable = ConsoleTable.of().addHeader("工具类名", "所在包"); for (final Class clazz : allUtils) { consoleTable.addBody(clazz.getSimpleName(), clazz.getPackage().getName()); } diff --git a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java b/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java index 07227f274..88a676398 100755 --- a/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java +++ b/hutool-core/src/main/java/cn/hutool/core/cache/GlobalPruneTimer.java @@ -35,7 +35,7 @@ public enum GlobalPruneTimer { * 构造 */ GlobalPruneTimer() { - create(); + init(); } /** @@ -50,9 +50,9 @@ public enum GlobalPruneTimer { } /** - * 创建定时器 + * 初始化定时器 */ - public void create() { + public void init() { if (null != pruneTimer) { shutdownNow(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java b/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java index a9dc413be..6561a931c 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/UniqueKeySet.java @@ -60,7 +60,7 @@ public class UniqueKeySet extends AbstractSet implements Serializable { * @param uniqueGenerator 唯一键生成规则函数，用于生成对象对应的唯一键 */ public UniqueKeySet(final boolean isLinked, final Function uniqueGenerator) { - this(MapBuilder.create(isLinked), uniqueGenerator); + this(MapBuilder.of(isLinked), uniqueGenerator); } /** @@ -84,7 +84,7 @@ public class UniqueKeySet extends AbstractSet implements Serializable { * @param uniqueGenerator 唯一键生成规则函数，用于生成对象对应的唯一键 */ public UniqueKeySet(final int initialCapacity, final float loadFactor, final Function uniqueGenerator) { - this(MapBuilder.create(new HashMap<>(initialCapacity, loadFactor)), uniqueGenerator); + this(MapBuilder.of(new HashMap<>(initialCapacity, loadFactor)), uniqueGenerator); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerUtil.java b/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerUtil.java index 77e369be3..5e50df3d2 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/CompilerUtil.java @@ -72,9 +72,9 @@ public class CompilerUtil { * * @param parent 父{@link ClassLoader} * @return {@link JavaSourceCompiler} - * @see JavaSourceCompiler#create(ClassLoader) + * @see JavaSourceCompiler#of(ClassLoader) */ public static JavaSourceCompiler getCompiler(final ClassLoader parent) { - return JavaSourceCompiler.create(parent); + return JavaSourceCompiler.of(parent); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java index 7b8b6dbc5..180ba6f16 100644 --- a/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java +++ b/hutool-core/src/main/java/cn/hutool/core/compiler/JavaSourceCompiler.java @@ -75,7 +75,7 @@ public class JavaSourceCompiler { * @param parent 父类加载器 * @return Java源码编译器 */ - public static JavaSourceCompiler create(final ClassLoader parent) { + public static JavaSourceCompiler of(final ClassLoader parent) { return new JavaSourceCompiler(parent); } diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java index 19a967758..3e203ce9e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/BeanConverter.java @@ -69,7 +69,7 @@ public class BeanConverter implements Converter, Serializable { BeanUtil.isBean(value.getClass())) { if (value instanceof Map && targetClass.isInterface()) { // 将Map动态代理为Bean - return MapProxy.create((Map) value).toProxyBean(targetClass); + return MapProxy.of((Map) value).toProxyBean(targetClass); } //限定被转换对象类型 diff --git a/hutool-core/src/main/java/cn/hutool/core/date/ChineseDate.java b/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java similarity index 98% rename from hutool-core/src/main/java/cn/hutool/core/date/ChineseDate.java rename to hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java index 4bd9a6ec5..4c7bfba45 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/ChineseDate.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/chinese/ChineseDate.java @@ -1,6 +1,11 @@ -package cn.hutool.core.date; +package cn.hutool.core.date.chinese; import cn.hutool.core.convert.NumberChineseFormatter; +import cn.hutool.core.date.CalendarUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.TimeUtil; +import cn.hutool.core.date.Zodiac; import cn.hutool.core.date.chinese.ChineseMonth; import cn.hutool.core.date.chinese.GanZhi; import cn.hutool.core.date.chinese.LunarFestival; diff --git a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java b/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java index dfd7f1292..c445cd4c1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/chinese/SolarTerms.java @@ -1,6 +1,5 @@ package cn.hutool.core.date.chinese; -import cn.hutool.core.date.ChineseDate; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.math.NumberUtil; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java index 6db8b7c55..542488a3e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/BufferUtil.java @@ -222,7 +222,7 @@ public class BufferUtil { * @return {@link ByteBuffer} * @since 4.5.0 */ - public static ByteBuffer create(final byte[] data) { + public static ByteBuffer of(final byte[] data) { return ByteBuffer.wrap(data); } @@ -234,8 +234,8 @@ public class BufferUtil { * @return {@link ByteBuffer} * @since 4.5.0 */ - public static ByteBuffer create(final CharSequence data, final Charset charset) { - return create(StrUtil.bytes(data, charset)); + public static ByteBuffer of(final CharSequence data, final Charset charset) { + return of(StrUtil.bytes(data, charset)); } /** @@ -246,7 +246,7 @@ public class BufferUtil { * @since 4.5.0 */ public static ByteBuffer createUtf8(final CharSequence data) { - return create(StrUtil.utf8Bytes(data)); + return of(StrUtil.utf8Bytes(data)); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java index 5ea42c6b1..9ba8eb681 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/FileSystemUtil.java @@ -29,7 +29,7 @@ public class FileSystemUtil { * @param path 文件路径，可以是目录或Zip文件等 * @return {@link FileSystem} */ - public static FileSystem create(final String path) { + public static FileSystem of(final String path) { try { return FileSystems.newFileSystem( Paths.get(path).toUri(), diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java index e0cc23701..a9282531c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchMonitor.java @@ -195,8 +195,8 @@ public class WatchMonitor extends WatchServer { * @param watcher {@link Watcher} * @return WatchMonitor */ - public static WatchMonitor createAll(final URI uri, final Watcher watcher) { - return createAll(Paths.get(uri), watcher); + public static WatchMonitor ofAll(final URI uri, final Watcher watcher) { + return ofAll(Paths.get(uri), watcher); } /** @@ -206,9 +206,9 @@ public class WatchMonitor extends WatchServer { * @param watcher {@link Watcher} * @return WatchMonitor */ - public static WatchMonitor createAll(final URL url, final Watcher watcher) { + public static WatchMonitor ofAll(final URL url, final Watcher watcher) { try { - return createAll(Paths.get(url.toURI()), watcher); + return ofAll(Paths.get(url.toURI()), watcher); } catch (final URISyntaxException e) { throw new WatchException(e); } @@ -221,8 +221,8 @@ public class WatchMonitor extends WatchServer { * @param watcher {@link Watcher} * @return WatchMonitor */ - public static WatchMonitor createAll(final File file, final Watcher watcher) { - return createAll(file.toPath(), watcher); + public static WatchMonitor ofAll(final File file, final Watcher watcher) { + return ofAll(file.toPath(), watcher); } /** @@ -232,8 +232,8 @@ public class WatchMonitor extends WatchServer { * @param watcher {@link Watcher} * @return WatchMonitor */ - public static WatchMonitor createAll(final String path, final Watcher watcher) { - return createAll(Paths.get(path), watcher); + public static WatchMonitor ofAll(final String path, final Watcher watcher) { + return ofAll(Paths.get(path), watcher); } /** @@ -243,7 +243,7 @@ public class WatchMonitor extends WatchServer { * @param watcher {@link Watcher} * @return WatchMonitor */ - public static WatchMonitor createAll(final Path path, final Watcher watcher) { + public static WatchMonitor ofAll(final Path path, final Watcher watcher) { final WatchMonitor watchMonitor = of(path, EVENTS_ALL); watchMonitor.setWatcher(watcher); return watchMonitor; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java index daca308bd..f25215f45 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/WatchUtil.java @@ -145,8 +145,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final URL url, final Watcher watcher) { - return createAll(url, 0, watcher); + public static WatchMonitor ofAll(final URL url, final Watcher watcher) { + return ofAll(url, 0, watcher); } /** @@ -157,8 +157,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final URL url, final int maxDepth, final Watcher watcher) { - return createAll(URLUtil.toURI(url), maxDepth, watcher); + public static WatchMonitor ofAll(final URL url, final int maxDepth, final Watcher watcher) { + return ofAll(URLUtil.toURI(url), maxDepth, watcher); } /** @@ -168,8 +168,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final URI uri, final Watcher watcher) { - return createAll(uri, 0, watcher); + public static WatchMonitor ofAll(final URI uri, final Watcher watcher) { + return ofAll(uri, 0, watcher); } /** @@ -180,8 +180,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final URI uri, final int maxDepth, final Watcher watcher) { - return createAll(Paths.get(uri), maxDepth, watcher); + public static WatchMonitor ofAll(final URI uri, final int maxDepth, final Watcher watcher) { + return ofAll(Paths.get(uri), maxDepth, watcher); } /** @@ -191,8 +191,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final File file, final Watcher watcher) { - return createAll(file, 0, watcher); + public static WatchMonitor ofAll(final File file, final Watcher watcher) { + return ofAll(file, 0, watcher); } /** @@ -203,8 +203,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final File file, final int maxDepth, final Watcher watcher) { - return createAll(file.toPath(), maxDepth, watcher); + public static WatchMonitor ofAll(final File file, final int maxDepth, final Watcher watcher) { + return ofAll(file.toPath(), maxDepth, watcher); } /** @@ -214,8 +214,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final String path, final Watcher watcher) { - return createAll(path, 0, watcher); + public static WatchMonitor ofAll(final String path, final Watcher watcher) { + return ofAll(path, 0, watcher); } /** @@ -226,8 +226,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final String path, final int maxDepth, final Watcher watcher) { - return createAll(Paths.get(path), maxDepth, watcher); + public static WatchMonitor ofAll(final String path, final int maxDepth, final Watcher watcher) { + return ofAll(Paths.get(path), maxDepth, watcher); } /** @@ -237,8 +237,8 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final Path path, final Watcher watcher) { - return createAll(path, 0, watcher); + public static WatchMonitor ofAll(final Path path, final Watcher watcher) { + return ofAll(path, 0, watcher); } /** @@ -249,7 +249,7 @@ public class WatchUtil { * @param watcher {@link Watcher} * @return {@link WatchMonitor} */ - public static WatchMonitor createAll(final Path path, final int maxDepth, final Watcher watcher) { + public static WatchMonitor ofAll(final Path path, final int maxDepth, final Watcher watcher) { final WatchMonitor watchMonitor = of(path, maxDepth, WatchMonitor.EVENTS_ALL); watchMonitor.setWatcher(watcher); return watchMonitor; diff --git a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java b/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java index 66e28f3a2..f94024469 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/watch/watchers/WatcherChain.java @@ -26,7 +26,7 @@ public class WatcherChain implements Watcher, Chain{ * @param watchers 观察者列表 * @return {@link WatcherChain} */ - public static WatcherChain create(final Watcher... watchers) { + public static WatcherChain of(final Watcher... watchers) { return new WatcherChain(watchers); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java b/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java index 1166af671..c26d093f1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ConsoleTable.java @@ -30,7 +30,7 @@ public class ConsoleTable { * @return ConsoleTable * @since 5.4.5 */ - public static ConsoleTable create() { + public static ConsoleTable of() { return new ConsoleTable(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java b/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java index 5e75f2d18..d4811f13b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/WeightRandom.java @@ -40,7 +40,7 @@ public class WeightRandom implements Serializable { * @param 权重随机获取的对象类型 * @return WeightRandom */ - public static WeightRandom create() { + public static WeightRandom of() { return new WeightRandom<>(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java b/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java index 548363553..d3fc0d2e7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/CamelCaseMap.java @@ -62,7 +62,7 @@ public class CamelCaseMap extends FuncKeyMap { * @param loadFactor 加载因子 */ public CamelCaseMap(final int initialCapacity, final float loadFactor) { - this(MapBuilder.create(new HashMap<>(initialCapacity, loadFactor))); + this(MapBuilder.of(new HashMap<>(initialCapacity, loadFactor))); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java b/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java index f49e35f9d..c3c7c5c69 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/CaseInsensitiveMap.java @@ -62,7 +62,7 @@ public class CaseInsensitiveMap extends FuncKeyMap { * @param loadFactor 加载因子 */ public CaseInsensitiveMap(final int initialCapacity, final float loadFactor) { - this(MapBuilder.create(new HashMap<>(initialCapacity, loadFactor))); + this(MapBuilder.of(new HashMap<>(initialCapacity, loadFactor))); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java index ff8b563fd..1ed25c336 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/Dict.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/Dict.java @@ -45,7 +45,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * * @return Dict */ - public static Dict create() { + public static Dict of() { return new Dict(); } @@ -57,7 +57,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * @return Vo */ public static Dict parse(final T bean) { - return create().parseBean(bean); + return of().parseBean(bean); } /** @@ -68,7 +68,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett */ @SafeVarargs public static Dict ofEntries(final Map.Entry... pairs) { - final Dict dict = create(); + final Dict dict = of(); for (final Map.Entry pair : pairs) { dict.put(pair.getKey(), pair.getValue()); } @@ -94,7 +94,7 @@ public class Dict extends LinkedHashMap implements BasicTypeGett * @since 5.4.1 */ public static Dict ofKvs(final Object... keysAndValues) { - final Dict dict = create(); + final Dict dict = of(); String key = null; for (int i = 0; i < keysAndValues.length; i++) { diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java b/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java index c1e7d47f5..b47857bdc 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapBuilder.java @@ -26,8 +26,8 @@ public class MapBuilder implements Builder> { * @return MapBuilder * @since 5.3.0 */ - public static MapBuilder create() { - return create(false); + public static MapBuilder of() { + return of(false); } /** @@ -39,8 +39,8 @@ public class MapBuilder implements Builder> { * @return MapBuilder * @since 5.3.0 */ - public static MapBuilder create(final boolean isLinked) { - return create(MapUtil.newHashMap(isLinked)); + public static MapBuilder of(final boolean isLinked) { + return of(MapUtil.newHashMap(isLinked)); } /** @@ -52,7 +52,7 @@ public class MapBuilder implements Builder> { * @return MapBuilder * @since 3.2.3 */ - public static MapBuilder create(final Map map) { + public static MapBuilder of(final Map map) { return new MapBuilder<>(map); } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java index 3fea88a1b..dc16f4a9c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java @@ -34,7 +34,7 @@ public class MapProxy implements Map, OptNullBasicTypeFromObject * @param map 被代理的Map * @return {@link MapProxy} */ - public static MapProxy create(final Map map) { + public static MapProxy of(final Map map) { return (map instanceof MapProxy) ? (MapProxy) map : new MapProxy(map); } diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java index 00bc6c104..1b1a8a650 100755 --- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java @@ -873,7 +873,7 @@ public class MapUtil { * @since 3.2.0 */ public static MapProxy createProxy(final Map map) { - return MapProxy.create(map); + return MapProxy.of(map); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java index 80622d4dc..ea98734ef 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/SSLContextBuilder.java @@ -41,7 +41,7 @@ public class SSLContextBuilder implements SSLProtocols, Builder { * * @return SSLContextBuilder */ - public static SSLContextBuilder create() { + public static SSLContextBuilder of() { return new SSLContextBuilder(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/net/SSLUtil.java b/hutool-core/src/main/java/cn/hutool/core/net/SSLUtil.java index 5f3fc0952..c62a8f9fd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/SSLUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/SSLUtil.java @@ -23,7 +23,7 @@ public class SSLUtil { * @since 5.7.8 */ public static SSLContext createSSLContext(final String protocol) throws IORuntimeException{ - return SSLContextBuilder.create().setProtocol(protocol).build(); + return SSLContextBuilder.of().setProtocol(protocol).build(); } /** @@ -52,7 +52,7 @@ public class SSLUtil { * @throws IORuntimeException 包装 GeneralSecurityException异常 */ public static SSLContext createSSLContext(final String protocol, final KeyManager[] keyManagers, final TrustManager[] trustManagers) throws IORuntimeException { - return SSLContextBuilder.create() + return SSLContextBuilder.of() .setProtocol(protocol) .setKeyManagers(keyManagers) .setTrustManagers(trustManagers).build(); diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java index bb79e495e..5d75c857e 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlBuilder.java @@ -188,7 +188,7 @@ public final class UrlBuilder implements Builder { * * @return UrlBuilder */ - public static UrlBuilder create() { + public static UrlBuilder of() { return new UrlBuilder(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java index 650b0565b..d7a128436 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java +++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadFactoryBuilder.java @@ -44,7 +44,7 @@ public class ThreadFactoryBuilder implements Builder { * * @return {@code ThreadFactoryBuilder} */ - public static ThreadFactoryBuilder create() { + public static ThreadFactoryBuilder of() { return new ThreadFactoryBuilder(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java index ac097cf17..4e9621a11 100644 --- a/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/thread/ThreadUtil.java @@ -456,7 +456,7 @@ public class ThreadUtil { * @since 4.1.13 */ public static ThreadFactoryBuilder createThreadFactoryBuilder() { - return ThreadFactoryBuilder.create(); + return ThreadFactoryBuilder.of(); } /** @@ -468,7 +468,7 @@ public class ThreadUtil { * @since 5.8.0 */ public static ThreadFactory createThreadFactory(final String threadNamePrefix) { - return ThreadFactoryBuilder.create().setNamePrefix(threadNamePrefix).build(); + return ThreadFactoryBuilder.of().setNamePrefix(threadNamePrefix).build(); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java index d7cda666b..25d8007de 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ReferenceUtil.java @@ -28,8 +28,8 @@ public class ReferenceUtil { * @param referent 被引用对象 * @return {@link Reference} */ - public static Reference create(final ReferenceType type, final T referent) { - return create(type, referent, null); + public static Reference of(final ReferenceType type, final T referent) { + return of(type, referent, null); } /** @@ -41,7 +41,7 @@ public class ReferenceUtil { * @param queue 引用队列 * @return {@link Reference} */ - public static Reference create(final ReferenceType type, final T referent, final ReferenceQueue queue) { + public static Reference of(final ReferenceType type, final T referent, final ReferenceQueue queue) { switch (type) { case SOFT: return new SoftReference<>(referent, queue); diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java index be1da1a11..3d13df13b 100755 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java @@ -79,7 +79,7 @@ public class BeanUtilTest { @Test public void fillBeanWithMapIgnoreCaseTest() { - final Map map = MapBuilder.create() + final Map map = MapBuilder.of() .put("Name", "Joe") .put("aGe", 12) .put("openId", "DFDFSDFWERWER") diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java index 2bed4e3e2..46f98a870 100755 --- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java @@ -234,8 +234,8 @@ public class CollUtilTest { @Test public void getFieldValuesTest() { - final Dict v1 = Dict.create().set("id", 12).set("name", "张三").set("age", 23); - final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四"); + final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", 23); + final Dict v2 = Dict.of().set("age", 13).set("id", 15).set("name", "李四"); final ArrayList list = ListUtil.of(v1, v2); final List fieldValues = (List) CollUtil.getFieldValues(list, "name"); @@ -783,7 +783,7 @@ public class CollUtilTest { public void pageTest() { final List objects = ListUtil.of(); for (int i = 0; i < 10; i++) { - objects.add(Dict.create().set("name", "姓名：" + i)); + objects.add(Dict.of().set("name", "姓名：" + i)); } Assert.assertEquals(0, CollUtil.page(3, 5, objects).size()); diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java index 2b7a40f94..fbef8399f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java @@ -39,7 +39,7 @@ public class MapProxyTest { @Test public void classProxyTest() { - final Student student = MapProxy.create(new HashMap<>()).toProxyBean(Student.class); + final Student student = MapProxy.of(new HashMap<>()).toProxyBean(Student.class); student.setName("小明").setAge(18); Assert.assertEquals(student.getAge(), 18); Assert.assertEquals(student.getName(), "小明"); diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java index dc1acc463..05665c397 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java @@ -30,7 +30,7 @@ public class MapConvertTest { @Test public void mapToMapTest() { final Map srcMap = MapBuilder - .create(new HashMap()) + .of(new HashMap()) .put("name", "AAA") .put("age", 45).map(); diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java index 03f486918..6f31e455a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java @@ -1,5 +1,6 @@ package cn.hutool.core.date; +import cn.hutool.core.date.chinese.ChineseDate; import cn.hutool.core.text.StrUtil; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java b/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java index eabd4a38c..533d876cf 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java @@ -1,5 +1,6 @@ package cn.hutool.core.date; +import cn.hutool.core.date.chinese.ChineseDate; import cn.hutool.core.date.chinese.GanZhi; import org.junit.Assert; import org.junit.Test; diff --git a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java b/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java index ba85a528e..e13146dc3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java @@ -1,6 +1,5 @@ package cn.hutool.core.date.chinese; -import cn.hutool.core.date.ChineseDate; import cn.hutool.core.date.DateUtil; import org.junit.Assert; import org.junit.Test; 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 07de78cff..55cd35954 100755 --- a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java @@ -44,7 +44,7 @@ public class WatchMonitorTest { } }; - final WatchMonitor monitor = WatchMonitor.createAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500)); + final WatchMonitor monitor = WatchMonitor.ofAll("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/ConsoleTableTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java index 0cc40bc5d..fac3aca66 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java @@ -8,7 +8,7 @@ public class ConsoleTableTest { @Test @Ignore public void printSBCTest() { - ConsoleTable t = ConsoleTable.create(); + ConsoleTable t = ConsoleTable.of(); t.addHeader("姓名", "年龄"); t.addBody("张三", "15"); t.addBody("李四", "29"); @@ -17,7 +17,7 @@ public class ConsoleTableTest { Console.log(); - t = ConsoleTable.create(); + t = ConsoleTable.of(); t.addHeader("体温", "占比"); t.addHeader("℃", "%"); t.addBody("36.8", "10"); @@ -26,7 +26,7 @@ public class ConsoleTableTest { Console.log(); - t = ConsoleTable.create(); + t = ConsoleTable.of(); t.addHeader("标题1", "标题2"); t.addBody("12345", "混合321654asdfcSDF"); t.addBody("sd e3ee ff22", "ff值"); @@ -36,7 +36,7 @@ public class ConsoleTableTest { @Test @Ignore public void printDBCTest() { - ConsoleTable t = ConsoleTable.create().setSBCMode(false); + ConsoleTable t = ConsoleTable.of().setSBCMode(false); t.addHeader("姓名", "年龄"); t.addBody("张三", "15"); t.addBody("李四", "29"); @@ -45,7 +45,7 @@ public class ConsoleTableTest { Console.log(); - t = ConsoleTable.create().setSBCMode(false); + t = ConsoleTable.of().setSBCMode(false); t.addHeader("体温", "占比"); t.addHeader("℃", "%"); t.addBody("36.8", "10"); diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java index d69d827f1..b4ba070f5 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java @@ -14,7 +14,7 @@ import static cn.hutool.core.lang.OptTest.User; public class DictTest { @Test public void dictTest(){ - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("key1", 1)//int .set("key2", 1000L)//long .set("key3", DateTime.now());//Date @@ -66,7 +66,7 @@ public class DictTest { @Test public void setFieldsTest() { final User user = GenericBuilder.of(User::new).with(User::setUsername, "hutool").build(); - final Dict dict = Dict.create(); + final Dict dict = Dict.of(); dict.setFields(user::getNickname, user::getUsername); Assert.assertEquals("hutool", dict.get("username")); Assert.assertNull(dict.get("nickname")); diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java index 8f8bca881..3602ae58c 100644 --- a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java @@ -8,7 +8,7 @@ public class WeightRandomTest { @Test public void weightRandomTest() { - final WeightRandom random = WeightRandom.create(); + final WeightRandom random = WeightRandom.of(); random.add("A", 10); random.add("B", 50); random.add("C", 100); diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java index 40c00175b..f3c029619 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java @@ -9,7 +9,7 @@ public class MapBuilderTest { @Test public void conditionPutTest() { - final Map map = MapBuilder.create() + final Map map = MapBuilder.of() .put(true, "a", "1") .put(false, "b", "2") .put(true, "c", () -> getValue(3)) diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java index a0cbef9f8..868f6c753 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java @@ -226,8 +226,8 @@ public class MapUtilTest { @Test public void valuesOfKeysTest() { - final Dict v1 = Dict.create().set("id", 12).set("name", "张三").set("age", 23); - final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四"); + final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", 23); + final Dict v2 = Dict.of().set("age", 13).set("id", 15).set("name", "李四"); final String[] keys = v1.keySet().toArray(new String[0]); final ArrayList v1s = MapUtil.valuesOfKeys(v1, keys); diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java index a351b4fca..924bc6c07 100644 --- a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java @@ -16,7 +16,7 @@ public class UrlBuilderTest { @Test public void buildTest() { - final String buildUrl = UrlBuilder.create().setHost("www.hutool.cn").build(); + final String buildUrl = UrlBuilder.of().setHost("www.hutool.cn").build(); Assert.assertEquals("http://www.hutool.cn/", buildUrl); } @@ -29,7 +29,7 @@ public class UrlBuilderTest { @Test public void testHost() { - final String buildUrl = UrlBuilder.create() + final String buildUrl = UrlBuilder.of() .setScheme("https") .setHost("www.hutool.cn").build(); Assert.assertEquals("https://www.hutool.cn/", buildUrl); @@ -37,7 +37,7 @@ public class UrlBuilderTest { @Test public void testHostPort() { - final String buildUrl = UrlBuilder.create() + final String buildUrl = UrlBuilder.of() .setScheme("https") .setHost("www.hutool.cn") .setPort(8080) @@ -47,7 +47,7 @@ public class UrlBuilderTest { @Test public void testPathAndQuery() { - final String buildUrl = UrlBuilder.create() + final String buildUrl = UrlBuilder.of() .setScheme("https") .setHost("www.hutool.cn") .addPath("/aaa").addPath("bbb") @@ -60,7 +60,7 @@ public class UrlBuilderTest { @Test public void testQueryWithChinese() { - final String buildUrl = UrlBuilder.create() + final String buildUrl = UrlBuilder.of() .setScheme("https") .setHost("www.hutool.cn") .addPath("/aaa").addPath("bbb") @@ -73,7 +73,7 @@ public class UrlBuilderTest { @Test public void testMultiQueryWithChinese() { - final String buildUrl = UrlBuilder.create() + final String buildUrl = UrlBuilder.of() .setScheme("https") .setHost("www.hutool.cn") .addPath("/s") @@ -303,7 +303,7 @@ public class UrlBuilderTest { @Test public void addPathEncodeTest(){ - final String url = UrlBuilder.create() + final String url = UrlBuilder.of() .setScheme("https") .setHost("domain.cn") .addPath("api") @@ -317,7 +317,7 @@ public class UrlBuilderTest { @Test public void addPathEncodeTest2(){ // https://github.com/dromara/hutool/issues/1912 - final String url = UrlBuilder.create() + final String url = UrlBuilder.of() .setScheme("https") .setHost("domain.cn") .addPath("/api/xxx/bbb") diff --git a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java index 4b611e3e3..6c60c4922 100755 --- a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java @@ -9,7 +9,7 @@ public class NamingCaseTest { @Test public void toCamelCaseTest() { - Dict.create() + Dict.of() .set("Table_Test_Of_day","tableTestOfDay") .set("TableTestOfDay","TableTestOfDay") .set("abc_1d","abc1d") @@ -18,14 +18,14 @@ public class NamingCaseTest { @Test public void toCamelCaseFromDashedTest() { - Dict.create() + Dict.of() .set("Table-Test-Of-day","tableTestOfDay") .forEach((key, value) -> Assert.assertEquals(value, NamingCase.toCamelCase(key, CharUtil.DASHED))); } @Test public void toUnderLineCaseTest() { - Dict.create() + Dict.of() .set("Table_Test_Of_day", "table_test_of_day") .set("_Table_Test_Of_day_", "_table_test_of_day_") .set("_Table_Test_Of_DAY_", "_table_test_of_DAY_") diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java index 60b1a9548..a8fe7a7e5 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java @@ -15,21 +15,21 @@ public class ReferenceUtilTest { @Test public void createWeakTest(){ - final Reference integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.WEAK, 1); + final Reference integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.WEAK, 1); Assert.assertTrue(integerReference instanceof WeakReference); Assert.assertEquals(new Integer(1), integerReference.get()); } @Test public void createSoftTest(){ - final Reference integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.SOFT, 1); + final Reference integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.SOFT, 1); Assert.assertTrue(integerReference instanceof SoftReference); Assert.assertEquals(new Integer(1), integerReference.get()); } @Test public void createPhantomTest(){ - final Reference integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.PHANTOM, 1); + final Reference integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.PHANTOM, 1); Assert.assertTrue(integerReference instanceof PhantomReference); // get方法永远都返回null，PhantomReference只能用来监控对象的GC状况 Assert.assertNull(integerReference.get()); diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java index 9dca2c195..f0b9949a6 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java @@ -123,10 +123,10 @@ public class StrUtilTest { @Test public void formatTest() { final String template = "你好，我是{name}，我的电话是：{phone}"; - final String result = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", "13888881111")); + final String result = StrUtil.format(template, Dict.of().set("name", "张三").set("phone", "13888881111")); Assert.assertEquals("你好，我是张三，我的电话是：13888881111", result); - final String result2 = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", null)); + final String result2 = StrUtil.format(template, Dict.of().set("name", "张三").set("phone", null)); Assert.assertEquals("你好，我是张三，我的电话是：{phone}", result2); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java index 11b1c5f3e..0b0e46181 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java @@ -115,7 +115,7 @@ public class XmlUtilTest { @Test public void mapToXmlTest() { - final Map map = MapBuilder.create(new LinkedHashMap())// + final Map map = MapBuilder.of(new LinkedHashMap())// .put("name", "张三")// .put("age", 12)// .put("game", MapUtil.builder(new LinkedHashMap()).put("昵称", "Looly").put("level", 14).build())// @@ -137,7 +137,7 @@ public class XmlUtilTest { @Test public void mapToXmlTest2() { // 测试List - final Map map = MapBuilder.create(new LinkedHashMap()) + final Map map = MapBuilder.of(new LinkedHashMap()) .put("Town", ListUtil.of("town1", "town2")) .build(); @@ -171,7 +171,7 @@ public class XmlUtilTest { @Test public void mapToXmlTestWithOmitXmlDeclaration() { - final Map map = MapBuilder.create(new LinkedHashMap()) + final Map map = MapBuilder.of(new LinkedHashMap()) .put("name", "ddatsh") .build(); final String xml = XmlUtil.mapToXmlStr(map, true); 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 43492cb4c..63c23ed48 100755 --- a/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/Scheduler.java @@ -411,7 +411,7 @@ public class Scheduler implements Serializable { if(null == this.threadExecutor){ // 无界线程池，确保每一个需要执行的线程都可以及时运行，同时复用已有线程避免线程重复创建 this.threadExecutor = ExecutorBuilder.of().useSynchronousQueue().setThreadFactory(// - ThreadFactoryBuilder.create().setNamePrefix("hutool-cron-").setDaemon(this.daemon).build()// + ThreadFactoryBuilder.of().setNamePrefix("hutool-cron-").setDaemon(this.daemon).build()// ).build(); } this.taskLauncherManager = new TaskLauncherManager(this); diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java index 03b330eb9..7ef443dca 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/MD5.java @@ -19,7 +19,7 @@ public class MD5 extends Digester { * @return MD5 * @since 4.6.0 */ - public static MD5 create() { + public static MD5 of() { return new MD5(); } diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java index 5293a7d06..2cf76c098 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/digest/SM3.java @@ -25,7 +25,7 @@ public class SM3 extends Digester { * @return SM3 * @since 4.6.0 */ - public static SM3 create() { + public static SM3 of() { return new SM3(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java index f0411a962..e8a637fcd 100755 --- a/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/cn/hutool/db/AbstractDb.java @@ -582,7 +582,7 @@ public abstract class AbstractDb> extends DefaultConnect * @since 3.2.2 */ public List find(final Entity where, final Class beanClass) throws DbRuntimeException { - return find(where.getFieldNames(), where, BeanListHandler.create(beanClass)); + return find(where.getFieldNames(), where, BeanListHandler.of(beanClass)); } /** @@ -594,7 +594,7 @@ public abstract class AbstractDb> extends DefaultConnect * @throws DbRuntimeException SQL执行异常 */ public List findAll(final Entity where) throws DbRuntimeException { - return find(where, EntityListHandler.create()); + return find(where, EntityListHandler.of()); } /** @@ -609,7 +609,7 @@ public abstract class AbstractDb> extends DefaultConnect * @since 3.2.2 */ public List findAll(final Entity where, final Class beanClass) throws DbRuntimeException { - return find(where, BeanListHandler.create(beanClass)); + return find(where, BeanListHandler.of(beanClass)); } /** 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 32edd3f49..35a3798a7 100755 --- a/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java +++ b/hutool-db/src/main/java/cn/hutool/db/ActiveEntity.java @@ -23,7 +23,7 @@ public class ActiveEntity extends Entity { * * @return ActiveEntity */ - public static ActiveEntity create() { + public static ActiveEntity of() { return new ActiveEntity(); } @@ -33,7 +33,7 @@ public class ActiveEntity extends Entity { * @param tableName 表名 * @return ActiveEntity */ - public static ActiveEntity create(final String tableName) { + public static ActiveEntity of(final String tableName) { return new ActiveEntity(tableName); } @@ -45,7 +45,7 @@ public class ActiveEntity extends Entity { * @return ActiveEntity */ public static ActiveEntity parse(final T bean) { - return create(null).parseBean(bean); + return of(null).parseBean(bean); } /** @@ -58,7 +58,7 @@ public class ActiveEntity extends Entity { * @return ActiveEntity */ public static ActiveEntity parse(final T bean, final boolean isToUnderlineCase, final boolean ignoreNullValue) { - return create(null).parseBean(bean, isToUnderlineCase, ignoreNullValue); + return of(null).parseBean(bean, isToUnderlineCase, ignoreNullValue); } /** @@ -69,7 +69,7 @@ public class ActiveEntity extends Entity { * @return ActiveEntity */ public static ActiveEntity parseWithUnderlineCase(final T bean) { - return create(null).parseBean(bean, true, true); + return of(null).parseBean(bean, true, true); } // --------------------------------------------------------------- Static method end diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java index c9a8f1172..b58f74179 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/Dialect.java @@ -133,7 +133,7 @@ public interface Dialect extends Serializable { * @throws SQLException SQL执行异常 */ default PreparedStatement psForCount(final Connection conn, final Query query) throws SQLException { - return psForCount(conn, SqlBuilder.create().query(query)); + return psForCount(conn, SqlBuilder.of().query(query)); } /** diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java index a6361a698..b3eee952c 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java @@ -43,7 +43,7 @@ public class AnsiSqlDialect implements Dialect { @Override public PreparedStatement psForInsert(final Connection conn, final Entity entity) throws SQLException { - final SqlBuilder insert = SqlBuilder.create(wrapper).insert(entity, this.dialectName()); + final SqlBuilder insert = SqlBuilder.of(wrapper).insert(entity, this.dialectName()); return StatementUtil.prepareStatement(conn, insert); } @@ -54,7 +54,7 @@ public class AnsiSqlDialect implements Dialect { throw new DbRuntimeException("Entities for batch insert is empty !"); } // 批量，根据第一行数据结构生成SQL占位符 - final SqlBuilder insert = SqlBuilder.create(wrapper).insert(entities[0], this.dialectName()); + final SqlBuilder insert = SqlBuilder.of(wrapper).insert(entities[0], this.dialectName()); final Set fields = CollUtil.filter(entities[0].keySet(), StrUtil::isNotBlank); return StatementUtil.prepareStatementForBatch(conn, insert.build(), fields, entities); } @@ -68,7 +68,7 @@ public class AnsiSqlDialect implements Dialect { // 对于无条件的删除语句直接抛出异常禁止，防止误删除 throw new SQLException("No 'WHERE' condition, we can't prepared statement for delete everything."); } - final SqlBuilder delete = SqlBuilder.create(wrapper).delete(query.getFirstTableName()).where(where); + final SqlBuilder delete = SqlBuilder.of(wrapper).delete(query.getFirstTableName()).where(where); return StatementUtil.prepareStatement(conn, delete); } @@ -83,7 +83,7 @@ public class AnsiSqlDialect implements Dialect { throw new SQLException("No 'WHERE' condition, we can't prepare statement for update everything."); } - final SqlBuilder update = SqlBuilder.create(wrapper).update(entity).where(where); + final SqlBuilder update = SqlBuilder.of(wrapper).update(entity).where(where); return StatementUtil.prepareStatement(conn, update); } @@ -100,7 +100,7 @@ public class AnsiSqlDialect implements Dialect { throw new DbRuntimeException("Table name must be not empty !"); } - final SqlBuilder find = SqlBuilder.create(wrapper).query(query); + final SqlBuilder find = SqlBuilder.of(wrapper).query(query); return psForPage(conn, find, query.getPage()); } diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java index 2efb20a21..6bee0af21 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java @@ -40,7 +40,7 @@ public class H2Dialect extends AnsiSqlDialect { public PreparedStatement psForUpsert(final Connection conn, final Entity entity, final String... keys) throws SQLException { Assert.notEmpty(keys, "Keys must be not empty for H2 MERGE SQL."); SqlBuilder.validateEntity(entity); - final SqlBuilder builder = SqlBuilder.create(wrapper); + final SqlBuilder builder = SqlBuilder.of(wrapper); final StringBuilder fieldsPart = new StringBuilder(); final StringBuilder placeHolder = new StringBuilder(); diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java index e377c4390..bc4795094 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java @@ -51,7 +51,7 @@ public class MysqlDialect extends AnsiSqlDialect{ @Override public PreparedStatement psForUpsert(final Connection conn, final Entity entity, final String... keys) throws SQLException { SqlBuilder.validateEntity(entity); - final SqlBuilder builder = SqlBuilder.create(wrapper); + final SqlBuilder builder = SqlBuilder.of(wrapper); final StringBuilder fieldsPart = new StringBuilder(); final StringBuilder placeHolder = new StringBuilder(); diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java index f9e43fb19..468044edd 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java @@ -35,7 +35,7 @@ public class PostgresqlDialect extends AnsiSqlDialect{ public PreparedStatement psForUpsert(final Connection conn, final Entity entity, final String... keys) throws SQLException { Assert.notEmpty(keys, "Keys must be not empty for Postgres."); SqlBuilder.validateEntity(entity); - final SqlBuilder builder = SqlBuilder.create(wrapper); + final SqlBuilder builder = SqlBuilder.of(wrapper); final StringBuilder fieldsPart = new StringBuilder(); final StringBuilder placeHolder = new StringBuilder(); diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java index 14708dee6..36d518ab5 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java @@ -136,7 +136,7 @@ public abstract class DSFactory implements Closeable, Serializable{ * @param setting 数据库配置项 * @return 日志实现类 */ - public static DSFactory create(final Setting setting) { + public static DSFactory of(final Setting setting) { final DSFactory dsFactory = doCreate(setting); log.debug("Use [{}] DataSource As Default", dsFactory.dataSourceName); return dsFactory; diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java index b95128117..fa60de40c 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/GlobalDSFactory.java @@ -42,7 +42,7 @@ public class GlobalDSFactory { if (null == factory) { synchronized (lock) { if (null == factory) { - factory = DSFactory.create(null); + factory = DSFactory.of(null); } } } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java index 66e5853f0..19ac08cc5 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/BeanHandler.java @@ -23,7 +23,7 @@ public class BeanHandler implements RsHandler{ * @param beanType Bean类型 * @return BeanHandler对象 */ - public static BeanHandler create(final Class beanType) { + public static BeanHandler of(final Class beanType) { return new BeanHandler<>(beanType); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java index 10bfee661..ce384eaa3 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/BeanListHandler.java @@ -24,7 +24,7 @@ public class BeanListHandler implements RsHandler> { * @param beanType Bean类型 * @return BeanListHandler对象 */ - public static BeanListHandler create(final Class beanType) { + public static BeanListHandler of(final Class beanType) { return new BeanListHandler<>(beanType); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java index 873d8e14f..4638d75fe 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/EntityHandler.java @@ -22,7 +22,7 @@ public class EntityHandler implements RsHandler{ * 创建一个 EntityHandler对象 * @return EntityHandler对象 */ - public static EntityHandler create() { + public static EntityHandler of() { return new EntityHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java index 6473f25f7..bd6c2c6f4 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/EntityListHandler.java @@ -22,7 +22,7 @@ public class EntityListHandler implements RsHandler>{ * 创建一个 EntityListHandler对象 * @return EntityListHandler对象 */ - public static EntityListHandler create() { + public static EntityListHandler of() { return new EntityListHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java index 8a5de7957..43cfedc33 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/EntitySetHandler.java @@ -21,7 +21,7 @@ public class EntitySetHandler implements RsHandler>{ * 创建一个 EntityHandler对象 * @return EntityHandler对象 */ - public static EntitySetHandler create() { + public static EntitySetHandler of() { return new EntitySetHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java index 13bf6ebff..3cc0e1756 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/NumberHandler.java @@ -15,7 +15,7 @@ public class NumberHandler implements RsHandler{ * 创建一个 NumberHandler对象 * @return NumberHandler对象 */ - public static NumberHandler create() { + public static NumberHandler of() { return new NumberHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java index 8fb39cf4a..af4f6da3a 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/PageResultHandler.java @@ -27,7 +27,7 @@ public class PageResultHandler implements RsHandler> { * @param pageResult 分页结果集空对象 * @return EntityHandler对象 */ - public static PageResultHandler create(final PageResult pageResult) { + public static PageResultHandler of(final PageResult pageResult) { return new PageResultHandler(pageResult); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java index e657352f8..9caffb731 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/StringHandler.java @@ -15,7 +15,7 @@ public class StringHandler implements RsHandler{ * 创建一个 NumberHandler对象 * @return NumberHandler对象 */ - public static StringHandler create() { + public static StringHandler of() { return new StringHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java b/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java index 171cc7f1f..340116bfa 100644 --- a/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java +++ b/hutool-db/src/main/java/cn/hutool/db/handler/ValueListHandler.java @@ -17,7 +17,7 @@ public class ValueListHandler implements RsHandler>>{ * 创建一个 EntityListHandler对象 * @return EntityListHandler对象 */ - public static ValueListHandler create() { + public static ValueListHandler of() { return new ValueListHandler(); } diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java b/hutool-db/src/main/java/cn/hutool/db/meta/Column.java index c57673c12..4153ceb08 100755 --- a/hutool-db/src/main/java/cn/hutool/db/meta/Column.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/Column.java @@ -70,7 +70,7 @@ public class Column implements Serializable, Cloneable { * @return 列对象 * @since 5.4.3 */ - public static Column create(final Table table, final ResultSet columnMetaRs) { + public static Column of(final Table table, final ResultSet columnMetaRs) { return new Column(table, columnMetaRs); } diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java b/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java index 46b45bfb9..d6466fd77 100644 --- a/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/ColumnIndexInfo.java @@ -21,7 +21,7 @@ public class ColumnIndexInfo implements Serializable, Cloneable { * @param rs 结果集，通过DatabaseMetaData#getIndexInfo获取 * @return ColumnIndexInfo */ - public static ColumnIndexInfo create(final ResultSet rs) { + public static ColumnIndexInfo of(final ResultSet rs) { try { return new ColumnIndexInfo( rs.getString("COLUMN_NAME"), diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java index 13200ed0c..668b46bd6 100755 --- a/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java @@ -207,7 +207,7 @@ public class MetaUtil { * @since 5.7.22 */ public static Table getTableMeta(final DataSource ds, String catalog, String schema, final String tableName) { - final Table table = Table.create(tableName); + final Table table = Table.of(tableName); Connection conn = null; try { conn = ds.getConnection(); @@ -246,7 +246,7 @@ public class MetaUtil { try (final ResultSet rs = metaData.getColumns(catalog, schema, tableName, null)) { if (null != rs) { while (rs.next()) { - table.setColumn(Column.create(table, rs)); + table.setColumn(Column.of(table, rs)); } } } @@ -269,7 +269,7 @@ public class MetaUtil { indexInfo = new IndexInfo(rs.getBoolean("NON_UNIQUE"), indexName, tableName, schema, catalog); indexInfoMap.put(key, indexInfo); } - indexInfo.getColumnIndexInfoList().add(ColumnIndexInfo.create(rs)); + indexInfo.getColumnIndexInfoList().add(ColumnIndexInfo.of(rs)); } } table.setIndexInfoList(ListUtil.of(indexInfoMap.values())); diff --git a/hutool-db/src/main/java/cn/hutool/db/meta/Table.java b/hutool-db/src/main/java/cn/hutool/db/meta/Table.java index 6640ab4d8..662386555 100644 --- a/hutool-db/src/main/java/cn/hutool/db/meta/Table.java +++ b/hutool-db/src/main/java/cn/hutool/db/meta/Table.java @@ -45,7 +45,7 @@ public class Table implements Serializable, Cloneable { */ private final Map columns = new LinkedHashMap<>(); - public static Table create(final String tableName) { + public static Table of(final String tableName) { return new Table(tableName); } diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java index f0cfc318a..8bedc1020 100644 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java @@ -32,7 +32,7 @@ public class SqlBuilder implements Builder { * * @return SQL构建器 */ - public static SqlBuilder create() { + public static SqlBuilder of() { return new SqlBuilder(); } @@ -42,7 +42,7 @@ public class SqlBuilder implements Builder { * @param wrapper 包装器 * @return SQL构建器 */ - public static SqlBuilder create(final Wrapper wrapper) { + public static SqlBuilder of(final Wrapper wrapper) { return new SqlBuilder(wrapper); } @@ -54,7 +54,7 @@ public class SqlBuilder implements Builder { * @since 5.5.3 */ public static SqlBuilder of(final CharSequence sql) { - return create().append(sql); + return of().append(sql); } /** 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 0cbbf2842..a8130dfdc 100755 --- a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java @@ -23,9 +23,9 @@ public class OracleTest { final Query query = new Query(SqlUtil.buildConditions(where), where.getTableName()); query.setPage(page); - final SqlBuilder find = SqlBuilder.create(null).query(query).orderBy(page.getOrders()); + final SqlBuilder find = SqlBuilder.of(null).query(query).orderBy(page.getOrders()); final int[] startEnd = page.getStartEnd(); - final SqlBuilder builder = SqlBuilder.create(null).append("SELECT * FROM ( SELECT row_.*, rownum rownum_ from ( ")// + final SqlBuilder builder = SqlBuilder.of(null).append("SELECT * FROM ( SELECT row_.*, rownum rownum_ from ( ")// .append(find)// .append(" ) row_ where rownum <= ").append(startEnd[1])// .append(") table_alias")// diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java index 470b68ba8..9ee2a9bb2 100644 --- a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java +++ b/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java @@ -7,22 +7,22 @@ public class SqlBuilderTest { @Test public void queryNullTest() { - final SqlBuilder builder = SqlBuilder.create().select().from("user").where(new Condition("name", "= null")); + final SqlBuilder builder = SqlBuilder.of().select().from("user").where(new Condition("name", "= null")); Assert.assertEquals("SELECT * FROM user WHERE name IS NULL", builder.build()); - final SqlBuilder builder2 = SqlBuilder.create().select().from("user").where(new Condition("name", "is null")); + final SqlBuilder builder2 = SqlBuilder.of().select().from("user").where(new Condition("name", "is null")); Assert.assertEquals("SELECT * FROM user WHERE name IS NULL", builder2.build()); - final SqlBuilder builder3 = SqlBuilder.create().select().from("user").where(new Condition("name", "!= null")); + final SqlBuilder builder3 = SqlBuilder.of().select().from("user").where(new Condition("name", "!= null")); Assert.assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder3.build()); - final SqlBuilder builder4 = SqlBuilder.create().select().from("user").where(new Condition("name", "is not null")); + final SqlBuilder builder4 = SqlBuilder.of().select().from("user").where(new Condition("name", "is not null")); Assert.assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder4.build()); } @Test public void orderByTest() { - final SqlBuilder builder = SqlBuilder.create().select("id", "username").from("user") + final SqlBuilder builder = SqlBuilder.of().select("id", "username").from("user") .join("role", SqlBuilder.Join.INNER) .on("user.id = role.user_id") .where(new Condition("age", ">=", 18), diff --git a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java index 02df6d14b..afdfc8598 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/aop/proxy/ProxyFactory.java @@ -59,7 +59,7 @@ public abstract class ProxyFactory implements Serializable { * @return 代理对象 */ public static T createProxy(final T target, final Aspect aspect) { - return create().proxy(target, aspect); + return of().proxy(target, aspect); } /** @@ -67,7 +67,7 @@ public abstract class ProxyFactory implements Serializable { * * @return 代理工厂 */ - public static ProxyFactory create() { + public static ProxyFactory of() { return ServiceLoaderUtil.loadFirstAvailable(ProxyFactory.class); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java index 3132b68d7..6f3e49b07 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/CompressUtil.java @@ -105,7 +105,7 @@ public class CompressUtil { if (ArchiveStreamFactory.SEVEN_Z.equalsIgnoreCase(archiverName)) { return new SevenZArchiver(file); } - return StreamArchiver.create(charset, archiverName, file); + return StreamArchiver.of(charset, archiverName, file); } /** @@ -128,7 +128,7 @@ public class CompressUtil { if (ArchiveStreamFactory.SEVEN_Z.equalsIgnoreCase(archiverName)) { return new SevenZArchiver(out); } - return StreamArchiver.create(charset, archiverName, out); + return StreamArchiver.of(charset, archiverName, out); } /** diff --git a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java index fbde6e918..4f95c63a1 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/compress/archiver/StreamArchiver.java @@ -41,7 +41,7 @@ public class StreamArchiver implements Archiver { * @param file 归档输出的文件 * @return StreamArchiver */ - public static StreamArchiver create(final Charset charset, final String archiverName, final File file) { + public static StreamArchiver of(final Charset charset, final String archiverName, final File file) { return new StreamArchiver(charset, archiverName, file); } @@ -53,7 +53,7 @@ public class StreamArchiver implements Archiver { * @param out 归档输出的流 * @return StreamArchiver */ - public static StreamArchiver create(final Charset charset, final String archiverName, final OutputStream out) { + public static StreamArchiver of(final Charset charset, final String archiverName, final OutputStream out) { return new StreamArchiver(charset, archiverName, out); } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java index 89db052b9..248346668 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/expression/engine/ExpressionFactory.java @@ -22,7 +22,7 @@ public class ExpressionFactory { * @return 单例的{@link ExpressionEngine} */ public static ExpressionEngine get(){ - return Singleton.get(ExpressionEngine.class.getName(), ExpressionFactory::create); + return Singleton.get(ExpressionEngine.class.getName(), ExpressionFactory::of); } /** @@ -31,7 +31,7 @@ public class ExpressionFactory { * * @return {@link ExpressionEngine} */ - public static ExpressionEngine create() { + public static ExpressionEngine of() { final ExpressionEngine engine = doCreate(); StaticLog.debug("Use [{}] Engine As Default.", StrUtil.removeSuffix(engine.getClass().getSimpleName(), "Engine")); return engine; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java index 65bf446c8..174dcb4d5 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java @@ -141,7 +141,7 @@ public class Ftp extends AbstractFtp { * @since 5.7.22 */ public Ftp(final FTPClient client) { - super(FtpConfig.create()); + super(FtpConfig.of()); this.client = client; } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java index edf780103..a09794832 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/FtpConfig.java @@ -11,7 +11,7 @@ import java.nio.charset.Charset; public class FtpConfig implements Serializable { private static final long serialVersionUID = 1L; - public static FtpConfig create() { + public static FtpConfig of() { return new FtpConfig(); } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java b/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java index 0d1491b23..0437afe4d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ftp/SimpleFtpServer.java @@ -32,7 +32,7 @@ public class SimpleFtpServer { * * @return SimpleFtpServer */ - public static SimpleFtpServer create() { + public static SimpleFtpServer of() { return new SimpleFtpServer(); } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java index 36c0695e7..ec97bbb5d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/Mail.java @@ -91,7 +91,7 @@ public class Mail implements Builder { * @param mailAccount 邮件帐号 * @return Mail */ - public static Mail create(final MailAccount mailAccount) { + public static Mail of(final MailAccount mailAccount) { return new Mail(mailAccount); } @@ -100,7 +100,7 @@ public class Mail implements Builder { * * @return Mail */ - public static Mail create() { + public static Mail of() { return new Mail(); } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java index 888842d8d..12a5e42aa 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/mail/MailUtil.java @@ -388,7 +388,7 @@ public class MailUtil { */ private static String send(final MailAccount mailAccount, final boolean useGlobalSession, final Collection tos, final Collection ccs, final Collection bccs, final String subject, final String content, final Map imageMap, final boolean isHtml, final File... files) { - final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession); + final Mail mail = Mail.of(mailAccount).setUseGlobalSession(useGlobalSession); // 可选抄送人 if (CollUtil.isNotEmpty(ccs)) { diff --git a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java index 895a884a4..ce05999c3 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/pinyin/engine/PinyinFactory.java @@ -21,7 +21,7 @@ public class PinyinFactory { * @return 单例的PinyinEngine */ public static PinyinEngine get(){ - return Singleton.get(PinyinEngine.class.getName(), PinyinFactory::create); + return Singleton.get(PinyinEngine.class.getName(), PinyinFactory::of); } /** @@ -30,7 +30,7 @@ public class PinyinFactory { * * @return {@link PinyinEngine} */ - public static PinyinEngine create() { + public static PinyinEngine of() { final PinyinEngine engine = doCreate(); StaticLog.debug("Use [{}] Engine As Default.", StrUtil.removeSuffix(engine.getClass().getSimpleName(), "Engine")); return engine; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java index f8f7c05b7..77eb4e6c7 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java @@ -50,7 +50,7 @@ public class QrConfig { * @return QrConfig * @since 4.1.14 */ - public static QrConfig create() { + public static QrConfig of() { return new QrConfig(); } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java index 6e4008f0d..a1bb581c3 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java @@ -111,7 +111,7 @@ public class Sftp extends AbstractFtp { * @since 4.1.14 */ public Sftp(final Session session, final Charset charset) { - super(FtpConfig.create().setCharset(charset)); + super(FtpConfig.of().setCharset(charset)); init(session, charset); } @@ -122,7 +122,7 @@ public class Sftp extends AbstractFtp { * @param charset 编码 */ public Sftp(final ChannelSftp channel, final Charset charset) { - super(FtpConfig.create().setCharset(charset)); + super(FtpConfig.of().setCharset(charset)); init(channel, charset); } @@ -135,7 +135,7 @@ public class Sftp extends AbstractFtp { * @since 5.8.4 */ public Sftp(final Session session, final Charset charset, final long timeOut) { - super(FtpConfig.create().setCharset(charset).setConnectionTimeout(timeOut)); + super(FtpConfig.of().setCharset(charset).setConnectionTimeout(timeOut)); init(session, charset); } @@ -148,7 +148,7 @@ public class Sftp extends AbstractFtp { * @since 5.8.4 */ public Sftp(final ChannelSftp channel, final Charset charset, final long timeOut) { - super(FtpConfig.create().setCharset(charset).setConnectionTimeout(timeOut)); + super(FtpConfig.of().setCharset(charset).setConnectionTimeout(timeOut)); init(channel, charset); } // ---------------------------------------------------------------------------------------- Constructor end diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java index e6157024a..f7d535110 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/TemplateUtil.java @@ -18,7 +18,7 @@ public class TemplateUtil { * @since 4.1.11 */ public static TemplateEngine createEngine() { - return TemplateFactory.create(); + return TemplateFactory.of(); } /** @@ -29,6 +29,6 @@ public class TemplateUtil { * @return {@link TemplateEngine} */ public static TemplateEngine createEngine(final TemplateConfig config) { - return TemplateFactory.create(config); + return TemplateFactory.of(config); } } diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java index 0558316a7..bdcbd5ff4 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/TemplateFactory.java @@ -23,7 +23,7 @@ public class TemplateFactory { * @return 单例的TemplateEngine */ public static TemplateEngine get(){ - return Singleton.get(TemplateEngine.class.getName(), TemplateFactory::create); + return Singleton.get(TemplateEngine.class.getName(), TemplateFactory::of); } /** @@ -33,8 +33,8 @@ public class TemplateFactory { * @return {@link TemplateEngine} * @since 5.3.3 */ - public static TemplateEngine create() { - return create(new TemplateConfig()); + public static TemplateEngine of() { + return of(new TemplateConfig()); } /** @@ -44,7 +44,7 @@ public class TemplateFactory { * @param config 模板配置，包括编码、模板文件path等信息 * @return {@link TemplateEngine} */ - public static TemplateEngine create(final TemplateConfig config) { + public static TemplateEngine of(final TemplateConfig config) { final TemplateEngine engine = doCreate(config); StaticLog.debug("Use [{}] Engine As Default.", StrUtil.removeSuffix(engine.getClass().getSimpleName(), "Engine")); return engine; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java index 4ffbd6203..86830f28f 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java @@ -84,7 +84,7 @@ public class WitEngine implements TemplateEngine { Dict dict = null; if (null != config) { - dict = Dict.create(); + dict = Dict.of(); // 自定义编码 dict.set("DEFAULT_ENCODING", config.getCharset()); diff --git a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java index 6aa564d1b..37774111d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/tokenizer/TokenizerUtil.java @@ -4,7 +4,7 @@ import cn.hutool.extra.tokenizer.engine.TokenizerFactory; /** * 分词工具类 - * + * * @author looly * @since 4.3.3 */ @@ -12,10 +12,10 @@ public class TokenizerUtil { /** * 根据用户引入的分词引擎jar，自动创建对应的分词引擎对象 - * + * * @return {@link TokenizerEngine} */ public static TokenizerEngine createEngine() { - return TokenizerFactory.create(); + return TokenizerFactory.of(); } } 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 0d61fbb90..4aa390896 100755 --- 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 @@ -23,7 +23,7 @@ public class TokenizerFactory { * @since 5.3.3 */ public static TokenizerEngine get(){ - return Singleton.get(TokenizerEngine.class.getName(), TokenizerFactory::create); + return Singleton.get(TokenizerEngine.class.getName(), TokenizerFactory::of); } /** @@ -31,7 +31,7 @@ public class TokenizerFactory { * * @return {@link TokenizerEngine} */ - public static TokenizerEngine create() { + public static TokenizerEngine of() { final TokenizerEngine engine = doCreate(); StaticLog.debug("Use [{}] Tokenizer Engine As Default.", StrUtil.removeSuffix(engine.getClass().getSimpleName(), "Engine")); return engine; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java index 40c7dc88b..35d92d0d2 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java @@ -16,7 +16,7 @@ public class ArchiverTest { @Ignore public void zipTest(){ final File file = FileUtil.file("d:/test/compress/test.zip"); - StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.ZIP, file) + StreamArchiver.of(CharsetUtil.UTF_8, ArchiveStreamFactory.ZIP, file) .add(FileUtil.file("d:/Java"), (f)->{ Console.log("Add: {}", f.getPath()); return true; @@ -28,7 +28,7 @@ public class ArchiverTest { @Ignore public void tarTest(){ final File file = FileUtil.file("d:/test/compress/test.tar"); - StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.TAR, file) + StreamArchiver.of(CharsetUtil.UTF_8, ArchiveStreamFactory.TAR, file) .add(FileUtil.file("d:/Java"), (f)->{ Console.log("Add: {}", f.getPath()); return true; @@ -40,7 +40,7 @@ public class ArchiverTest { @Ignore public void cpioTest(){ final File file = FileUtil.file("d:/test/compress/test.cpio"); - StreamArchiver.create(CharsetUtil.UTF_8, ArchiveStreamFactory.CPIO, file) + StreamArchiver.of(CharsetUtil.UTF_8, ArchiveStreamFactory.CPIO, file) .add(FileUtil.file("d:/Java"), (f)->{ Console.log("Add: {}", f.getPath()); return true; diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java index 6119355b4..55c352169 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java @@ -21,17 +21,17 @@ public class AviatorTest { final ExpressionEngine engine = new AviatorEngine(); String exp = "\"[foo i=\"+ foo.i + \", f=\" + foo.f + \", date.year=\" + (foo.date.year+1900) + \", date.month=\" + foo.date.month + \", bars[0].name=\" + #foo.bars[0].name + \"]\""; - String result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + String result = (String) engine.eval(exp, Dict.of().set("foo", foo)); Assert.assertEquals("[foo i=100, f=3.14, date.year=2020, date.month=10, bars[0].name=bar]", result); // Assignment. exp = "#foo.bars[0].name='hello aviator' ; #foo.bars[0].name"; - result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + result = (String) engine.eval(exp, Dict.of().set("foo", foo)); Assert.assertEquals("hello aviator", result); Assert.assertEquals("hello aviator", foo.bars[0].getName()); exp = "foo.bars[0] = nil ; foo.bars[0]"; - result = (String) engine.eval(exp, Dict.create().set("foo", foo)); + result = (String) engine.eval(exp, Dict.of().set("foo", foo)); Console.log("Execute expression: " + exp); Assert.assertNull(result); Assert.assertNull(foo.bars[0]); diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java index 9904038af..c790382c2 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java @@ -16,7 +16,7 @@ public class ExpressionUtilTest { @Test public void evalTest(){ - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); @@ -28,7 +28,7 @@ public class ExpressionUtilTest { public void jexlTest(){ final ExpressionEngine engine = new JexlEngine(); - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); @@ -51,7 +51,7 @@ public class ExpressionUtilTest { public void mvelTest(){ final ExpressionEngine engine = new MvelEngine(); - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); @@ -63,7 +63,7 @@ public class ExpressionUtilTest { public void jfireELTest(){ final ExpressionEngine engine = new JfireELEngine(); - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); @@ -75,7 +75,7 @@ public class ExpressionUtilTest { public void spELTest(){ final ExpressionEngine engine = new SpELEngine(); - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); @@ -87,7 +87,7 @@ public class ExpressionUtilTest { public void rhinoTest(){ final ExpressionEngine engine = new RhinoEngine(); - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("a", 100.3) .set("b", 45) .set("c", -199.100); diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java index eccf1e45a..fa77e1fdf 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/ftp/SimpleFtpServerTest.java @@ -4,7 +4,7 @@ public class SimpleFtpServerTest { public static void main(final String[] args) { SimpleFtpServer - .create() + .of() .addAnonymous("d:/test/ftp/") .start(); } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java index 7cbde0063..81c71a24c 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java @@ -47,7 +47,7 @@ public class MailAccountTest { mailAccount.setAuth(true); mailAccount.setSslEnable(true); - final Mail mail = Mail.create(mailAccount) + final Mail mail = Mail.of(mailAccount) .setTos("xx@xx.com") .setTitle("邮箱验证") .setContent("您的验证码是：

2333

") diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java index 142bff769..397f7752a 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java @@ -47,7 +47,7 @@ public class QrCodeUtilTest { final String targetPath = FileUtil.isWindows() ? "d:/test/qrcodeWithLogo.jpg" : "~/Desktop/hutool/qrcodeWithLogo.jpg"; QrCodeUtil.generate(// "https://hutool.cn/", // - QrConfig.create().setImg(icon), // + QrConfig.of().setImg(icon), // FileUtil.touch(targetPath)); } @@ -91,7 +91,7 @@ public class QrCodeUtilTest { @Test public void pdf417Test(){ - final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.PDF_417, QrConfig.create()); + final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.PDF_417, QrConfig.of()); Assert.assertNotNull(image); } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java index caf0a9f34..0c6b95f78 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java @@ -15,7 +15,7 @@ public class JetbrickTest { .setCustomEngine(JetbrickEngine.class); final TemplateEngine engine = TemplateUtil.createEngine(config); final Template template = engine.getTemplate("jetbrick_test.jetx"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("你好,hutool", StrUtil.trim(result)); } @@ -26,7 +26,7 @@ public class JetbrickTest { .setCustomEngine(JetbrickEngine.class); final TemplateEngine engine = TemplateUtil.createEngine(config); final Template template = engine.getTemplate("hello,${name}"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", StrUtil.trim(result)); } } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java index c44f838dd..16fdf6ac7 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java @@ -31,13 +31,13 @@ public class TemplateUtilTest { // 字符串模板, 默认模板引擎，此处为Beetl TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig()); final Template template = engine.getTemplate("hello,${name}"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result); // classpath中获取模板 engine = TemplateUtil.createEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH)); final Template template2 = engine.getTemplate("beetl_test.btl"); - final String result2 = template2.render(Dict.create().set("name", "hutool")); + final String result2 = template2.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result2); } @@ -46,13 +46,13 @@ public class TemplateUtilTest { // 字符串模板 TemplateEngine engine = new BeetlEngine(new TemplateConfig("templates")); final Template template = engine.getTemplate("hello,${name}"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result); // classpath中获取模板 engine = new BeetlEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH)); final Template template2 = engine.getTemplate("beetl_test.btl"); - final String result2 = template2.render(Dict.create().set("name", "hutool")); + final String result2 = template2.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result2); } @@ -62,12 +62,12 @@ public class TemplateUtilTest { final TemplateEngine engine = TemplateUtil.createEngine( new TemplateConfig("templates").setCustomEngine(RythmEngine.class)); final Template template = engine.getTemplate("hello,@name"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result); // classpath中获取模板 final Template template2 = engine.getTemplate("rythm_test.tmpl"); - final String result2 = template2.render(Dict.create().set("name", "hutool")); + final String result2 = template2.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result2); } @@ -77,14 +77,14 @@ public class TemplateUtilTest { TemplateEngine engine = TemplateUtil.createEngine( new TemplateConfig("templates", ResourceMode.STRING).setCustomEngine(FreemarkerEngine.class)); Template template = engine.getTemplate("hello,${name}"); - String result = template.render(Dict.create().set("name", "hutool")); + String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result); //ClassPath模板 engine = TemplateUtil.createEngine( new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(FreemarkerEngine.class)); template = engine.getTemplate("freemarker_test.ftl"); - result = template.render(Dict.create().set("name", "hutool")); + result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", result); } @@ -94,18 +94,18 @@ public class TemplateUtilTest { TemplateEngine engine = TemplateUtil.createEngine( new TemplateConfig("templates", ResourceMode.STRING).setCustomEngine(VelocityEngine.class)); Template template = engine.getTemplate("你好,$name"); - String result = template.render(Dict.create().set("name", "hutool")); + String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("你好,hutool", result); //ClassPath模板 engine = TemplateUtil.createEngine( new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(VelocityEngine.class)); template = engine.getTemplate("velocity_test.vtl"); - result = template.render(Dict.create().set("name", "hutool")); + result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("你好,hutool", result); template = engine.getTemplate("templates/velocity_test.vtl"); - result = template.render(Dict.create().set("name", "hutool")); + result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("你好,hutool", result); } @@ -115,14 +115,14 @@ public class TemplateUtilTest { TemplateEngine engine = TemplateUtil.createEngine( new TemplateConfig("templates").setCustomEngine(EnjoyEngine.class)); Template template = engine.getTemplate("#(x + 123)"); - String result = template.render(Dict.create().set("x", 1)); + String result = template.render(Dict.of().set("x", 1)); Assert.assertEquals("124", result); //ClassPath模板 engine = new EnjoyEngine( new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(EnjoyEngine.class)); template = engine.getTemplate("enjoy_test.etl"); - result = template.render(Dict.create().set("x", 1)); + result = template.render(Dict.of().set("x", 1)); Assert.assertEquals("124", result); } @@ -132,14 +132,14 @@ public class TemplateUtilTest { TemplateEngine engine = TemplateUtil.createEngine( new TemplateConfig("templates").setCustomEngine(ThymeleafEngine.class)); Template template = engine.getTemplate("

"); - String result = template.render(Dict.create().set("message", "Hutool")); + String result = template.render(Dict.of().set("message", "Hutool")); Assert.assertEquals("

Hutool

", result); //ClassPath模板 engine = TemplateUtil.createEngine( new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(ThymeleafEngine.class)); template = engine.getTemplate("thymeleaf_test.ttl"); - result = template.render(Dict.create().set("message", "Hutool")); + result = template.render(Dict.of().set("message", "Hutool")); Assert.assertEquals("

Hutool

", result); } @@ -162,7 +162,7 @@ public class TemplateUtilTest { .setCustomEngine(WitEngine.class); TemplateEngine engine = TemplateUtil.createEngine(config); Template template = engine.getTemplate("/wit_test.wit"); - String result = template.render(Dict.create().set("name", "hutool")); + String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", StrUtil.trim(result)); // 字符串模板 @@ -170,7 +170,7 @@ public class TemplateUtilTest { .setCustomEngine(WitEngine.class); engine = TemplateUtil.createEngine(config); template = engine.getTemplate("<%var name;%>hello,${name}"); - result = template.render(Dict.create().set("name", "hutool")); + result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("hello,hutool", StrUtil.trim(result)); } } 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 c6763590d..e53ffa6e0 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java @@ -45,7 +45,7 @@ public class ThymeleafTest { // 字符串模板 final TemplateEngine engine = new ThymeleafEngine(new TemplateConfig()); final Template template = engine.getTemplate("

"); - final String render = template.render(Dict.create().set("list", list)); + final String render = template.render(Dict.of().set("list", list)); Assert.assertEquals("

a

b

2019-01-01 00:00:00

", render); } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java index 17edaaea6..da2737ffa 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java @@ -15,7 +15,7 @@ public class VelocityTest { config.setCharset(CharsetUtil.GBK); final TemplateEngine engine = TemplateUtil.createEngine(config); final Template template = engine.getTemplate("velocity_test_gbk.vtl"); - final String result = template.render(Dict.create().set("name", "hutool")); + final String result = template.render(Dict.of().set("name", "hutool")); Assert.assertEquals("你好,hutool", result); } } diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpConfig.java b/hutool-http/src/main/java/cn/hutool/http/HttpConfig.java index 2cf9eb32b..2338e77f9 100755 --- a/hutool-http/src/main/java/cn/hutool/http/HttpConfig.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpConfig.java @@ -21,7 +21,7 @@ public class HttpConfig { * * @return HttpConfig */ - public static HttpConfig create() { + public static HttpConfig of() { return new HttpConfig(); } diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java b/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java index c0b6fbc87..0e24960d5 100644 --- a/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpConnection.java @@ -42,8 +42,8 @@ public class HttpConnection { * @param proxy 代理，无代理传{@code null} * @return HttpConnection */ - public static HttpConnection create(final String urlStr, final Proxy proxy) { - return create(URLUtil.toUrlForHttp(urlStr), proxy); + public static HttpConnection of(final String urlStr, final Proxy proxy) { + return of(URLUtil.toUrlForHttp(urlStr), proxy); } /** @@ -53,7 +53,7 @@ public class HttpConnection { * @param proxy 代理，无代理传{@code null} * @return HttpConnection */ - public static HttpConnection create(final URL url, final Proxy proxy) { + public static HttpConnection of(final URL url, final Proxy proxy) { return new HttpConnection(url, proxy); } diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java index e8dbd9847..8989e7c67 100755 --- a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java +++ b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java @@ -211,7 +211,7 @@ public class HttpRequest extends HttpBase { } // ---------------------------------------------------------------- static Http Method end - private HttpConfig config = HttpConfig.create(); + private HttpConfig config = HttpConfig.of(); private UrlBuilder url; private URLStreamHandler urlHandler; private Method method = Method.GET; @@ -1141,7 +1141,7 @@ public class HttpRequest extends HttpBase { this.httpConnection = HttpConnection // issue#I50NHQ // 在生成正式URL前，设置自定义编码 - .create(this.url.setCharset(this.charset).toURL(this.urlHandler), config.proxy)// + .of(this.url.setCharset(this.charset).toURL(this.urlHandler), config.proxy)// .setConnectTimeout(config.connectionTimeout)// .setReadTimeout(config.readTimeout)// .setMethod(this.method)// @@ -1263,9 +1263,9 @@ public class HttpRequest extends HttpBase { // Write的时候会优先使用body中的内容，write时自动关闭OutputStream final RequestBody body; if (ArrayUtil.isNotEmpty(this.bodyBytes)) { - body = BytesBody.create(this.bodyBytes); + body = BytesBody.of(this.bodyBytes); } else { - body = FormUrlEncodedBody.create(this.form, this.charset); + body = FormUrlEncodedBody.of(this.form, this.charset); } body.writeClose(this.httpConnection.getOutputStream()); } @@ -1277,7 +1277,7 @@ public class HttpRequest extends HttpBase { * @throws IOException IO异常 */ private void sendMultipart() throws IOException { - final MultipartBody multipartBody = MultipartBody.create(this.form, this.charset); + final MultipartBody multipartBody = MultipartBody.of(this.form, this.charset); //设置表单类型为Multipart（文件上传） this.httpConnection.header(Header.CONTENT_TYPE, multipartBody.getContentType(), true); multipartBody.writeClose(this.httpConnection.getOutputStream()); diff --git a/hutool-http/src/main/java/cn/hutool/http/body/BytesBody.java b/hutool-http/src/main/java/cn/hutool/http/body/BytesBody.java index 5e900ee14..ef234b495 100644 --- a/hutool-http/src/main/java/cn/hutool/http/body/BytesBody.java +++ b/hutool-http/src/main/java/cn/hutool/http/body/BytesBody.java @@ -19,7 +19,7 @@ public class BytesBody implements RequestBody { * @param content body内容，编码后 * @return BytesBody */ - public static BytesBody create(final byte[] content){ + public static BytesBody of(final byte[] content){ return new BytesBody(content); } diff --git a/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java b/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java index 21ef3103d..e62d3c09d 100644 --- a/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java +++ b/hutool-http/src/main/java/cn/hutool/http/body/FormUrlEncodedBody.java @@ -21,7 +21,7 @@ public class FormUrlEncodedBody extends BytesBody { * @param charset 编码 * @return FormUrlEncodedBody */ - public static FormUrlEncodedBody create(final Map form, final Charset charset) { + public static FormUrlEncodedBody of(final Map form, final Charset charset) { return new FormUrlEncodedBody(form, charset); } diff --git a/hutool-http/src/main/java/cn/hutool/http/body/MultipartBody.java b/hutool-http/src/main/java/cn/hutool/http/body/MultipartBody.java index 7e1aff8be..b15f7cfe3 100644 --- a/hutool-http/src/main/java/cn/hutool/http/body/MultipartBody.java +++ b/hutool-http/src/main/java/cn/hutool/http/body/MultipartBody.java @@ -42,7 +42,7 @@ public class MultipartBody implements RequestBody { * @param charset 编码 * @return MultipartBody */ - public static MultipartBody create(final Map form, final Charset charset) { + public static MultipartBody of(final Map form, final Charset charset) { return new MultipartBody(form, charset); } diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java index dc61c2eee..4a3646e72 100644 --- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java +++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapClient.java @@ -104,7 +104,7 @@ public class SoapClient extends HttpBase { * @param url WS的URL地址 * @return this */ - public static SoapClient create(final String url) { + public static SoapClient of(final String url) { return new SoapClient(url); } @@ -115,7 +115,7 @@ public class SoapClient extends HttpBase { * @param protocol 协议，见{@link SoapProtocol} * @return this */ - public static SoapClient create(final String url, final SoapProtocol protocol) { + public static SoapClient of(final String url, final SoapProtocol protocol) { return new SoapClient(url, protocol); } @@ -128,7 +128,7 @@ public class SoapClient extends HttpBase { * @return this * @since 4.5.6 */ - public static SoapClient create(final String url, final SoapProtocol protocol, final String namespaceURI) { + public static SoapClient of(final String url, final SoapProtocol protocol, final String namespaceURI) { return new SoapClient(url, protocol, namespaceURI); } diff --git a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java index 3ab04d01c..926e586dd 100644 --- a/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java +++ b/hutool-http/src/main/java/cn/hutool/http/webservice/SoapUtil.java @@ -27,7 +27,7 @@ public class SoapUtil { * @return {@link SoapClient} */ public static SoapClient createClient(final String url) { - return SoapClient.create(url); + return SoapClient.of(url); } /** @@ -38,7 +38,7 @@ public class SoapUtil { * @return {@link SoapClient} */ public static SoapClient createClient(final String url, final SoapProtocol protocol) { - return SoapClient.create(url, protocol); + return SoapClient.of(url, protocol); } /** @@ -51,7 +51,7 @@ public class SoapUtil { * @since 4.5.6 */ public static SoapClient createClient(final String url, final SoapProtocol protocol, final String namespaceURI) { - return SoapClient.create(url, protocol, namespaceURI); + return SoapClient.of(url, protocol, namespaceURI); } /** diff --git a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java index 217a0945e..3a895bd62 100644 --- a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java +++ b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java @@ -20,7 +20,7 @@ public class MultipartBodyTest { form.put("pic3", new HttpResource( new StringResource("pic3 content", "pic3.jpg"), "image/jpeg")); - final MultipartBody body = MultipartBody.create(form, CharsetUtil.UTF_8); + final MultipartBody body = MultipartBody.of(form, CharsetUtil.UTF_8); Assert.assertNotNull(body.toString()); // Console.log(body); diff --git a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java index 00cdab345..c4266161d 100644 --- a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java +++ b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java @@ -19,7 +19,7 @@ public class SoapClientTest { @Test @Ignore public void requestTest() { - final SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") + final SoapClient client = SoapClient.of("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") .setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/") .setCharset(CharsetUtil.GBK) .setParam("theIpAddress", "218.21.240.106"); @@ -32,7 +32,7 @@ public class SoapClientTest { @Test @Ignore public void requestForMessageTest() throws SOAPException { - final SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") + final SoapClient client = SoapClient.of("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") .setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/") .setParam("theIpAddress", "218.21.240.106"); diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java index cbf7a8f31..e96942ab0 100755 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java +++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java @@ -52,7 +52,7 @@ public class JWT implements RegisteredPayload { * * @return JWT */ - public static JWT create() { + public static JWT of() { return new JWT(); } diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java index 0f117730f..435e681d2 100755 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/jwt/JWTUtil.java @@ -29,7 +29,7 @@ public class JWTUtil { * @return JWT Token */ public static String createToken(final Map headers, final Map payload, final byte[] key) { - return JWT.create() + return JWT.of() .addHeaders(headers) .addPayloads(payload) .setKey(key) @@ -56,7 +56,7 @@ public class JWTUtil { * @return JWT Token */ public static String createToken(final Map headers, final Map payload, final JWTSigner signer) { - return JWT.create() + return JWT.of() .addHeaders(headers) .addPayloads(payload) .setSigner(signer) diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java index 5c5662567..3084874d3 100755 --- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTSignerTest.java @@ -117,7 +117,7 @@ public class JWTSignerTest { } private static void signAndVerify(final JWTSigner signer){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setPayload("sub", "1234567890") .setPayload("name", "looly") .setPayload("admin", true) diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java index 04acaab3b..4dffd65ce 100755 --- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTTest.java @@ -19,7 +19,7 @@ public class JWTTest { @Test public void createHs256Test(){ final byte[] key = "1234567890".getBytes(); - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setPayload("sub", "1234567890") .setPayload("name", "looly") .setPayload("admin", true) @@ -59,7 +59,7 @@ public class JWTTest { @Test public void createNoneTest(){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setPayload("sub", "1234567890") .setPayload("name", "looly") .setPayload("admin", true) @@ -79,7 +79,7 @@ public class JWTTest { */ @Test(expected = JWTException.class) public void needSignerTest(){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setPayload("sub", "1234567890") .setPayload("name", "looly") .setPayload("admin", true); @@ -150,7 +150,7 @@ public class JWTTest { @Test() public void getDateTest(){ - final String token = JWT.create() + final String token = JWT.of() .setIssuedAt(DateUtil.parse("2022-02-02")) .setKey("123456".getBytes()) .sign(); diff --git a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java index 1dc59d3a5..fd1ee25d8 100755 --- a/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/jwt/JWTValidatorTest.java @@ -18,7 +18,7 @@ public class JWTValidatorTest { @Test(expected = ValidateException.class) public void issueAtTest(){ - final String token = JWT.create() + final String token = JWT.of() .setIssuedAt(DateUtil.date()) .setKey("123456".getBytes()) .sign(); @@ -29,7 +29,7 @@ public class JWTValidatorTest { @Test public void issueAtPassTest(){ - final String token = JWT.create() + final String token = JWT.of() .setIssuedAt(DateUtil.date()) .setKey("123456".getBytes()) .sign(); @@ -40,7 +40,7 @@ public class JWTValidatorTest { @Test(expected = ValidateException.class) public void notBeforeTest(){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setNotBefore(DateUtil.date()); JWTValidator.of(jwt).validateDate(DateUtil.yesterday()); @@ -48,14 +48,14 @@ public class JWTValidatorTest { @Test public void notBeforePassTest(){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setNotBefore(DateUtil.date()); JWTValidator.of(jwt).validateDate(DateUtil.date()); } @Test public void validateAlgorithmTest(){ - final String token = JWT.create() + final String token = JWT.of() .setNotBefore(DateUtil.date()) .setKey("123456".getBytes()) .sign(); @@ -74,7 +74,7 @@ public class JWTValidatorTest { @Test(expected = ValidateException.class) public void validateDateTest(){ - final JWT jwt = JWT.create() + final JWT jwt = JWT.of() .setPayload("id", 123) .setPayload("username", "hutool") .setExpiresAt(DateUtil.parse("2021-10-13 09:59:00")); @@ -90,7 +90,7 @@ public class JWTValidatorTest { final Date expiredTime = new Date(now + expired); // 使用这种方式生成token - final String token = JWT.create().setPayload("sub", "blue-light").setIssuedAt(nowTime).setNotBefore(expiredTime) + final String token = JWT.of().setPayload("sub", "blue-light").setIssuedAt(nowTime).setNotBefore(expiredTime) .setExpiresAt(expiredTime).setKey("123456".getBytes()).sign(); // 使用这种方式验证token diff --git a/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java b/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java index 83a224437..ffe13509e 100644 --- a/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java +++ b/hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java @@ -20,7 +20,7 @@ public class GlobalLogFactory { if (null == currentLogFactory) { synchronized (lock) { if (null == currentLogFactory) { - currentLogFactory = LogFactory.create(); + currentLogFactory = LogFactory.of(); } } } diff --git a/hutool-log/src/main/java/cn/hutool/log/LogFactory.java b/hutool-log/src/main/java/cn/hutool/log/LogFactory.java index 5e1ea00e4..8295c8046 100644 --- a/hutool-log/src/main/java/cn/hutool/log/LogFactory.java +++ b/hutool-log/src/main/java/cn/hutool/log/LogFactory.java @@ -156,7 +156,7 @@ public abstract class LogFactory { * * @return 日志实现类 */ - public static LogFactory create() { + public static LogFactory of() { final LogFactory factory = doCreate(); factory.getLog(LogFactory.class).debug("Use [{}] Logger As Default.", factory.name); return factory; diff --git a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java index fba82f471..a27fd4625 100755 --- a/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java +++ b/hutool-log/src/main/java/cn/hutool/log/dialect/console/ConsoleLog.java @@ -121,7 +121,7 @@ public class ConsoleLog extends AbstractLog { } - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("date", DateUtil.formatNow()) .set("level", level.toString()) .set("name", this.name) diff --git a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java index 22ba088a7..cbdf31652 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/Setting.java @@ -63,7 +63,7 @@ public class Setting extends AbsSetting implements Map { * @return Setting * @since 5.4.3 */ - public static Setting create() { + public static Setting of() { return new Setting(); } diff --git a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java index 0a5f5979b..c88802339 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java @@ -55,7 +55,7 @@ public final class Props extends Properties implements BasicTypeGetter, * @return Setting * @since 5.4.3 */ - public static Props create() { + public static Props of() { return new Props(); } diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java index 04886e426..c27825e39 100755 --- a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java +++ b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java @@ -25,7 +25,7 @@ public class YamlUtilTest { @Test @Ignore public void dumpTest() { - final Dict dict = Dict.create() + final Dict dict = Dict.of() .set("name", "hutool") .set("count", 1000); diff --git a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java b/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java index 67dbb084c..39382ca65 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/ChannelUtil.java @@ -29,7 +29,7 @@ public class ChannelUtil { try { return AsynchronousChannelGroup.withFixedThreadPool(// poolSize, // 默认线程池大小 - ThreadFactoryBuilder.create().setNamePrefix("Huool-socket-").build()// + ThreadFactoryBuilder.of().setNamePrefix("Huool-socket-").build()// ); } catch (final IOException e) { throw new IORuntimeException(e); diff --git a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java index ffe317336..9181e3c01 100644 --- a/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java +++ b/hutool-socket/src/main/java/cn/hutool/socket/aio/AioServer.java @@ -61,7 +61,7 @@ public class AioServer implements Closeable { try { this.group = AsynchronousChannelGroup.withFixedThreadPool(// config.getThreadPoolSize(), // 默认线程池大小 - ThreadFactoryBuilder.create().setNamePrefix("Hutool-socket-").build()// + ThreadFactoryBuilder.of().setNamePrefix("Hutool-socket-").build()// ); this.channel = AsynchronousServerSocketChannel.open(group).bind(address); } catch (final IOException e) {