From b035a8c2770229906ebf3ad8129fc33c80b359dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Tue, 6 Oct 2020 19:17:00 +0800 Subject: [PATCH] refactor for jdk8 default method --- .../com/alibaba/druid/wall/WallVisitor.java | 38 +++--- .../druid/wall/spi/DB2WallVisitor.java | 73 ++--------- .../druid/wall/spi/MySqlWallVisitor.java | 118 ++---------------- .../druid/wall/spi/OracleWallVisitor.java | 86 ++----------- .../alibaba/druid/wall/spi/PGWallVisitor.java | 72 +---------- .../druid/wall/spi/SQLServerWallVisitor.java | 68 +--------- 6 files changed, 56 insertions(+), 399 deletions(-) diff --git a/src/main/java/com/alibaba/druid/wall/WallVisitor.java b/src/main/java/com/alibaba/druid/wall/WallVisitor.java index 5de092794e..69a81c2192 100644 --- a/src/main/java/com/alibaba/druid/wall/WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/WallVisitor.java @@ -20,9 +20,7 @@ import java.util.List; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.SQLObject; +import com.alibaba.druid.sql.ast.*; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; @@ -39,19 +37,9 @@ public interface WallVisitor extends SQLASTVisitor { List getViolations(); - default void addViolation(Violation violation) { - this.getViolations().add(violation); - } + void addViolation(Violation violation); - default boolean isDenyTable(String name) { - if (!getConfig() - .isTableCheck()) { - return false; - } - - return !getProvider() - .checkDenyTable(name); - } + boolean isDenyTable(String name); default String toSQL(SQLObject obj) { return SQLUtils.toSQLString(obj, getDbType()); @@ -242,4 +230,24 @@ public interface WallVisitor extends SQLASTVisitor { default boolean visit(SQLCallStatement x) { return false; } + + default boolean visit(SQLCommentHint x) { + if (x instanceof TDDLHint) { + return false; + } + WallVisitorUtils.check(this, x); + return true; + } + + default boolean visit(SQLShowCreateTableStatement x) { + String tableName = (x.getName()).getSimpleName(); + WallContext context = WallContext.current(); + if (context != null) { + WallSqlTableStat tableStat = context.getTableStat(tableName); + if (tableStat != null) { + tableStat.incrementShowCount(); + } + } + return false; + } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java index 51bd29d005..0c4a5a9311 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java @@ -16,57 +16,13 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitorAdapter; -import com.alibaba.druid.wall.*; -import java.util.ArrayList; -import java.util.List; - -public class DB2WallVisitor extends DB2ASTVisitorAdapter implements WallVisitor { - - private final WallConfig config; - private final WallProvider provider; - private final List violations = new ArrayList(); - private boolean sqlModified = false; - private boolean sqlEndOfComment = false; - private List updateCheckItems; +import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; +public class DB2WallVisitor extends WallVisitorBase implements WallVisitor, DB2ASTVisitor { public DB2WallVisitor(WallProvider provider){ - this.config = provider.getConfig(); - this.provider = provider; - } - - @Override - public DbType getDbType() { - return DbType.db2; - } - - @Override - public boolean isSqlModified() { - return sqlModified; - } - - @Override - public void setSqlModified(boolean sqlModified) { - this.sqlModified = sqlModified; - } - - @Override - public WallProvider getProvider() { - return provider; - } - - @Override - public WallConfig getConfig() { - return config; - } - - @Override - public void addViolation(Violation violation) { - this.violations.add(violation); - } - - public List getViolations() { - return violations; + super (provider); } @Override @@ -82,24 +38,9 @@ public class DB2WallVisitor extends DB2ASTVisitorAdapter implements WallVisitor return !this.provider.checkDenyTable(name); } - @Override - public boolean isSqlEndOfComment() { - return this.sqlEndOfComment; - } @Override - public void setSqlEndOfComment(boolean sqlEndOfComment) { - this.sqlEndOfComment = sqlEndOfComment; - } - - public void addWallUpdateCheckItem(WallUpdateCheckItem item) { - if (updateCheckItems == null) { - updateCheckItems = new ArrayList(); - } - updateCheckItems.add(item); - } - - public List getUpdateCheckItems() { - return updateCheckItems; + public DbType getDbType() { + return DbType.db2; } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java index d9419a6fc0..188f4f3b25 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java @@ -22,27 +22,14 @@ import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlOutFileExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.wall.*; import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; -import java.util.ArrayList; -import java.util.List; - -public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisitor, MySqlASTVisitor { - - private final WallConfig config; - private final WallProvider provider; - private final List violations = new ArrayList(); - private boolean sqlModified = false; - private boolean sqlEndOfComment = false; - private List updateCheckItems; - +public class MySqlWallVisitor extends WallVisitorBase implements WallVisitor, MySqlASTVisitor { public MySqlWallVisitor(WallProvider provider){ - this.config = provider.getConfig(); - this.provider = provider; + super (provider); } @Override @@ -50,39 +37,9 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi return DbType.mysql; } - @Override - public boolean isSqlModified() { - return sqlModified; - } - - @Override - public void setSqlModified(boolean sqlModified) { - this.sqlModified = sqlModified; - } - - @Override - public WallProvider getProvider() { - return provider; - } - - @Override - public WallConfig getConfig() { - return config; - } - - @Override - public void addViolation(Violation violation) { - this.violations.add(violation); - } - - @Override - public List getViolations() { - return violations; - } - @Override public boolean visit(MySqlSelectQueryBlock x) { - com.alibaba.druid.wall.spi.WallVisitorUtils.checkSelelct(this, x); + WallVisitorUtils.checkSelelct(this, x); return true; } @@ -115,11 +72,11 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi } if (!checkVar(x.getParent(), x.getName())) { - boolean isTop = com.alibaba.druid.wall.spi.WallVisitorUtils.isTopNoneFromSelect(this, x); + boolean isTop = WallVisitorUtils.isTopNoneFromSelect(this, x); if (!isTop) { boolean allow = true; if (isDeny(varName) - && (com.alibaba.druid.wall.spi.WallVisitorUtils.isWhereOrHaving(x) || com.alibaba.druid.wall.spi.WallVisitorUtils.checkSqlExpr(varExpr))) { + && (WallVisitorUtils.isWhereOrHaving(x) || WallVisitorUtils.checkSqlExpr(varExpr))) { allow = false; } @@ -134,7 +91,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi } } - com.alibaba.druid.wall.spi.WallVisitorUtils.check(this, x); + WallVisitorUtils.check(this, x); return true; } @@ -183,16 +140,16 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi if (varName.startsWith("@@") && !checkVar(x.getParent(), x.getName())) { - final WallTopStatementContext topStatementContext = com.alibaba.druid.wall.spi.WallVisitorUtils.getWallTopStatementContext(); + final WallTopStatementContext topStatementContext = WallVisitorUtils.getWallTopStatementContext(); if (topStatementContext != null && (topStatementContext.fromSysSchema() || topStatementContext.fromSysTable())) { return false; } - boolean isTop = com.alibaba.druid.wall.spi.WallVisitorUtils.isTopNoneFromSelect(this, x); + boolean isTop = WallVisitorUtils.isTopNoneFromSelect(this, x); if (!isTop) { boolean allow = true; - if (isDeny(varName) && (com.alibaba.druid.wall.spi.WallVisitorUtils.isWhereOrHaving(x) || com.alibaba.druid.wall.spi.WallVisitorUtils.checkSqlExpr(x))) { + if (isDeny(varName) && (WallVisitorUtils.isWhereOrHaving(x) || WallVisitorUtils.checkSqlExpr(x))) { allow = false; } @@ -208,7 +165,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi @Override public boolean visit(MySqlOutFileExpr x) { - if (!config.isSelectIntoOutfileAllow() && !com.alibaba.druid.wall.spi.WallVisitorUtils.isTopSelectOutFile(x)) { + if (!config.isSelectIntoOutfileAllow() && !WallVisitorUtils.isTopSelectOutFile(x)) { violations.add(new IllegalSQLObjectViolation(ErrorCode.INTO_OUTFILE, "into out file not allow", toSQL(x))); } @@ -226,60 +183,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi @Override public boolean visit(MySqlCreateTableStatement x) { - com.alibaba.druid.wall.spi.WallVisitorUtils.check(this, x); + WallVisitorUtils.check(this, x); return true; } - - @Override - public boolean visit(SQLSetStatement x) { - return false; - } - - @Override - public boolean visit(SQLCallStatement x) { - return false; - } - - @Override - public boolean visit(SQLCommentHint x) { - if (x instanceof TDDLHint) { - return false; - } - com.alibaba.druid.wall.spi.WallVisitorUtils.check(this, x); - return true; - } - - @Override - public boolean visit(SQLShowCreateTableStatement x) { - String tableName = (x.getName()).getSimpleName(); - WallContext context = WallContext.current(); - if (context != null) { - WallSqlTableStat tableStat = context.getTableStat(tableName); - if (tableStat != null) { - tableStat.incrementShowCount(); - } - } - return false; - } - - @Override - public boolean isSqlEndOfComment() { - return this.sqlEndOfComment; - } - - @Override - public void setSqlEndOfComment(boolean sqlEndOfComment) { - this.sqlEndOfComment = sqlEndOfComment; - } - - public void addWallUpdateCheckItem(WallUpdateCheckItem item) { - if (updateCheckItems == null) { - updateCheckItems = new ArrayList(); - } - updateCheckItems.add(item); - } - - public List getUpdateCheckItems() { - return updateCheckItems; - } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java index b1db795cbc..aa155c7665 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java @@ -16,30 +16,19 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.expr.*; -import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.*; +import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; +import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement.InsertIntoClause; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; -import com.alibaba.druid.wall.*; +import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; -import java.util.ArrayList; -import java.util.List; - -public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVisitor { - - private final WallConfig config; - private final WallProvider provider; - private final List violations = new ArrayList(); - private boolean sqlModified = false; - private boolean sqlEndOfComment = false; - private List updateCheckItems; - +public class OracleWallVisitor extends WallVisitorBase implements WallVisitor, OracleASTVisitor { public OracleWallVisitor(WallProvider provider){ - this.config = provider.getConfig(); - this.provider = provider; + super (provider); } @Override @@ -47,36 +36,6 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi return DbType.oracle; } - @Override - public boolean isSqlModified() { - return sqlModified; - } - - @Override - public void setSqlModified(boolean sqlModified) { - this.sqlModified = sqlModified; - } - - @Override - public WallProvider getProvider() { - return provider; - } - - @Override - public WallConfig getConfig() { - return config; - } - - @Override - public void addViolation(Violation violation) { - this.violations.add(violation); - } - - @Override - public List getViolations() { - return violations; - } - public boolean visit(SQLIdentifierExpr x) { String name = x.getName(); name = WallVisitorUtils.form(name); @@ -104,14 +63,12 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi return !this.provider.checkDenyTable(name); } - @Override public boolean visit(InsertIntoClause x) { WallVisitorUtils.checkInsert(this, x); return true; } - @Override public boolean visit(OracleMultiInsertStatement x) { if (!config.isInsertAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.INSERT_NOT_ALLOW, "insert not allow", @@ -123,34 +80,7 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi return true; } - @Override public void endVisit(OracleMultiInsertStatement x) { WallVisitorUtils.clearWallTopStatementContext(); } - - @Override - public boolean isSqlEndOfComment() { - return this.sqlEndOfComment; - } - - @Override - public void setSqlEndOfComment(boolean sqlEndOfComment) { - this.sqlEndOfComment = sqlEndOfComment; - } - - public void addWallUpdateCheckItem(WallUpdateCheckItem item) { - if (updateCheckItems == null) { - updateCheckItems = new ArrayList(); - } - updateCheckItems.add(item); - } - - public List getUpdateCheckItems() { - return updateCheckItems; - } - - public boolean visit(SQLJoinTableSource x) { - WallVisitorUtils.check(this, x); - return true; - } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java index 0651774ebd..b231bebe85 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java @@ -16,24 +16,13 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitorAdapter; -import com.alibaba.druid.wall.*; - -import java.util.ArrayList; -import java.util.List; - -public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { - - private final WallConfig config; - private final WallProvider provider; - private final List violations = new ArrayList(); - private boolean sqlModified = false; - private boolean sqlEndOfComment = false; - private List updateCheckItems; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; +import com.alibaba.druid.wall.WallProvider; +import com.alibaba.druid.wall.WallVisitor; +public class PGWallVisitor extends WallVisitorBase implements WallVisitor, PGASTVisitor { public PGWallVisitor(WallProvider provider){ - this.config = provider.getConfig(); - this.provider = provider; + super (provider); } @Override @@ -41,36 +30,6 @@ public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { return DbType.postgresql; } - @Override - public boolean isSqlModified() { - return sqlModified; - } - - @Override - public void setSqlModified(boolean sqlModified) { - this.sqlModified = sqlModified; - } - - @Override - public WallProvider getProvider() { - return provider; - } - - @Override - public WallConfig getConfig() { - return config; - } - - @Override - public void addViolation(Violation violation) { - this.violations.add(violation); - } - - @Override - public List getViolations() { - return violations; - } - @Override public boolean isDenyTable(String name) { if (!config.isTableCheck()) { @@ -83,25 +42,4 @@ public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { } return !this.provider.checkDenyTable(name); } - - @Override - public boolean isSqlEndOfComment() { - return this.sqlEndOfComment; - } - - @Override - public void setSqlEndOfComment(boolean sqlEndOfComment) { - this.sqlEndOfComment = sqlEndOfComment; - } - - public void addWallUpdateCheckItem(WallUpdateCheckItem item) { - if (updateCheckItems == null) { - updateCheckItems = new ArrayList(); - } - updateCheckItems.add(item); - } - - public List getUpdateCheckItems() { - return updateCheckItems; - } } diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java index cbc939c891..57b9a0c1c5 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java @@ -18,31 +18,18 @@ package com.alibaba.druid.wall.spi; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.expr.*; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; import com.alibaba.druid.sql.dialect.sqlserver.ast.expr.SQLServerObjectReferenceExpr; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor; -import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitorAdapter; import com.alibaba.druid.wall.*; import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; -import java.util.ArrayList; -import java.util.List; - -public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements WallVisitor, SQLServerASTVisitor { - - private final WallConfig config; - private final WallProvider provider; - private final List violations = new ArrayList(); - private boolean sqlModified = false; - private boolean sqlEndOfComment = false; - private List updateCheckItems; +public class SQLServerWallVisitor extends WallVisitorBase implements WallVisitor, SQLServerASTVisitor { public SQLServerWallVisitor(WallProvider provider){ - this.config = provider.getConfig(); - this.provider = provider; + super (provider); } @Override @@ -50,36 +37,6 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements return DbType.sqlserver; } - @Override - public boolean isSqlModified() { - return sqlModified; - } - - @Override - public void setSqlModified(boolean sqlModified) { - this.sqlModified = sqlModified; - } - - @Override - public WallProvider getProvider() { - return provider; - } - - @Override - public WallConfig getConfig() { - return this.config; - } - - @Override - public void addViolation(Violation violation) { - this.violations.add(violation); - } - - @Override - public List getViolations() { - return violations; - } - @Override public boolean isDenyTable(String name) { if (!config.isTableCheck()) { @@ -156,25 +113,4 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements public boolean visit(SQLServerObjectReferenceExpr x) { return false; } - - @Override - public boolean isSqlEndOfComment() { - return this.sqlEndOfComment; - } - - @Override - public void setSqlEndOfComment(boolean sqlEndOfComment) { - this.sqlEndOfComment = sqlEndOfComment; - } - - public void addWallUpdateCheckItem(WallUpdateCheckItem item) { - if (updateCheckItems == null) { - updateCheckItems = new ArrayList(); - } - updateCheckItems.add(item); - } - - public List getUpdateCheckItems() { - return updateCheckItems; - } }