From c39e8698ab62a81df02c45d8dfaccdc395f21154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Sun, 18 Mar 2012 00:14:23 +0800 Subject: [PATCH] refactor --- .../alibaba/druid/filter/wall/WallProvider.java | 4 ++++ .../com/alibaba/druid/filter/wall/WallUtils.java | 14 ++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java b/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java index 8f4309b584..6c4d10ab91 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/filter/wall/WallProvider.java @@ -50,6 +50,10 @@ public abstract class WallProvider { public abstract SQLStatementParser createParser(String sql); public abstract WallVisitor createWallVisitor(); + + public boolean checkValid(String sql) { + return check(sql).size() == 0; + } public List check(String sql) { // first step, check whiteList diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java b/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java index c629e5e5d8..e25fbe2d3b 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java +++ b/src/main/java/com/alibaba/druid/filter/wall/WallUtils.java @@ -1,7 +1,5 @@ package com.alibaba.druid.filter.wall; -import java.util.List; - import com.alibaba.druid.filter.wall.spi.MySqlWallProvider; import com.alibaba.druid.filter.wall.spi.OracleWallProvider; @@ -9,25 +7,21 @@ public class WallUtils { public static boolean isValidateMySql(String sql) { MySqlWallProvider provider = new MySqlWallProvider(); - List violations = provider.check(sql); - return violations.size() == 0; + return provider.checkValid(sql); } public static boolean isValidateMySql(String sql, WallConfig config) { MySqlWallProvider provider = new MySqlWallProvider(config); - List violations = provider.check(sql); - return violations.size() == 0; + return provider.checkValid(sql); } public static boolean isValidateOracle(String sql) { OracleWallProvider provider = new OracleWallProvider(); - List violations = provider.check(sql); - return violations.size() == 0; + return provider.checkValid(sql); } public static boolean isValidateOracle(String sql, WallConfig config) { OracleWallProvider provider = new OracleWallProvider(config); - List violations = provider.check(sql); - return violations.size() == 0; + return provider.checkValid(sql); } }