From b9417a41141f4e01fb404eb141d0eec97f0f241d Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 9 Jan 2023 18:01:48 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/core/convert/Convert.java | 6 +++--- .../java/cn/hutool/core/convert/ConvertToBooleanTest.java | 6 +++--- hutool-db/src/main/java/cn/hutool/db/DbUtil.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java index 6785f406c..abcc4eb32 100755 --- a/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/Convert.java @@ -377,7 +377,7 @@ public class Convert { * @param defaultValue 转换错误时的默认值 * @return 结果 */ - public static Boolean toBool(final Object value, final Boolean defaultValue) { + public static Boolean toBoolean(final Object value, final Boolean defaultValue) { return convertQuietly(Boolean.class, value, defaultValue); } @@ -389,8 +389,8 @@ public class Convert { * @param value 被转换的值 * @return 结果 */ - public static Boolean toBool(final Object value) { - return toBool(value, null); + public static Boolean toBoolean(final Object value) { + return toBoolean(value, null); } /** diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java index c36d32b43..75aa3c1cf 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java @@ -8,17 +8,17 @@ public class ConvertToBooleanTest { @Test public void intToBooleanTest() { final int a = 100; - final Boolean aBoolean = Convert.toBool(a); + final Boolean aBoolean = Convert.toBoolean(a); Assert.assertTrue(aBoolean); final int b = 0; - final Boolean bBoolean = Convert.toBool(b); + final Boolean bBoolean = Convert.toBoolean(b); Assert.assertFalse(bBoolean); } @Test public void issueI65P8ATest() { - final Boolean bool = Convert.toBool("", Boolean.TRUE); + final Boolean bool = Convert.toBoolean("", Boolean.TRUE); Assert.assertFalse(bool); } diff --git a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java index 5091a641f..2c29c8bc8 100644 --- a/hutool-db/src/main/java/cn/hutool/db/DbUtil.java +++ b/hutool-db/src/main/java/cn/hutool/db/DbUtil.java @@ -108,9 +108,9 @@ public final class DbUtil { */ public static void setShowSqlGlobal(final Setting setting) { // 初始化SQL显示 - final boolean isShowSql = Convert.toBool(setting.remove(SqlLog.KEY_SHOW_SQL), false); - final boolean isFormatSql = Convert.toBool(setting.remove(SqlLog.KEY_FORMAT_SQL), false); - final boolean isShowParams = Convert.toBool(setting.remove(SqlLog.KEY_SHOW_PARAMS), false); + final boolean isShowSql = Convert.toBoolean(setting.remove(SqlLog.KEY_SHOW_SQL), false); + final boolean isFormatSql = Convert.toBoolean(setting.remove(SqlLog.KEY_FORMAT_SQL), false); + final boolean isShowParams = Convert.toBoolean(setting.remove(SqlLog.KEY_SHOW_PARAMS), false); String sqlLevelStr = setting.remove(SqlLog.KEY_SQL_LEVEL); if (null != sqlLevelStr) { sqlLevelStr = sqlLevelStr.toUpperCase();