ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev

Browse Source
This commit is contained in:
Looly 2023-04-23 18:50:44 +08:00
commit e483ed9938
144 changed files with 306 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.annotation;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.func.SerFunction;

2
hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java
View File

@ -18,7 +18,7 @@ import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.collection.set.UniqueKeySet;
import org.dromara.hutool.core.comparator.CompareUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.text.StrJoiner;

2
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.bean;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.bean;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.reflect.ClassUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.classloader;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.reflect.ClassDescUtil;
import java.io.File;

2
hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.classloader;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.net.url.URLUtil;
import org.dromara.hutool.core.reflect.MethodUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.codec;
import org.dromara.hutool.core.codec.binary.Base16Codec;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ByteUtil;
import org.dromara.hutool.core.util.CharUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.codec;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.text.split.SplitUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.codec.binary;
import org.dromara.hutool.core.codec.Decoder;
import org.dromara.hutool.core.codec.Encoder;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.text.StrUtil;
/**

4
hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java
View File

@ -12,8 +12,8 @@
package org.dromara.hutool.core.codec.binary;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exceptions.ValidateException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.exception.ValidateException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

2
hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.codec.hash;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

2
hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java
View File

@ -24,7 +24,7 @@ import org.dromara.hutool.core.comparator.PinyinComparator;
import org.dromara.hutool.core.comparator.PropertyComparator;
import org.dromara.hutool.core.convert.CompositeConverter;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.func.SerBiConsumer;
import org.dromara.hutool.core.func.SerConsumer3;

2
hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.comparator;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.compress;
import org.dromara.hutool.core.exceptions.ValidateException;
import org.dromara.hutool.core.exception.ValidateException;
import java.util.zip.ZipEntry;

2
hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.compress;
import org.dromara.hutool.core.collection.iter.EnumerationIter;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileNameUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.convert;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.date;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
/**
* 克隆异常

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
/**
* 依赖异常

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
import org.dromara.hutool.core.map.MapUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/HutoolException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/NotInitedException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
/**
* 未初始化异常

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
/**
* 带有状态码的异常

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
/**
* 验证异常

2
hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java → hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java
View File

@ -16,4 +16,4 @@
* @author looly
*
*/
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;

2
hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.map.WeakConcurrentMap;

2
hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.func;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.map.WeakConcurrentMap;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -47,7 +47,7 @@ public interface SerBiConsumer<T, U> extends BiConsumer<T, U>, Serializable {
*
* @param t the first input argument
* @param u the second input argument
* @throws Exception wrapped checked exceptions for easy using
* @throws Exception wrapped checked exception for easy using
*/
void accepting(T t, U u) throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -36,7 +36,7 @@ public interface SerBiFunction<T, U, R> extends BiFunction<T, U, R>, Serializabl
* @param t the first function argument
* @param u the second function argument
* @return the function result
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
R applying(T t, U u) throws Exception;

8
hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -37,7 +37,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
* @param u the second input argument
* @return {@code true} if the input arguments match the predicate,
* otherwise {@code false}
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
boolean testing(T t, U u) throws Exception;
@ -65,7 +65,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
* predicate, if this predicate is {@code false}, then the {@code other}
* predicate is not evaluated.
*
* <p>Any exceptions thrown during evaluation of either predicate are relayed
* <p>Any exception thrown during evaluation of either predicate are relayed
* to the caller; if evaluation of this predicate throws an exception, the
* {@code other} predicate will not be evaluated.
*
@ -98,7 +98,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
* predicate, if this predicate is {@code true}, then the {@code other}
* predicate is not evaluated.
*
* <p>Any exceptions thrown during evaluation of either predicate are relayed
* <p>Any exception thrown during evaluation of either predicate are relayed
* to the caller; if evaluation of this predicate throws an exception, the
* {@code other} predicate will not be evaluated.
*

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Comparator;
@ -35,7 +35,7 @@ public interface SerBinaryOperator<T> extends BinaryOperator<T>, Serializable {
* @param t the first function argument
* @param u the second function argument
* @return the function result
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
T applying(T t, T u) throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -33,7 +33,7 @@ public interface SerConsumer<T> extends Consumer<T>, Serializable {
* Performs this operation on the given argument.
*
* @param t the input argument
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
void accepting(T t) throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -35,7 +35,7 @@ public interface SerConsumer3<P1, P2, P3> extends Serializable {
* @param p1 参数一
* @param p2 参数二
* @param p3 参数三
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
void accepting(P1 p1, P2 p2, P3 p3) throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.function.Function;
@ -33,7 +33,7 @@ public interface SerFunction<T, R> extends Function<T, R>, Serializable {
*
* @param t the function argument
* @return the function result
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
R applying(T t) throws Exception;

8
hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.Objects;
@ -35,7 +35,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
* @param t the input argument
* @return {@code true} if the input argument matches the predicate,
* otherwise {@code false}
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
boolean testing(T t) throws Exception;
@ -101,7 +101,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
* predicate, if this predicate is {@code false}, then the {@code other}
* predicate is not evaluated.
*
* <p>Any exceptions thrown during evaluation of either predicate are relayed
* <p>Any exception thrown during evaluation of either predicate are relayed
* to the caller; if evaluation of this predicate throws an exception, the
* {@code other} predicate will not be evaluated.
*
@ -134,7 +134,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
* predicate, if this predicate is {@code true}, then the {@code other}
* predicate is not evaluated.
*
* <p>Any exceptions thrown during evaluation of either predicate are relayed
* <p>Any exception thrown during evaluation of either predicate are relayed
* to the caller; if evaluation of this predicate throws an exception, the
* {@code other} predicate will not be evaluated.
*

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.stream.Stream;
@ -36,7 +36,7 @@ public interface SerRunnable extends Runnable, Serializable {
* The general contract of the method {@code run} is that it may
* take any action whatsoever.
*
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
* @see Thread#run()
*/
void running() throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.function.Supplier;
@ -32,7 +32,7 @@ public interface SerSupplier<R> extends Supplier<R>, Serializable {
* Gets a result.
*
* @return a result
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
R getting() throws Exception;

4
hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.func;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Serializable;
import java.util.function.Function;
@ -33,7 +33,7 @@ public interface SerUnaryOperator<T> extends UnaryOperator<T>, Serializable {
*
* @param t the function argument
* @return the function result
* @throws Exception wrapped checked exceptions
* @throws Exception wrapped checked exception
*/
T applying(T t) throws Exception;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.io;
import org.dromara.hutool.core.codec.HexUtil;
import org.dromara.hutool.core.collection.iter.LineIter;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.copy.FileChannelCopier;
import org.dromara.hutool.core.io.copy.ReaderWriterCopier;
import org.dromara.hutool.core.io.copy.StreamCopier;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
import java.io.ByteArrayInputStream;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io.file;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.func.SerConsumer;
import org.dromara.hutool.core.func.SerFunction;
import org.dromara.hutool.core.io.IORuntimeException;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.io.file;
import org.dromara.hutool.core.date.DateUnit;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.lang.Console;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io.resource;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io.stream;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.io.watch;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.lang;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.exceptions.ValidateException;
import org.dromara.hutool.core.exception.ValidateException;
import org.dromara.hutool.core.regex.PatternPool;
import org.dromara.hutool.core.regex.RegexPool;
import org.dromara.hutool.core.util.CharsetUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.lang.caller;
import java.io.Serializable;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
/**
* 通过StackTrace方式获取调用者。此方式效率最低，不推荐使用

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.lang.id;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.core.net.Ipv4Util;

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.lang.id;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.text.StrUtil;
import java.lang.management.ManagementFactory;

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.lang.tuple;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import java.io.Serializable;
import java.util.Objects;

2
hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.lang.tuple;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.collection.iter.ArrayIter;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import org.dromara.hutool.core.array.ArrayUtil;
import java.io.Serializable;

2
hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
View File

@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.bean.copier.CopyOptions;
import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.func.LambdaInfo;
import org.dromara.hutool.core.func.LambdaUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.net;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Singleton;
import java.math.BigInteger;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.net;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.net.InetAddress;
import java.net.NetworkInterface;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.net;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.iter.EnumerationIter;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.net.ssl;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.net.url;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.util.CharUtil;
import org.dromara.hutool.core.util.CharsetUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.net.url;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileNameUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.TripleTable;
import org.dromara.hutool.core.text.StrTrimer;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java
View File

@ -15,7 +15,7 @@ package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.bean.NullWrapperBean;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.convert.BasicType;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.net.url.URLDecoder;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.WeakConcurrentMap;
import org.dromara.hutool.core.reflect.lookup.LookupUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.annotation.Alias;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.map.WeakConcurrentMap;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.bean.NullWrapperBean;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.reflect.lookup.LookupUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java
View File

@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.NullWrapperBean;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.collection.set.UniqueKeySet;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.core.map.WeakConcurrentMap;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.reflect;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.lang.reflect.Field;
import java.lang.reflect.Member;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.reflect.lookup;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.caller.CallerUtil;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.ModifierUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.reflect.lookup;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;

2
hutool-core/src/main/java/org/dromara/hutool/core/spi/SPIException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.spi;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.text.placeholder;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.StrValidator;
import org.dromara.hutool.core.util.CharUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java
View File

@ -3,7 +3,7 @@ package org.dromara.hutool.core.text.placeholder;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.CharPool;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java
View File

@ -6,7 +6,7 @@ import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.func.LambdaUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.math.NumberUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.thread;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;

2
hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.thread;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import java.io.Closeable;
import java.util.LinkedHashSet;

2
hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.thread;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.util;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.map.MapUtil;
import javax.naming.InitialContext;

2
hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java
View File

@ -16,7 +16,7 @@ import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.iter.IterUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.SerializeUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.math.NumberUtil;

2
hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java
View File

@ -18,7 +18,7 @@ import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.date.DateField;
import org.dromara.hutool.core.date.DateTime;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.WeightRandom;
import org.dromara.hutool.core.lang.WeightRandom.WeightObj;

2
hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.core.util;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.lang.id.Pid;

2
hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java
View File

@ -15,7 +15,7 @@ package org.dromara.hutool.core.util;
import org.dromara.hutool.core.bean.BeanUtil;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;

2
hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java → hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java
View File

@ -1,4 +1,4 @@
package org.dromara.hutool.core.exceptions;
package org.dromara.hutool.core.exception;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.io.IORuntimeException;

2
hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java
View File

@ -1,6 +1,6 @@
package org.dromara.hutool.core.lang;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.thread.ThreadUtil;
import lombok.Data;
import org.junit.jupiter.api.Assertions;

2
hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java
View File

@ -1,7 +1,7 @@
package org.dromara.hutool.core.lang;
import org.dromara.hutool.core.collection.ConcurrentHashSet;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.id.IdUtil;
import org.dromara.hutool.core.lang.id.Snowflake;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java
View File

@ -1,7 +1,7 @@
package org.dromara.hutool.core.lang;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.exceptions.ValidateException;
import org.dromara.hutool.core.exception.ValidateException;
import org.dromara.hutool.core.lang.id.IdUtil;
import org.dromara.hutool.core.regex.PatternPool;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.spi;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

2
hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.core.spi;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

2
hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.text.placeholder.StrTemplate;
import org.dromara.hutool.core.text.placeholder.template.NamedPlaceholderStrTemplate;

2
hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java
View File

@ -1,6 +1,6 @@
package org.dromara.hutool.core.util;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.junit.jupiter.api.Assertions;

2
hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java
View File

@ -1,7 +1,7 @@
package org.dromara.hutool.core.util;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.junit.jupiter.api.Assertions;

2
hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java
View File

@ -3,7 +3,7 @@ package org.dromara.hutool.core.util;
import org.dromara.hutool.core.collection.ConcurrentHashSet;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.StopWatch;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.core.lang.id.IdUtil;
import org.dromara.hutool.core.lang.id.Snowflake;

2
hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.cron;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.io.resource.NoResourceException;
import org.dromara.hutool.cron.pattern.CronPattern;
import org.dromara.hutool.cron.task.Task;

2
hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
View File

@ -13,7 +13,7 @@
package org.dromara.hutool.cron.task;
import org.dromara.hutool.core.classloader.ClassLoaderUtil;
import org.dromara.hutool.core.exceptions.HutoolException;
import org.dromara.hutool.core.exception.HutoolException;
import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.MethodUtil;
import org.dromara.hutool.core.text.StrUtil;

2
hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.crypto;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.db;
import org.dromara.hutool.core.exceptions.ExceptionUtil;
import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.text.StrUtil;
/**

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.db.ds;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.func.Wrapper;

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
View File

@ -18,7 +18,7 @@ import org.dromara.hutool.db.DbRuntimeException;
import org.dromara.hutool.db.ds.AbstractDSFactory;
import org.dromara.hutool.db.ds.DSKeys;
import org.dromara.hutool.setting.Setting;
import org.dromara.hutool.setting.dialect.Props;
import org.dromara.hutool.setting.props.Props;
import com.mchange.v2.c3p0.ComboPooledDataSource;
import javax.sql.DataSource;

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
View File

@ -16,7 +16,7 @@ import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.db.ds.AbstractDSFactory;
import org.dromara.hutool.db.ds.DSKeys;
import org.dromara.hutool.setting.Setting;
import org.dromara.hutool.setting.dialect.Props;
import org.dromara.hutool.setting.props.Props;
import com.alibaba.druid.pool.DruidDataSource;
import javax.sql.DataSource;

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
View File

@ -16,7 +16,7 @@ import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.db.ds.AbstractDSFactory;
import org.dromara.hutool.db.ds.DSKeys;
import org.dromara.hutool.setting.Setting;
import org.dromara.hutool.setting.dialect.Props;
import org.dromara.hutool.setting.props.Props;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
View File

@ -14,7 +14,7 @@ package org.dromara.hutool.db.ds.pooled;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.setting.dialect.Props;
import org.dromara.hutool.setting.props.Props;
import java.sql.Connection;
import java.sql.DriverManager;

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
View File

@ -12,7 +12,7 @@
package org.dromara.hutool.db.ds.simple;
import org.dromara.hutool.core.exceptions.CloneException;
import org.dromara.hutool.core.exception.CloneException;
import javax.sql.DataSource;
import java.io.Closeable;

Some files were not shown because too many files have changed in this diff Show More