From 11cae3ee4fb3470af106558561a60202f43d53c1 Mon Sep 17 00:00:00 2001 From: Yeikel Date: Sat, 16 Apr 2022 21:51:45 +0000 Subject: [PATCH] refactor: Use `Collections#isEmpty()` instead of comparing `size()` Co-authored-by: Moderne --- .../handler/MySqlMockExecuteHandlerImpl.java | 2 +- .../druid/pool/DruidAbstractDataSource.java | 4 ++-- .../com/alibaba/druid/sql/PagerUtils.java | 6 +++--- .../alibaba/druid/sql/SQLTransformUtils.java | 20 +++++++++---------- .../java/com/alibaba/druid/sql/SQLUtils.java | 4 ++-- .../druid/sql/ast/expr/SQLBinaryOpExpr.java | 2 +- .../sql/ast/expr/SQLBinaryOpExprGroup.java | 2 +- .../statement/SQLAnalyzeTableStatement.java | 4 ++-- .../statement/SQLCreateTableStatement.java | 8 ++++---- .../sql/ast/statement/SQLDeleteStatement.java | 2 +- .../sql/ast/statement/SQLInsertInto.java | 4 ++-- .../druid/sql/ast/statement/SQLSelect.java | 4 ++-- .../ast/statement/SQLSelectQueryBlock.java | 4 ++-- .../sql/ast/statement/SQLUnionQuery.java | 6 +++--- .../sql/ast/statement/SQLUpdateStatement.java | 2 +- .../builder/impl/SQLDeleteBuilderImpl.java | 2 +- .../builder/impl/SQLSelectBuilderImpl.java | 2 +- .../builder/impl/SQLUpdateBuilderImpl.java | 2 +- .../db2/parser/DB2StatementParser.java | 2 +- .../dialect/h2/visitor/H2OutputVisitor.java | 2 +- .../ast/statement/MySqlKillStatement.java | 2 +- .../mysql/parser/MySqlStatementParser.java | 4 ++-- .../mysql/visitor/MySqlOutputVisitor.java | 16 +++++++-------- .../oracle/parser/OracleStatementParser.java | 2 +- .../ast/stmt/PGInsertStatement.java | 4 ++-- .../parser/PGSQLStatementParser.java | 2 +- .../postgresql/visitor/PGOutputVisitor.java | 2 +- .../visitor/SQLServerOutputVisitor.java | 2 +- .../druid/sql/parser/SQLSelectParser.java | 8 ++++---- .../ParameterizedOutputVisitorUtils.java | 2 +- .../sql/visitor/SQLASTOutputVisitor.java | 20 +++++++++---------- .../sql/visitor/SQLDataTypeValidator.java | 4 ++-- .../druid/sql/visitor/functions/Ascii.java | 2 +- .../druid/sql/visitor/functions/Char.java | 2 +- .../druid/sql/visitor/functions/If.java | 2 +- .../druid/sql/visitor/functions/Isnull.java | 2 +- .../visitor/functions/OneParamFunctions.java | 2 +- .../druid/sql/visitor/functions/ToDate.java | 2 +- .../calcite/CalciteMySqlNodeVisitor.java | 2 +- .../druid/support/console/DruidStat.java | 2 +- .../druid/support/http/ResourceServlet.java | 2 +- .../monitor/dao/MonitorDaoJdbcImpl.java | 2 +- .../support/opds/udf/ExportConditions.java | 2 +- .../druid/support/opds/udf/SqlTypeUDF.java | 2 +- .../com/alibaba/druid/bvt/bug/Issue1759.java | 2 +- .../bvt/filter/wall/WallUpdateCheckTest.java | 8 ++++---- ...Test_Limit_mysql_question_placeholder.java | 2 +- .../druid/bvt/sql/mysql/DropTableTest.java | 2 +- .../bvt/sql/odps/OdpsListResourcesTest.java | 2 +- .../bvt/sql/postgresql/DropTableTest.java | 2 +- .../bvt/sql/postgresql/PGDeleteTest2.java | 2 +- .../bvt/sql/postgresql/PGDeleteTest7.java | 2 +- .../bvt/sql/postgresql/TruncateTest.java | 6 +++--- .../ddl/PGAlterTableDropConstraint.java | 2 +- .../ddl/PGAlterTableRenameTest.java | 2 +- .../ddl/PGDropTableIfExistsTest.java | 2 +- .../bvt/sql/postgresql/ddl/PGGrantTest0.java | 2 +- .../bvt/sql/postgresql/ddl/PGRovokeTest0.java | 2 +- .../com/alibaba/druid/sql/TestMigrate.java | 2 +- .../com/alibaba/druid/sql/TestTransform.java | 2 +- .../druid/sql/parser/SQLMergeTest.java | 4 ++-- .../alibaba/druid/test/wall/PGWallTest.java | 2 +- 62 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java index 576915e276..f8e0cc0a01 100644 --- a/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java +++ b/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java @@ -60,7 +60,7 @@ public class MySqlMockExecuteHandlerImpl implements MockExecuteHandler { throw new SQLException("not support multi-statment. " + sql); } - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new SQLException("executeQueryError : " + sql); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 3dc600d128..909b1bf4af 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1663,7 +1663,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements public Connection createPhysicalConnection(String url, Properties info) throws SQLException { Connection conn; - if (getProxyFilters().size() == 0) { + if (getProxyFilters().isEmpty()) { conn = getDriver().connect(url, info); } else { conn = new FilterChainImpl(this).connection_connect(info); @@ -1847,7 +1847,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } Collection initSqls = getConnectionInitSqls(); - if (initSqls.size() == 0 + if (initSqls.isEmpty() && variables == null && globalVariables == null) { return; diff --git a/src/main/java/com/alibaba/druid/sql/PagerUtils.java b/src/main/java/com/alibaba/druid/sql/PagerUtils.java index 07f35aa94b..527f458115 100644 --- a/src/main/java/com/alibaba/druid/sql/PagerUtils.java +++ b/src/main/java/com/alibaba/druid/sql/PagerUtils.java @@ -675,7 +675,7 @@ public class PagerUtils { SQLOrderBy orderBy = x.getOrderBy(); SQLLimit limit = x.getLimit(); - if (limit != null && (orderBy == null || orderBy.getItems().size() == 0)) { + if (limit != null && (orderBy == null || orderBy.getItems().isEmpty())) { boolean subQueryHasOrderBy = false; SQLTableSource from = x.getFrom(); if (from instanceof SQLSubqueryTableSource) { @@ -747,7 +747,7 @@ public class PagerUtils { orderBy = select.getOrderBy(); } - if (orderBy == null || orderBy.getItems().size() == 0) { + if (orderBy == null || orderBy.getItems().isEmpty()) { unorderedLimitCount++; } } @@ -785,7 +785,7 @@ public class PagerUtils { SQLSelect select = (SQLSelect) parent; - if (select.getOrderBy() == null || select.getOrderBy().getItems().size() == 0) { + if (select.getOrderBy() == null || select.getOrderBy().getItems().isEmpty()) { unorderedLimitCount++; } diff --git a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java index 279fc44fd4..f79006f969 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java @@ -158,7 +158,7 @@ public class SQLTransformUtils { dataType = new SQLDataTypeImpl("double"); } else if (nameHash == FnvHash.Constants.NUMBER) { - if (argumentns.size() == 0) { + if (argumentns.isEmpty()) { dataType = new SQLDataTypeImpl("decimal", 38); } else { SQLExpr arg0 = argumentns.get(0); @@ -230,7 +230,7 @@ public class SQLTransformUtils { } else if (nameHash == FnvHash.Constants.RAW) { int len; - if (argumentns.size() == 0) { + if (argumentns.isEmpty()) { len = -1; } else if (argumentns.size() == 1) { SQLExpr arg0 = argumentns.get(0); @@ -267,7 +267,7 @@ public class SQLTransformUtils { } else { dataType = new SQLCharacterDataType("varchar", len); } - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType("char"); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); @@ -289,7 +289,7 @@ public class SQLTransformUtils { } else { dataType = new SQLCharacterDataType("nvarchar", len); } - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType("nchar"); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); @@ -462,7 +462,7 @@ public class SQLTransformUtils { dataType = new SQLDataTypeImpl(SQLDataType.Constants.DOUBLE_PRECISION); } else if (nameHash == FnvHash.Constants.NUMBER) { - if (argumentns.size() == 0) { + if (argumentns.isEmpty()) { dataType = new SQLDataTypeImpl(SQLDataType.Constants.DECIMAL, 38); } else { SQLExpr arg0 = argumentns.get(0); @@ -536,7 +536,7 @@ public class SQLTransformUtils { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); } dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR, len); - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); @@ -558,7 +558,7 @@ public class SQLTransformUtils { } else { dataType = new SQLCharacterDataType(SQLDataType.Constants.TEXT); } - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); @@ -684,7 +684,7 @@ public class SQLTransformUtils { } if (nameHashCode64 == FnvHash.Constants.CURRENT_TIMESTAMP) { - if (parameters.size() == 0 && x.getParent() instanceof SQLColumnDefinition) { + if (parameters.isEmpty() && x.getParent() instanceof SQLColumnDefinition) { SQLDataType dataType = ((SQLColumnDefinition) x.getParent()).getDataType(); if (dataType.nameHashCode64() == FnvHash.Constants.TIMESTAMP && dataType.getArguments().size() == 1) { @@ -895,7 +895,7 @@ public class SQLTransformUtils { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); } dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR, len); - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); @@ -917,7 +917,7 @@ public class SQLTransformUtils { } else { dataType = new SQLCharacterDataType(SQLDataType.Constants.TEXT); } - } else if (argumentns.size() == 0) { + } else if (argumentns.isEmpty()) { dataType = new SQLCharacterDataType(SQLDataType.Constants.CHAR); } else { throw new UnsupportedOperationException(SQLUtils.toOracleString(x)); diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 32a47af2c1..ee4cbcefeb 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -706,7 +706,7 @@ public class SQLUtils { List stmtList = parseStatements(sql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new IllegalArgumentException("not support empty-statement :" + sql); } @@ -779,7 +779,7 @@ public class SQLUtils { public static String addSelectItem(String selectSql, String expr, String alias, boolean first, DbType dbType) { List stmtList = parseStatements(selectSql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new IllegalArgumentException("not support empty-statement :" + selectSql); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java index 2ae20263b7..c058adddbc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java @@ -462,7 +462,7 @@ public class SQLBinaryOpExpr extends SQLExprImpl implements SQLReplaceable, Seri } public static SQLExpr or(List list) { - if (list.size() == 0) { + if (list.isEmpty()) { return null; } SQLExpr first = list.get(0); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java index 96a3923dce..2944f9bda5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java @@ -158,7 +158,7 @@ public class SQLBinaryOpExprGroup extends SQLExprImpl implements SQLReplaceable SQLUtils.replaceInParent(this, items.get(0)); } - if (items.size() == 0) { + if (items.isEmpty()) { SQLUtils.replaceInParent(this, null); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java index 15b6613d3c..86e7992262 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAnalyzeTableStatement.java @@ -66,7 +66,7 @@ public class SQLAnalyzeTableStatement extends SQLStatementImpl { } public SQLExprTableSource getTable() { - if (tableSources.size() == 0) { + if (tableSources.isEmpty()) { return null; } @@ -86,7 +86,7 @@ public class SQLAnalyzeTableStatement extends SQLStatementImpl { table.setParent(this); } - if (tableSources.size() == 0) { + if (tableSources.isEmpty()) { if (table == null) { return; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java index bf2eb5fa4c..399cc29a23 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java @@ -525,7 +525,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS if (element instanceof MySqlUnique) { MySqlUnique unique = (MySqlUnique) element; - if (unique.getColumns().size() == 0) { + if (unique.getColumns().isEmpty()) { continue; } @@ -671,7 +671,7 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS } } - if (stmt.getItems().size() == 0) { + if (stmt.getItems().isEmpty()) { return null; } @@ -1095,13 +1095,13 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS if (e instanceof SQLUnique) { SQLUnique unique = (SQLUnique) e; unique.applyDropColumn(column); - if (unique.getColumns().size() == 0) { + if (unique.getColumns().isEmpty()) { tableElementList.remove(i); } } else if (e instanceof MySqlTableIndex) { MySqlTableIndex index = (MySqlTableIndex) e; index.applyDropColumn(column); - if (index.getColumns().size() == 0) { + if (index.getColumns().isEmpty()) { tableElementList.remove(i); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java index 8c6d880fd8..a5ef574d14 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java @@ -267,7 +267,7 @@ public class SQLDeleteStatement extends SQLStatementImpl implements SQLReplaceab removedCount++; } } - if (items.size() == 0) { + if (items.isEmpty()) { where = null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java index 7453724de9..8ca98e207c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java @@ -164,14 +164,14 @@ public abstract class SQLInsertInto extends SQLStatementImpl implements SQLRepla } public ValuesClause getValues() { - if (valuesList.size() == 0) { + if (valuesList.isEmpty()) { return null; } return valuesList.get(0); } public void setValues(ValuesClause values) { - if (valuesList.size() == 0) { + if (valuesList.isEmpty()) { valuesList.add(values); } else { valuesList.set(0, values); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java index 3145590d96..36db5a9d80 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java @@ -217,10 +217,10 @@ public class SQLSelect extends SQLObjectImpl implements SQLDbTypedObject { public boolean isSimple() { return withSubQuery == null - && (hints == null || hints.size() == 0) + && (hints == null || hints.isEmpty()) && restriction == null && (!forBrowse) - && (forXmlOptions == null || forXmlOptions.size() == 0) + && (forXmlOptions == null || forXmlOptions.isEmpty()) && xmlPath == null && rowCount == null && offset == null; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java index 8dcb8fa2c3..d19ac431b1 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java @@ -176,7 +176,7 @@ public class SQLSelectQueryBlock extends SQLSelectQueryBase implements SQLReplac } } - if (andList.size() == 0) { + if (andList.isEmpty()) { SQLUtils.replaceInParent(item, new SQLBooleanExpr(false)); return; } @@ -1251,7 +1251,7 @@ public class SQLSelectQueryBlock extends SQLSelectQueryBase implements SQLReplac removedCount++; } } - if (items.size() == 0) { + if (items.isEmpty()) { where = null; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java index 5445c9c0ab..4f9c7dda3f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnionQuery.java @@ -75,7 +75,7 @@ public class SQLUnionQuery extends SQLSelectQueryBase implements SQLDbTypedObjec } public SQLSelectQuery getLeft() { - if (relations.size() == 0) { + if (relations.isEmpty()) { return null; } return relations.get(0); @@ -86,7 +86,7 @@ public class SQLUnionQuery extends SQLSelectQueryBase implements SQLDbTypedObjec left.setParent(this); } - if (relations.size() == 0) { + if (relations.isEmpty()) { relations.add(left); } else if (relations.size() <= 2) { relations.set(0, left); @@ -111,7 +111,7 @@ public class SQLUnionQuery extends SQLSelectQueryBase implements SQLDbTypedObjec right.setParent(this); } - if (relations.size() == 0) { + if (relations.isEmpty()) { relations.add(null); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java index a8d3cf81ac..d730248315 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java @@ -312,7 +312,7 @@ public class SQLUpdateStatement extends SQLStatementImpl implements SQLReplaceab removedCount++; } } - if (items.size() == 0) { + if (items.isEmpty()) { where = null; } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java index 47fadef138..c9b4cb53a9 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java @@ -42,7 +42,7 @@ public class SQLDeleteBuilderImpl implements SQLDeleteBuilder { public SQLDeleteBuilderImpl(String sql, DbType dbType){ List stmtList = SQLUtils.parseStatements(sql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new IllegalArgumentException("not support empty-statement :" + sql); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java index e7a1306e96..fb8f5f25a1 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java @@ -40,7 +40,7 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder { public SQLSelectBuilderImpl(String sql, DbType dbType){ List stmtList = SQLUtils.parseStatements(sql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new IllegalArgumentException("not support empty-statement :" + sql); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java index 39489a82d7..d3a18ae1f2 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java @@ -45,7 +45,7 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui public SQLUpdateBuilderImpl(String sql, DbType dbType){ List stmtList = SQLUtils.parseStatements(sql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { throw new IllegalArgumentException("not support empty-statement :" + sql); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java index 3142bd3b49..4c232ebbfd 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java @@ -70,7 +70,7 @@ public class DB2StatementParser extends SQLStatementParser { SQLAlterTableAlterColumn alterColumn = new SQLAlterTableAlterColumn(); alterColumn.setColumn(column); - if (column.getDataType() == null && column.getConstraints().size() == 0) { + if (column.getDataType() == null && column.getConstraints().isEmpty()) { if (lexer.token() == Token.SET) { lexer.nextToken(); if (lexer.token() == Token.NOT) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java index 8315bebdba..2dac1691d2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitor.java @@ -58,7 +58,7 @@ public class H2OutputVisitor extends SQLASTOutputVisitor implements H2ASTVisitor } List valuesClauseList = x.getValuesList(); - if (valuesClauseList.size() != 0) { + if (!valuesClauseList.isEmpty()) { println(); print0(ucase ? "VALUES " : "values "); int size = valuesClauseList.size(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java index c6ce131a83..6fe2221f03 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlKillStatement.java @@ -48,7 +48,7 @@ public class MySqlKillStatement extends SQLStatementImpl { } public void setThreadId(SQLExpr threadId) { - if (this.threadIds.size() == 0) { + if (this.threadIds.isEmpty()) { this.threadIds.add(threadId); return; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index ca9af04753..d582561d73 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -1706,7 +1706,7 @@ public class MySqlStatementParser extends SQLStatementParser { break; } if (hints.size() >= 1 - && statementList.size() == 0 + && statementList.isEmpty() && acceptHint) { SQLCommentHint hint = hints.get(0); String hintText = hint.getText().toUpperCase(); @@ -2346,7 +2346,7 @@ public class MySqlStatementParser extends SQLStatementParser { break; } - if (stmt.getTables().size() != 0) { + if (!stmt.getTables().isEmpty()) { if (lexer.token() == Token.FOR) { lexer.nextToken(); acceptIdentifier("EXPORT"); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index 365466223c..055088b87a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -1244,7 +1244,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } List duplicateKeyUpdate = x.getDuplicateKeyUpdate(); - if (duplicateKeyUpdate.size() != 0) { + if (!duplicateKeyUpdate.isEmpty()) { println(); print0(ucase ? "ON DUPLICATE KEY UPDATE " : "on duplicate key update "); for (int i = 0, size = duplicateKeyUpdate.size(); i < size; ++i) { @@ -1278,7 +1278,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV SQLExpr value = values.get(i); if (value instanceof SQLLiteralExpr || value instanceof SQLVariantRefExpr) { continue; - } else if (value instanceof SQLMethodInvokeExpr && ((SQLMethodInvokeExpr) value).getArguments().size() == 0) { + } else if (value instanceof SQLMethodInvokeExpr && ((SQLMethodInvokeExpr) value).getArguments().isEmpty()) { continue; } allConst = false; @@ -1433,13 +1433,13 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print0(ucase ? " LINES" : " lines"); } - if (x.getColumns().size() != 0) { + if (!x.getColumns().isEmpty()) { print0(" ("); printAndAccept(x.getColumns(), ", "); print(')'); } - if (x.getSetList().size() != 0) { + if (!x.getSetList().isEmpty()) { print0(ucase ? " SET " : " set "); printAndAccept(x.getSetList(), ", "); } @@ -1516,7 +1516,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } List valuesClauseList = x.getValuesList(); - if (valuesClauseList.size() != 0) { + if (!valuesClauseList.isEmpty()) { println(); print0(ucase ? "VALUES " : "values "); int size = valuesClauseList.size(); @@ -1758,7 +1758,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV x.getRowsIdentifiedBy().accept(this); } - if (x.getSetList().size() != 0) { + if (!x.getSetList().isEmpty()) { print0(ucase ? " SET " : " set "); printAndAccept(x.getSetList(), ", "); } @@ -4218,7 +4218,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } List parameters = x.getParameters(); - if (parameters.size() != 0) { + if (!parameters.isEmpty()) { this.indentCount++; if (parent instanceof SQLCreateProcedureStatement) { printIndent(); @@ -4600,7 +4600,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(")"); } - if (x.getOptions().size() != 0) { + if (!x.getOptions().isEmpty()) { println(); print0(ucase ? "SUBPARTITION OPTIONS (" : "subpartition options ("); printAndAccept(x.getOptions(), ", "); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java index 4f3fa3a73f..57d436f395 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleStatementParser.java @@ -2157,7 +2157,7 @@ public class OracleStatementParser extends SQLStatementParser { while (lexer.token() == Token.INTO) { OracleMultiInsertStatement.InsertIntoClause clause = new OracleMultiInsertStatement.InsertIntoClause(); - boolean acceptSubQuery = stmt.getEntries().size() == 0; + boolean acceptSubQuery = stmt.getEntries().isEmpty(); parseInsert0(clause, acceptSubQuery); clause.setReturning(parseReturningClause()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java index 4886f77fa5..81d5928844 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/stmt/PGInsertStatement.java @@ -68,14 +68,14 @@ public class PGInsertStatement extends SQLInsertStatement implements PGSQLStatem public ValuesClause getValues() { - if (valuesList.size() == 0) { + if (valuesList.isEmpty()) { return null; } return valuesList.get(0); } public void setValues(ValuesClause values) { - if (valuesList.size() == 0) { + if (valuesList.isEmpty()) { valuesList.add(values); } else { valuesList.set(0, values); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java index 3dcb9bb882..e882861a66 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGSQLStatementParser.java @@ -459,7 +459,7 @@ public class PGSQLStatementParser extends SQLStatementParser { SQLAlterTableAlterColumn alterColumn = new SQLAlterTableAlterColumn(); alterColumn.setColumn(column); - if (column.getDataType() == null && column.getConstraints().size() == 0) { + if (column.getDataType() == null && column.getConstraints().isEmpty()) { if (lexer.token() == Token.SET) { lexer.nextToken(); if (lexer.token() == Token.NOT) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index 287cd061b7..55af4e95f5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -435,7 +435,7 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor print('('); expr.accept(this); print(')'); - } else if (expr instanceof PGTypeCastExpr && dataType.getArguments().size() == 0) { + } else if (expr instanceof PGTypeCastExpr && dataType.getArguments().isEmpty()) { dataType.accept(this); print('('); visit((PGTypeCastExpr) expr); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java index 7706121fce..aaa2f1f2fe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java @@ -156,7 +156,7 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe x.getOutput().accept(this); } - if (x.getValuesList().size() != 0) { + if (!x.getValuesList().isEmpty()) { println(); print0(ucase ? "VALUES " : "values "); for (int i = 0, size = x.getValuesList().size(); i < size; ++i) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java index 95ede9506c..e67bfbbe46 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLSelectParser.java @@ -1113,7 +1113,7 @@ public class SQLSelectParser extends SQLParser { tableSource.setAlias(alias); if (tableSource instanceof SQLValuesTableSource - && ((SQLValuesTableSource) tableSource).getColumns().size() == 0) { + && ((SQLValuesTableSource) tableSource).getColumns().isEmpty()) { SQLValuesTableSource values = (SQLValuesTableSource) tableSource; accept(Token.LPAREN); this.exprParser.names(values.getColumns(), values); @@ -1351,7 +1351,7 @@ public class SQLSelectParser extends SQLParser { tableSource.setAlias(alias); if ((tableSource instanceof SQLValuesTableSource) - && ((SQLValuesTableSource) tableSource).getColumns().size() == 0) { + && ((SQLValuesTableSource) tableSource).getColumns().isEmpty()) { SQLValuesTableSource values = (SQLValuesTableSource) tableSource; accept(Token.LPAREN); this.exprParser.names(values.getColumns(), values); @@ -1565,7 +1565,7 @@ public class SQLSelectParser extends SQLParser { if (rightTableSource instanceof SQLValuesTableSource && (lexer.token == Token.AS || lexer.token == Token.IDENTIFIER) && rightTableSource.getAlias() == null - && ((SQLValuesTableSource) rightTableSource).getColumns().size() == 0 + && ((SQLValuesTableSource) rightTableSource).getColumns().isEmpty() ) { if (lexer.token == Token.AS) { lexer.nextToken(); @@ -1708,7 +1708,7 @@ public class SQLSelectParser extends SQLParser { } else if (rightTableSource instanceof SQLExprTableSource && ((SQLExprTableSource) rightTableSource).getExpr() instanceof SQLMethodInvokeExpr) { List columns = ((SQLExprTableSource) rightTableSource).getColumns(); - if (columns.size() == 0) { + if (columns.isEmpty()) { lexer.nextToken(); this.exprParser.names(columns, rightTableSource); accept(Token.RPAREN); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java index bbc6094750..db45ddc5e1 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -152,7 +152,7 @@ public class ParameterizedOutputVisitorUtils { } List statementList = parser.parseStatementList(); - if (statementList.size() == 0) { + if (statementList.isEmpty()) { return sql; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index e6de148f71..a7b380b73b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -684,7 +684,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet boolean isRoot = parent instanceof SQLSelectQueryBlock || parent instanceof SQLBinaryOpExprGroup; List items = x.getItems(); - if (items.size() == 0) { + if (items.isEmpty()) { print("true"); return false; } @@ -4801,7 +4801,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet } final List> storedBy = x.getStoredBy(); - if (storedBy.size() != 0) { + if (!storedBy.isEmpty()) { println(); print0(ucase ? "STORED BY " : "stored by "); @@ -6719,7 +6719,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLAlterTableEnableLifecycle x) { - if (x.getPartition().size() != 0) { + if (!x.getPartition().isEmpty()) { print0(ucase ? "PARTITION (" : "partition ("); printAndAccept(x.getPartition(), ", "); print0(") "); @@ -6731,7 +6731,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLAlterTableDisableLifecycle x) { - if (x.getPartition().size() != 0) { + if (!x.getPartition().isEmpty()) { print0(ucase ? "PARTITION (" : "partition ("); printAndAccept(x.getPartition(), ", "); print0(") "); @@ -6743,7 +6743,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLAlterTablePartition x) { - if (x.getPartition().size() != 0) { + if (!x.getPartition().isEmpty()) { print0(ucase ? "PARTITION (" : "partition ("); printAndAccept(x.getPartition(), ", "); print0(") "); @@ -6753,13 +6753,13 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLAlterTablePartitionSetProperties x) { - if (x.getPartition().size() != 0) { + if (!x.getPartition().isEmpty()) { print0(ucase ? "PARTITION (" : "partition ("); printAndAccept(x.getPartition(), ", "); print0(") "); } - if (x.getPartitionProperties().size() != 0) { + if (!x.getPartitionProperties().isEmpty()) { print0(ucase ? "SET PARTITIONPROPERTIES (" : "set partitionproperties ("); printAndAccept(x.getPartitionProperties(), ", "); print0(") "); @@ -6770,7 +6770,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLAlterTableTouch x) { print0(ucase ? "TOUCH" : "touch"); - if (x.getPartition().size() != 0) { + if (!x.getPartition().isEmpty()) { print0(ucase ? " PARTITION (" : " partition ("); printAndAccept(x.getPartition(), ", "); print(')'); @@ -7290,7 +7290,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLPartitionByRange x) { SQLExpr interval = x.getInterval(); - if (x.getColumns().size() == 0 + if (x.getColumns().isEmpty() && (interval instanceof SQLBetweenExpr || interval instanceof SQLMethodInvokeExpr)) { interval.accept(this); @@ -8911,7 +8911,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet @Override public boolean visit(SQLBlockStatement x) { - if (x.getParameters().size() != 0) { + if (!x.getParameters().isEmpty()) { this.indentCount++; if (x.getParent() instanceof SQLCreateProcedureStatement) { SQLCreateProcedureStatement procedureStatement = (SQLCreateProcedureStatement) x.getParent(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java index 804e2f4235..5e2feefdae 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLDataTypeValidator.java @@ -127,7 +127,7 @@ public class SQLDataTypeValidator extends SQLASTVisitorAdapter { } public static void check(List stmtList) { - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { return; } @@ -138,7 +138,7 @@ public class SQLDataTypeValidator extends SQLASTVisitorAdapter { } public static void check(List stmtList, DbType dbType) { - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { return; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java index 3b34681d90..240101d844 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Ascii.java @@ -27,7 +27,7 @@ public class Ascii implements Function { public final static Ascii instance = new Ascii(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { - if (x.getArguments().size() == 0) { + if (x.getArguments().isEmpty()) { return SQLEvalVisitor.EVAL_ERROR; } SQLExpr param = x.getArguments().get(0); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java index 5906a14316..d2737116f0 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Char.java @@ -28,7 +28,7 @@ public class Char implements Function { public final static Char instance = new Char(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { - if (x.getArguments().size() == 0) { + if (x.getArguments().isEmpty()) { return SQLEvalVisitor.EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java index 494993a84a..905204aa0b 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/If.java @@ -32,7 +32,7 @@ public class If implements Function { public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); - if (arguments.size() == 0) { + if (arguments.isEmpty()) { return EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java index 19acb5bfc1..45847d91e3 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/Isnull.java @@ -32,7 +32,7 @@ public class Isnull implements Function { public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); - if (arguments.size() == 0) { + if (arguments.isEmpty()) { return EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java index 4ad695b007..756e98103f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/OneParamFunctions.java @@ -32,7 +32,7 @@ public class OneParamFunctions implements Function { public final static OneParamFunctions instance = new OneParamFunctions(); public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { - if (x.getArguments().size() == 0) { + if (x.getArguments().isEmpty()) { return SQLEvalVisitor.EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java index f4d14cd000..398eaf9304 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/functions/ToDate.java @@ -36,7 +36,7 @@ public class ToDate implements Function { public Object eval(SQLEvalVisitor visitor, SQLMethodInvokeExpr x) { final List arguments = x.getArguments(); - if (arguments.size() == 0) { + if (arguments.isEmpty()) { return EVAL_ERROR; } diff --git a/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java b/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java index 6376c978fc..018e535356 100644 --- a/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java +++ b/src/main/java/com/alibaba/druid/support/calcite/CalciteMySqlNodeVisitor.java @@ -405,7 +405,7 @@ public class CalciteMySqlNodeVisitor extends MySqlASTVisitorAdapter { List columns = x.getColumns(); SqlNode[] operands; - if (columns.size() == 0) { + if (columns.isEmpty()) { operands = new SqlNode[] { sqlNode, aliasIdentifier }; } else { operands = new SqlNode[columns.size() + 2]; diff --git a/src/main/java/com/alibaba/druid/support/console/DruidStat.java b/src/main/java/com/alibaba/druid/support/console/DruidStat.java index 491d316da4..7d80df5343 100644 --- a/src/main/java/com/alibaba/druid/support/console/DruidStat.java +++ b/src/main/java/com/alibaba/druid/support/console/DruidStat.java @@ -83,7 +83,7 @@ public class DruidStat { if (option.printActiveConn()) { List> content = (List>) invokeService(jmxConn, Option.ACTIVE_CONN); - if (content == null || content.size() == 0 ) { + if (content == null || content.isEmpty() ) { out.println("目前无活动中的数据库连接"); } else { TabledDataPrinter.printActiveConnStack(content, option); diff --git a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java index 46526037e3..0093060d4a 100644 --- a/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java @@ -255,7 +255,7 @@ public abstract class ResourceServlet extends HttpServlet { boolean ipV6 = remoteAddress != null && remoteAddress.indexOf(':') != -1; if (ipV6) { - return "0:0:0:0:0:0:0:1".equals(remoteAddress) || (denyList.size() == 0 && allowList.size() == 0); + return "0:0:0:0:0:0:0:1".equals(remoteAddress) || (denyList.isEmpty() && allowList.isEmpty()); } IPAddress ipAddress = new IPAddress(remoteAddress); diff --git a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java index 2f98998481..72cc4a0061 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java +++ b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java @@ -498,7 +498,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { } private void save(BeanInfo beanInfo, MonitorContext ctx, List list) { - if (list.size() == 0) { + if (list.isEmpty()) { return; } diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java index 1253e86fab..cdedbe1b6a 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/ExportConditions.java @@ -60,7 +60,7 @@ public class ExportConditions extends UDF { row.add(column.getTable()); row.add(column.getName()); row.add(operator); - if (values.size() == 0) { + if (values.isEmpty()) { row.add(null); } else if (values.size() == 1) { if (compactValues != null && compactValues.booleanValue()) { diff --git a/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java b/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java index 3f8fdeda3d..5768106e67 100644 --- a/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java +++ b/src/main/java/com/alibaba/druid/support/opds/udf/SqlTypeUDF.java @@ -155,7 +155,7 @@ public class SqlTypeUDF extends UDF { try { List stmtList = SQLUtils.parseStatements(sql, dbType); - if (stmtList.size() == 0) { + if (stmtList.isEmpty()) { return SQLType.EMPTY.name(); } diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java b/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java index 50c3f53f03..5cb269013f 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java @@ -19,6 +19,6 @@ public class Issue1759 extends TestCase { WallCheckResult result1 = provider.check(sql); - assertTrue(result1.getViolations().size() == 0); + assertTrue(result1.getViolations().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java index 23f66ecf8e..9c11877a4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java @@ -24,7 +24,7 @@ public class WallUpdateCheckTest extends TestCase { public void test_update_check_handler() throws Exception { { WallCheckResult result = wallProvider.check("update t_orders set status = 3 where id = 3 and status = 4"); - assertTrue(result.getViolations().size() == 0); + assertTrue(result.getViolations().isEmpty()); } wallProvider.getConfig().setUpdateCheckHandler(new WallUpdateCheckHandler() { @@ -46,7 +46,7 @@ public class WallUpdateCheckTest extends TestCase { }); { WallCheckResult result = wallProvider.check("update t_orders set status = 3 where id = 3 and status = 4"); - assertTrue(result.getViolations().size() == 0); + assertTrue(result.getViolations().isEmpty()); } assertEquals(0, wallProvider.getWhiteListHitCount()); assertEquals(0, wallProvider.getBlackListHitCount()); @@ -61,11 +61,11 @@ public class WallUpdateCheckTest extends TestCase { }); { WallCheckResult result = wallProvider.check("update t_orders set status = 3 where id = 3 and status in (1, 2)"); - assertTrue(result.getViolations().size() == 0); + assertTrue(result.getViolations().isEmpty()); } { WallCheckResult result = wallProvider.check("update t_orders set status = 3 where id = 3 and status = 3 and status in (3, 4)"); - assertTrue(result.getViolations().size() == 0); + assertTrue(result.getViolations().isEmpty()); } } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java index 59204a88b7..16b7b850ab 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java @@ -32,7 +32,7 @@ public class PagerUtilsTest_Limit_mysql_question_placeholder extends TestCase { Assert.fail(e.getMessage()); return; } - if (statements == null || statements.size() == 0){ + if (statements == null || statements.isEmpty()){ Assert.fail("no sql found!"); return; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java index a0098ef786..6215c66a03 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java @@ -49,7 +49,7 @@ public class DropTableTest extends MysqlTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java index f27d5ae06a..3361358f17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java @@ -91,7 +91,7 @@ public class OdpsListResourcesTest extends TestCase { , SQLParserFeature.EnableMultiUnion , SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); - if (statementList.size() == 0) { + if (statementList.isEmpty()) { throw new Exception("empty"); } SQLStatement stmt = statementList.get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java index 6d97cd41ec..114d2943ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java @@ -49,7 +49,7 @@ public class DropTableTest extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("films")).getDropCount() == 1); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("distributors")).getDropCount() == 1); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java index 52c895fef1..a153334715 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java @@ -46,7 +46,7 @@ public class PGDeleteTest2 extends PGTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("tasks"))); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java index a5ea313da0..7ba959e25c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest7.java @@ -50,7 +50,7 @@ public class PGDeleteTest7 extends PGTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("foo"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bar"))); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); // Assert.assertTrue(visitor.getColumns().contains(new TableStat.Column("products", "date"))); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java index 99eb54a5ca..f6fd86e3a2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java @@ -46,7 +46,7 @@ public class TruncateTest extends PGTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bigtable"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fattable"))); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } public void test_1() throws Exception { @@ -68,7 +68,7 @@ public class TruncateTest extends PGTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("bigtable"))); Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("fattable"))); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } public void test_2() throws Exception { @@ -89,6 +89,6 @@ public class TruncateTest extends PGTest { Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("othertable"))); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java index ec66543607..b79761f273 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableDropConstraint.java @@ -33,6 +33,6 @@ public class PGAlterTableDropConstraint extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java index d17c0af69d..7766dcd0d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGAlterTableRenameTest.java @@ -33,6 +33,6 @@ public class PGAlterTableRenameTest extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("products")).getAlterCount() == 1); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java index 150ca9b9f8..6e80aabd97 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGDropTableIfExistsTest.java @@ -32,6 +32,6 @@ public class PGDropTableIfExistsTest extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("t_report_1_19")).getDropCount() == 1); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java index c31d7252af..623aaa6427 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGGrantTest0.java @@ -33,6 +33,6 @@ public class PGGrantTest0 extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getAlterCount() == 0); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java index 035a151457..b9c7edf0e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/ddl/PGRovokeTest0.java @@ -33,6 +33,6 @@ public class PGRovokeTest0 extends PGTest { Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getDropCount() == 0); Assert.assertTrue(visitor.getTables().get(new TableStat.Name("accounts")).getAlterCount() == 0); - Assert.assertTrue(visitor.getColumns().size() == 0); + Assert.assertTrue(visitor.getColumns().isEmpty()); } } diff --git a/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/src/test/java/com/alibaba/druid/sql/TestMigrate.java index 43242f8310..f984e3f7b8 100644 --- a/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -228,7 +228,7 @@ public class TestMigrate extends OracleTest { } public void insert(List list) throws Exception { - if (list.size() == 0) { + if (list.isEmpty()) { return; } diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index 66f49e1a53..a444975424 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -330,7 +330,7 @@ public class TestTransform extends OracleTest { } public void insert(List list) throws Exception { - if (list.size() == 0) { + if (list.isEmpty()) { return; } diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java index a863e63ac2..b1d627b389 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java @@ -141,7 +141,7 @@ public class SQLMergeTest extends TestCase { print(")"); } - if (x.getValuesList().size() != 0) { + if (!x.getValuesList().isEmpty()) { print(" VALUES "); int size = x.getValuesList().size(); if (size == 0) { @@ -160,7 +160,7 @@ public class SQLMergeTest extends TestCase { x.getQuery().accept(this); } - if (x.getDuplicateKeyUpdate().size() != 0) { + if (!x.getDuplicateKeyUpdate().isEmpty()) { print(" ON DUPLICATE KEY UPDATE "); printAndAccept(x.getDuplicateKeyUpdate(), ", "); } diff --git a/src/test/java/com/alibaba/druid/test/wall/PGWallTest.java b/src/test/java/com/alibaba/druid/test/wall/PGWallTest.java index a62727b4eb..77a70785d3 100644 --- a/src/test/java/com/alibaba/druid/test/wall/PGWallTest.java +++ b/src/test/java/com/alibaba/druid/test/wall/PGWallTest.java @@ -16,6 +16,6 @@ public class PGWallTest { WallProvider provider = new PGWallProvider(new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR)); String sql = "CREATE TABLE test_pg_wall (col_int INT NOT NULL, col_double_x DOUBLE PRECISION NOT NULL DEFAULT 0, col_varchar VARCHAR(200) NULL)"; WallCheckResult result = provider.check(sql); - Assert.assertTrue(result.getViolations().size() == 0); + Assert.assertTrue(result.getViolations().isEmpty()); } }