diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java b/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java index 47f8e199c..4ce1b08aa 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/config/SettingConfigParser.java @@ -49,7 +49,17 @@ public class SettingConfigParser implements ConfigParser { * @return SettingConfigParser */ public static SettingConfigParser of() { - return new SettingConfigParser(null); + return of(null); + } + + /** + * 创建默认配置解析器 + * + * @param setting 配置文件 + * @return SettingConfigParser + */ + public static SettingConfigParser of(final Setting setting) { + return new SettingConfigParser(setting); } private final Setting setting; @@ -128,7 +138,7 @@ public class SettingConfigParser implements ConfigParser { // SQL日志 final SqlLogFilter sqlLogFilter = getSqlLogFilter(setting); - if(null != sqlLogFilter){ + if (null != sqlLogFilter) { dbConfig.addSqlFilter(sqlLogFilter); } @@ -173,7 +183,7 @@ public class SettingConfigParser implements ConfigParser { private static SqlLogFilter getSqlLogFilter(final Setting setting) { // 初始化SQL显示 final boolean isShowSql = Convert.toBoolean(setting.remove(DSKeys.KEY_SHOW_SQL), false); - if(!isShowSql){ + if (!isShowSql) { return null; } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java index fb2f721ce..ecedde366 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSPool.java @@ -16,7 +16,6 @@ import org.dromara.hutool.core.io.IoUtil; import org.dromara.hutool.core.lang.Singleton; import org.dromara.hutool.core.map.MapUtil; import org.dromara.hutool.core.map.SafeConcurrentHashMap; -import org.dromara.hutool.core.spi.SpiUtil; import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.db.config.ConfigParser; import org.dromara.hutool.db.config.DbConfig; diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java index 1eeafec2c..9b1a95fc1 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Order.java @@ -12,10 +12,10 @@ package org.dromara.hutool.db.sql; -import java.io.Serializable; - import org.dromara.hutool.core.text.StrUtil; +import java.io.Serializable; + /** * SQL排序对象 * @author Looly @@ -30,6 +30,9 @@ public class Order implements Serializable{ private Direction direction; //---------------------------------------------------------- Constructor start + /** + * 构造 + */ public Order() { } diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java index 07f3fb14a..e1353faee 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/IssueI8UTGPTest.java @@ -2,6 +2,7 @@ package org.dromara.hutool.db; import org.dromara.hutool.core.lang.Console; import org.dromara.hutool.db.config.DbConfig; +import org.dromara.hutool.db.config.SettingConfigParser; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -28,4 +29,22 @@ public class IssueI8UTGPTest { Assertions.assertTrue(isFilterValid.get()); } + + @Test + void customSqlLogTest2() { + final AtomicBoolean isFilterValid = new AtomicBoolean(false); + + final DbConfig dbConfig = SettingConfigParser.of().parse("test"); + dbConfig.addSqlFilter((conn, boundSql, returnGeneratedKey) -> { + isFilterValid.set(true); + Console.log("Custom log: {}", boundSql.getSql()); + }); + + final Db db = Db.of(dbConfig); + + final List find = db.query("select * from user where age = ?", 18); + Assertions.assertEquals("王五", find.get(0).get("name")); + + Assertions.assertTrue(isFilterValid.get()); + } }