From 4d0074e6a65757a4d6c21b50da5e46f2fb17e907 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 18 Aug 2025 10:26:27 +0800 Subject: [PATCH] fix code --- .../main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java | 8 +++++--- .../main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java | 4 +++- .../java/cn/hutool/v7/db/dialect/impl/HanaDialect.java | 2 ++ .../java/cn/hutool/v7/db/dialect/impl/OracleDialect.java | 3 +++ .../java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java | 2 ++ .../cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java | 4 +++- .../hutool/v7/db/dialect/impl/SqlServer2005Dialect.java | 3 +++ .../hutool/v7/db/dialect/impl/SqlServer2012Dialect.java | 3 +++ .../java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java | 3 +++ 9 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java index 354c2185e..e9ea76a02 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/DmDialect.java @@ -24,6 +24,7 @@ import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.SqlBuilder; import cn.hutool.v7.db.sql.StatementUtil; +import java.io.Serial; import java.sql.Connection; import java.sql.PreparedStatement; import java.util.Arrays; @@ -35,6 +36,7 @@ import java.util.List; * @author wb04307201 */ public class DmDialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 3415348435502927423L; /** @@ -78,7 +80,7 @@ public class DmDialect extends AnsiSqlDialect { // 构建字段部分和参数占位符部分 entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field) && keyList.contains(field)) { - if (keyFieldsPart.length() > 0) { + if (!keyFieldsPart.isEmpty()) { keyFieldsPart.append(" and "); } keyFieldsPart.append(field).append("= ?"); @@ -88,7 +90,7 @@ public class DmDialect extends AnsiSqlDialect { entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field) && !keyList.contains(field)) { - if (updateFieldsPart.length() > 0) { + if (!updateFieldsPart.isEmpty()) { // 非第一个参数，追加逗号 updateFieldsPart.append(", "); } @@ -99,7 +101,7 @@ public class DmDialect extends AnsiSqlDialect { entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field)) { - if (insertFieldsPart.length() > 0) { + if (!insertFieldsPart.isEmpty()) { // 非第一个参数，追加逗号 insertFieldsPart.append(", "); insertPlaceHolder.append(", "); diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java index e65298908..bb1a6e163 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/H2Dialect.java @@ -26,6 +26,7 @@ import cn.hutool.v7.db.config.DbConfig; import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.SqlBuilder; +import java.io.Serial; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,6 +36,7 @@ import java.sql.PreparedStatement; * @author loolly */ public class H2Dialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 1490520247974768214L; /** @@ -70,7 +72,7 @@ public class H2Dialect extends AnsiSqlDialect { // 构建字段部分和参数占位符部分 entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field)) { - if (fieldsPart.length() > 0) { + if (!fieldsPart.isEmpty()) { // 非第一个参数，追加逗号 fieldsPart.append(", "); placeHolder.append(", "); diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java index f5130ac75..d06b006fb 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/HanaDialect.java @@ -25,6 +25,7 @@ import cn.hutool.v7.db.sql.QuoteWrapper; import cn.hutool.v7.db.sql.SqlBuilder; import cn.hutool.v7.db.sql.StatementUtil; +import java.io.Serial; import java.sql.Connection; import java.sql.PreparedStatement; import java.util.ArrayList; @@ -37,6 +38,7 @@ import java.util.List; * @author daoyou.dev */ public class HanaDialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java index fd40ca0db..7fa45a3fe 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/OracleDialect.java @@ -23,12 +23,15 @@ import cn.hutool.v7.db.config.DbConfig; import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.SqlBuilder; +import java.io.Serial; + /** * Oracle 方言 * * @author loolly */ public class OracleDialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 6122761762247483015L; private static final String DEFAULT_TABLE_ALIAS = "table_alias_"; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java index 20c1e9e75..55c6967f1 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PhoenixDialect.java @@ -22,6 +22,7 @@ import cn.hutool.v7.db.config.DbConfig; import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.Query; +import java.io.Serial; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,6 +33,7 @@ import java.sql.PreparedStatement; * @since 5.7.2 */ public class PhoenixDialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java index 5a0cc1bcc..95632ff46 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/PostgresqlDialect.java @@ -27,6 +27,7 @@ import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.QuoteWrapper; import cn.hutool.v7.db.sql.SqlBuilder; +import java.io.Serial; import java.sql.Connection; import java.sql.PreparedStatement; @@ -37,6 +38,7 @@ import java.sql.PreparedStatement; * @author loolly */ public class PostgresqlDialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 3889210427543389642L; /** @@ -66,7 +68,7 @@ public class PostgresqlDialect extends AnsiSqlDialect { // 构建字段部分和参数占位符部分 entity.forEach((field, value) -> { if (StrUtil.isNotBlank(field)) { - if (fieldsPart.length() > 0) { + if (!fieldsPart.isEmpty()) { // 非第一个参数，追加逗号 fieldsPart.append(", "); placeHolder.append(", "); diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java index 67b30a405..2f38966db 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2005Dialect.java @@ -24,6 +24,8 @@ import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.QuoteWrapper; import cn.hutool.v7.db.sql.SqlBuilder; +import java.io.Serial; + /** * SQLServer2005-2008方言实现
* 参考：jdbc-plus @@ -31,6 +33,7 @@ import cn.hutool.v7.db.sql.SqlBuilder; * @author niliwei, Looly */ public class SqlServer2005Dialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = 1L; private static final String DEFAULT_TABLE_ALIAS = "table_alias_"; diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java index 7dc6154a5..be10e6083 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/SqlServer2012Dialect.java @@ -23,12 +23,15 @@ import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.SqlBuilder; import cn.hutool.v7.db.sql.QuoteWrapper; +import java.io.Serial; + /** * SQLServer2012 方言 * * @author Looly */ public class SqlServer2012Dialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = -37598166015777797L; /** diff --git a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java index 3d5348065..774c4c8b5 100644 --- a/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java +++ b/hutool-db/src/main/java/cn/hutool/v7/db/dialect/impl/Sqlite3Dialect.java @@ -20,12 +20,15 @@ import cn.hutool.v7.db.config.DbConfig; import cn.hutool.v7.db.dialect.DialectName; import cn.hutool.v7.db.sql.QuoteWrapper; +import java.io.Serial; + /** * SqlLite3方言 * * @author Looly */ public class Sqlite3Dialect extends AnsiSqlDialect { + @Serial private static final long serialVersionUID = -3527642408849291634L; /**