From e23e609c2fc0a64e76be9966fbfc6efd53b4569b Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Sun, 23 Apr 2023 12:45:16 +0800
Subject: [PATCH] fix code

---
 .../hutool/db/ds/c3p0/C3p0DSFactory.java      |  2 +-
 .../hutool/db/ds/druid/DruidDSFactory.java    |  2 +-
 .../hutool/db/ds/hikari/HikariDSFactory.java  |  2 +-
 .../hutool/db/ds/pooled/PooledConnection.java |  2 +-
 .../hutool/db/ds/simple/SimpleDataSource.java |  2 +-
 .../hutool/db/ds/tomcat/TomcatDSFactory.java  |  2 +-
 .../org/dromara/hutool/setting/Setting.java   |  2 +-
 .../hutool/setting/SettingException.java      | 57 +++++++++++++++----
 .../setting/{dialect => props}/Props.java     |  2 +-
 .../setting/{dialect => props}/PropsUtil.java |  2 +-
 .../{dialect => props}/package-info.java      |  2 +-
 .../dromara/hutool/setting/Issue3008Test.java |  4 +-
 .../org/dromara/hutool/setting/PropsTest.java |  2 +-
 .../dromara/hutool/setting/PropsUtilTest.java |  2 +-
 14 files changed, 61 insertions(+), 24 deletions(-)
 rename hutool-setting/src/main/java/org/dromara/hutool/setting/{dialect => props}/Props.java (99%)
 rename hutool-setting/src/main/java/org/dromara/hutool/setting/{dialect => props}/PropsUtil.java (98%)
 rename hutool-setting/src/main/java/org/dromara/hutool/setting/{dialect => props}/package-info.java (93%)

diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
index a0f3e68b5..201389fc6 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
@@ -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;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
index 9cb247686..8d6c44264 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
@@ -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;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
index 4d17c8122..45a1fcefe 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
@@ -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;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
index 3706d68bf..6285478d0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
@@ -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;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
index 5a4bff82a..9515d2fbf 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
@@ -18,7 +18,7 @@ import org.dromara.hutool.db.DbRuntimeException;
 import org.dromara.hutool.db.dialect.DriverUtil;
 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 java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
index f1a5f9574..b1527d9e5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
@@ -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 org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
 
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
index 60204723d..a6973f92d 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
@@ -28,7 +28,7 @@ import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.util.CharUtil;
 import org.dromara.hutool.core.util.CharsetUtil;
 import org.dromara.hutool.log.StaticLog;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 
 import java.io.File;
 import java.net.URL;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
index f9ba20306..f3456751c 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
@@ -12,37 +12,74 @@
 
 package org.dromara.hutool.setting;
 
-import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exceptions.HutoolException;
 
 /**
  * 设置异常
  *
- * @author xiaoleilu
+ * @author looly
  */
-public class SettingException extends RuntimeException {
+public class SettingException extends HutoolException {
 	private static final long serialVersionUID = 7941096116780378387L;
 
+	/**
+	 * 构造
+	 *
+	 * @param e 异常
+	 */
 	public SettingException(final Throwable e) {
 		super(e);
 	}
 
+	/**
+	 * 构造
+	 *
+	 * @param message 消息
+	 */
 	public SettingException(final String message) {
 		super(message);
 	}
 
+	/**
+	 * 构造
+	 *
+	 * @param messageTemplate 消息模板
+	 * @param params          参数
+	 */
 	public SettingException(final String messageTemplate, final Object... params) {
-		super(StrUtil.format(messageTemplate, params));
+		super(messageTemplate, params);
 	}
 
-	public SettingException(final String message, final Throwable throwable) {
-		super(message, throwable);
+	/**
+	 * 构造
+	 *
+	 * @param message 消息
+	 * @param cause   被包装的子异常
+	 */
+	public SettingException(final String message, final Throwable cause) {
+		super(message, cause);
 	}
 
-	public SettingException(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 SettingException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
 	}
 
-	public SettingException(final Throwable throwable, final String messageTemplate, final Object... params) {
-		super(StrUtil.format(messageTemplate, params), throwable);
+	/**
+	 * 构造
+	 *
+	 * @param cause           被包装的子异常
+	 * @param messageTemplate 消息模板
+	 * @param params          参数
+	 */
+	public SettingException(final Throwable cause, final String messageTemplate, final Object... params) {
+		super(cause, messageTemplate, params);
 	}
 }
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
similarity index 99%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
index 23c7673ac..ded42cc4f 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
 
 import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
similarity index 98%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
index 39def155a..6b2a84825 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
 
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.resource.NoResourceException;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
similarity index 93%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
index 348356173..843461fe8 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
index eb9f27f08..3bbffd161 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
@@ -1,8 +1,8 @@
 package org.dromara.hutool.setting;
 
 import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.setting.dialect.Props;
-import org.dromara.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.setting.props.Props;
+import org.dromara.hutool.setting.props.PropsUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
index 64cc73597..2ae0b31d2 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.setting;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
index 088cc4c22..aee292c8e 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
@@ -1,6 +1,6 @@
 package org.dromara.hutool.setting;
 
-import org.dromara.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.setting.props.PropsUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;