diff --git a/CHANGELOG.md b/CHANGELOG.md index 999fdb060..b018c2af1 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,12 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.22(2023-08-07) +# 5.8.22(2023-08-08) ### 🐣新特性 * 【core 】 NumberUtil.nullToZero增加重载（issue#I7PPD2@Gitee） * 【core 】 DesensitizedUtil增加清空策略（issue#I7PUJ2@Gitee） +* 【all 】 修改异常包装策略：运行时异常不包装，只包装非运行时异常（issue#I7RJZT@Gitee） ### 🐞Bug修复 * 【core 】 修复NumberUtil.toBigDecimal转换科学计数法问题（issue#3241@Github） diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java index 60de71688..4ea05b1ff 100755 --- a/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java +++ b/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java @@ -2,6 +2,7 @@ package cn.hutool.cache.impl; import cn.hutool.cache.Cache; import cn.hutool.cache.CacheListener; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutableObj; @@ -120,7 +121,9 @@ public abstract class AbstractCache implements Cache { try { v = supplier.call(); } catch (Exception e) { - throw new RuntimeException(e); + // issue#I7RJZT 运行时异常不做包装 + throw ExceptionUtil.wrapRuntime(e); + //throw new RuntimeException(e); } put(key, v, this.timeout); } else { diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java index 02b8173e4..553efd5e2 100755 --- a/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java +++ b/hutool-cache/src/main/java/cn/hutool/cache/impl/NoCache.java @@ -1,6 +1,7 @@ package cn.hutool.cache.impl; import cn.hutool.cache.Cache; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.func.Func0; import java.util.Iterator; @@ -60,7 +61,7 @@ public class NoCache implements Cache { try { return (null == supplier) ? null : supplier.call(); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java index f4be5f642..7f7ec6ddf 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/IoUtil.java @@ -531,7 +531,7 @@ public class IoUtil extends NioUtil { int i = in.available(); return readHex(in, Math.min(8192, in.available()), false); } catch (IOException e) { - throw new RuntimeException(e); + throw new IORuntimeException(e); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java index 927cf2b25..1a118de2f 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java @@ -2,6 +2,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.EnumerationIter; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.resource.ResourceUtil; @@ -398,7 +399,7 @@ public class ClassScanner implements Serializable { classesOfLoadError.add(className); } catch (Throwable e) { if (false == this.ignoreLoadError) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } else { classesOfLoadError.add(className); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java b/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java index e4365d87c..67e9781b9 100755 --- a/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/SimpleCache.java @@ -1,6 +1,7 @@ package cn.hutool.core.lang; import cn.hutool.core.collection.TransIter; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.func.Func0; import cn.hutool.core.lang.mutable.Mutable; import cn.hutool.core.lang.mutable.MutableObj; @@ -110,7 +111,7 @@ public class SimpleCache implements Iterable>, Serializabl try { v = supplier.call(); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } put(key, v); } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func.java index 8f164dcc9..bb1391634 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -37,7 +39,7 @@ public interface Func extends Serializable { try { return call(parameters); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func0.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func0.java index ae7216eca..15515887e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func0.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func0.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -33,7 +35,7 @@ public interface Func0 extends Serializable { try { return call(); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func1.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func1.java index 303af0920..6560aed4e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/Func1.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/Func1.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -37,7 +39,7 @@ public interface Func1 extends Serializable { try { return call(parameter); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc.java index 9caa90287..313f409ff 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -35,7 +37,7 @@ public interface VoidFunc

extends Serializable { try { call(parameters); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc0.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc0.java index f96ad21ec..d31b6ef2d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc0.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc0.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -31,7 +33,7 @@ public interface VoidFunc0 extends Serializable { try { call(); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc1.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc1.java index 48f87bfc1..de9cd0667 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc1.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/VoidFunc1.java @@ -1,5 +1,7 @@ package cn.hutool.core.lang.func; +import cn.hutool.core.exceptions.ExceptionUtil; + import java.io.Serializable; /** @@ -33,7 +35,7 @@ public interface VoidFunc1

extends Serializable { try { call(parameter); } catch (Exception e) { - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } } } diff --git a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java index fe9a6dde0..08e4a229a 100755 --- a/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java +++ b/hutool-db/src/main/java/cn/hutool/db/sql/SqlExecutor.java @@ -1,6 +1,7 @@ package cn.hutool.db.sql; import cn.hutool.core.collection.ArrayIter; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.lang.func.Func1; import cn.hutool.db.DbUtil; import cn.hutool.db.StatementUtil; @@ -299,7 +300,7 @@ public class SqlExecutor { if(e instanceof SQLException){ throw (SQLException) e; } - throw new RuntimeException(e); + throw ExceptionUtil.wrapRuntime(e); } finally { DbUtil.close(ps); } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java index 63c55947a..760cf6829 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java @@ -1,6 +1,7 @@ package cn.hutool.extra.ftp; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Console; import cn.hutool.extra.ssh.Sftp; @@ -108,7 +109,7 @@ public class FtpTest { } } } catch (final IOException e) { - throw new RuntimeException(e); + throw new IORuntimeException(e); } } diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java index 9e661e497..31c1b5286 100644 --- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java +++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java @@ -1,5 +1,6 @@ package cn.hutool.poi.excel; +import cn.hutool.core.io.IORuntimeException; import cn.hutool.poi.excel.cell.CellUtil; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -42,7 +43,7 @@ public class IssueI6MBS5Test { CellUtil.setComment(cell, "commonText", "ascend", null); workbook.write(Files.newOutputStream(file.toPath())); } catch (final IOException e) { - throw new RuntimeException(e); + throw new IORuntimeException(e); } } }