From bd97a73cb9c6a701b1eb70f94bfd6eb4e989db83 Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 25 Apr 2023 11:03:28 +0800 Subject: [PATCH] fix code --- .../hutool/core/bean/BeanException.java | 59 ++++++++++++++++--- .../core/comparator/ComparatorException.java | 59 ++++++++++++++++--- .../hutool/core/convert/ConvertException.java | 57 +++++++++++++++--- .../dromara/hutool/cron/CronException.java | 57 +++++++++++++++--- .../extra/compress/CompressException.java | 58 ++++++++++++++---- 5 files changed, 246 insertions(+), 44 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java index 256134e0a..08c21ea71 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java @@ -12,33 +12,74 @@ package org.dromara.hutool.core.bean; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exception.HutoolException; /** * Bean异常 + * * @author xiaoleilu */ -public class BeanException extends RuntimeException{ +public class BeanException extends HutoolException { private static final long serialVersionUID = -8096998667745023423L; + /** + * 构造 + * + * @param e 异常 + */ public BeanException(final Throwable e) { - super(ExceptionUtil.getMessage(e), e); + super(e); } + /** + * 构造 + * + * @param message 消息 + */ public BeanException(final String message) { super(message); } + /** + * 构造 + * + * @param messageTemplate 消息模板 + * @param params 参数 + */ public BeanException(final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params)); + super(messageTemplate, params); } - public BeanException(final String message, final Throwable throwable) { - super(message, throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + */ + public BeanException(final String message, final Throwable cause) { + super(message, cause); } - public BeanException(final Throwable throwable, final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + * @param enableSuppression 是否启用抑制 + * @param writableStackTrace 堆栈跟踪是否应该是可写的 + */ + public BeanException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + /** + * 构造 + * + * @param cause 被包装的子异常 + * @param messageTemplate 消息模板 + * @param params 参数 + */ + public BeanException(final Throwable cause, final String messageTemplate, final Object... params) { + super(cause, messageTemplate, params); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java index 048e98ed4..f06c9937d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java @@ -12,33 +12,74 @@ package org.dromara.hutool.core.comparator; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exception.HutoolException; /** * 比较异常 + * * @author xiaoleilu */ -public class ComparatorException extends RuntimeException{ +public class ComparatorException extends HutoolException { private static final long serialVersionUID = 4475602435485521971L; + /** + * 构造 + * + * @param e 异常 + */ public ComparatorException(final Throwable e) { - super(ExceptionUtil.getMessage(e), e); + super(e); } + /** + * 构造 + * + * @param message 消息 + */ public ComparatorException(final String message) { super(message); } + /** + * 构造 + * + * @param messageTemplate 消息模板 + * @param params 参数 + */ public ComparatorException(final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params)); + super(messageTemplate, params); } - public ComparatorException(final String message, final Throwable throwable) { - super(message, throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + */ + public ComparatorException(final String message, final Throwable cause) { + super(message, cause); } - public ComparatorException(final Throwable throwable, final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + * @param enableSuppression 是否启用抑制 + * @param writableStackTrace 堆栈跟踪是否应该是可写的 + */ + public ComparatorException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + /** + * 构造 + * + * @param cause 被包装的子异常 + * @param messageTemplate 消息模板 + * @param params 参数 + */ + public ComparatorException(final Throwable cause, final String messageTemplate, final Object... params) { + super(cause, messageTemplate, params); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java index a6d63c06b..85dfb539a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java @@ -13,32 +13,75 @@ package org.dromara.hutool.core.convert; import org.dromara.hutool.core.exception.ExceptionUtil; +import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.text.StrUtil; /** * 转换异常 + * * @author xiaoleilu */ -public class ConvertException extends RuntimeException{ +public class ConvertException extends HutoolException { private static final long serialVersionUID = 4730597402855274362L; + /** + * 构造 + * + * @param e 异常 + */ public ConvertException(final Throwable e) { - super(ExceptionUtil.getMessage(e), e); + super(e); } + /** + * 构造 + * + * @param message 消息 + */ public ConvertException(final String message) { super(message); } + /** + * 构造 + * + * @param messageTemplate 消息模板 + * @param params 参数 + */ public ConvertException(final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params)); + super(messageTemplate, params); } - public ConvertException(final String message, final Throwable throwable) { - super(message, throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + */ + public ConvertException(final String message, final Throwable cause) { + super(message, cause); } - public ConvertException(final Throwable throwable, final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + * @param enableSuppression 是否启用抑制 + * @param writableStackTrace 堆栈跟踪是否应该是可写的 + */ + public ConvertException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + /** + * 构造 + * + * @param cause 被包装的子异常 + * @param messageTemplate 消息模板 + * @param params 参数 + */ + public ConvertException(final Throwable cause, final String messageTemplate, final Object... params) { + super(cause, messageTemplate, params); } } diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java index 718aece2b..c271df179 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronException.java @@ -12,33 +12,74 @@ package org.dromara.hutool.cron; -import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exception.HutoolException; /** * 定时任务异常 * * @author xiaoleilu */ -public class CronException extends RuntimeException { +public class CronException extends HutoolException { private static final long serialVersionUID = 1L; + /** + * 构造 + * + * @param e 异常 + */ public CronException(final Throwable e) { - super(e.getMessage(), e); + super(e); } + /** + * 构造 + * + * @param message 消息 + */ public CronException(final String message) { super(message); } + /** + * 构造 + * + * @param messageTemplate 消息模板 + * @param params 参数 + */ public CronException(final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params)); + super(messageTemplate, params); } - public CronException(final String message, final Throwable throwable, final boolean enableSuppression, final boolean writableStackTrace) { - super(message, throwable, enableSuppression, writableStackTrace); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + */ + public CronException(final String message, final Throwable cause) { + super(message, cause); } - public CronException(final Throwable throwable, final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + * @param enableSuppression 是否启用抑制 + * @param writableStackTrace 堆栈跟踪是否应该是可写的 + */ + public CronException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + /** + * 构造 + * + * @param cause 被包装的子异常 + * @param messageTemplate 消息模板 + * @param params 参数 + */ + public CronException(final Throwable cause, final String messageTemplate, final Object... params) { + super(cause, messageTemplate, params); } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java index 1a748be22..9bc49a29d 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java @@ -12,38 +12,74 @@ package org.dromara.hutool.extra.compress; -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.exception.HutoolException; /** * 压缩解压异常语言异常 * * @author Looly */ -public class CompressException extends RuntimeException { +public class CompressException extends HutoolException { private static final long serialVersionUID = 1L; + /** + * 构造 + * + * @param e 异常 + */ public CompressException(final Throwable e) { - super(ExceptionUtil.getMessage(e), e); + super(e); } + /** + * 构造 + * + * @param message 消息 + */ public CompressException(final String message) { super(message); } + /** + * 构造 + * + * @param messageTemplate 消息模板 + * @param params 参数 + */ public CompressException(final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params)); + super(messageTemplate, params); } - public CompressException(final String message, final Throwable throwable) { - super(message, throwable); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + */ + public CompressException(final String message, final Throwable cause) { + super(message, cause); } - public CompressException(final String message, final Throwable throwable, final boolean enableSuppression, final boolean writableStackTrace) { - super(message, throwable, enableSuppression, writableStackTrace); + /** + * 构造 + * + * @param message 消息 + * @param cause 被包装的子异常 + * @param enableSuppression 是否启用抑制 + * @param writableStackTrace 堆栈跟踪是否应该是可写的 + */ + public CompressException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); } - public CompressException(final Throwable throwable, final String messageTemplate, final Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); + /** + * 构造 + * + * @param cause 被包装的子异常 + * @param messageTemplate 消息模板 + * @param params 参数 + */ + public CompressException(final Throwable cause, final String messageTemplate, final Object... params) { + super(cause, messageTemplate, params); } }