From aaa3dcc7a1a140030db62742958b811d4289b459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= Date: Sat, 17 Mar 2012 00:40:01 +0800 Subject: [PATCH] refactor --- .../filter/wall/spi/MySqlWallProvider.java | 20 +++++++++---------- .../filter/wall/spi/OracleWallProvider.java | 20 +++++++++---------- .../wall/mysql/permit-function-default.txt} | 0 .../wall/mysql/permit-schema-default.txt} | 0 .../wall/oracle/permit-function-default.txt} | 0 .../wall/oracle/permit-name-default.txt} | 0 .../wall/oracle/permit-object-default.txt} | 0 .../wall/oracle/permit-schema-default.txt} | 0 .../wall/oracle/permit-table-default.txt} | 0 9 files changed, 20 insertions(+), 20 deletions(-) rename src/main/resources/META-INF/{druid-filter-wall-permit-function-mysql-default.txt => druid/wall/mysql/permit-function-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-schema-mysql-default.txt => druid/wall/mysql/permit-schema-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-function-oracle-default.txt => druid/wall/oracle/permit-function-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-name-oracle-default.txt => druid/wall/oracle/permit-name-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-object-oracle-default.txt => druid/wall/oracle/permit-object-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-schema-oracle-default.txt => druid/wall/oracle/permit-schema-default.txt} (100%) rename src/main/resources/META-INF/{druid-filter-wall-permit-table-oracle-default.txt => druid/wall/oracle/permit-table-default.txt} (100%) diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java b/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java index 1b73473e56..e00e80bef3 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java +++ b/src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallProvider.java @@ -31,19 +31,19 @@ public class MySqlWallProvider extends WallProvider { } public void loadExtend() { - loadResource(config.getPermitNames(), "META-INF/druid-filter-wall-permit-name-mysql.txt"); - loadResource(config.getPermitSchemas(), "META-INF/druid-filter-wall-permit-schema-mysql.txt"); - loadResource(config.getPermitFunctions(), "META-INF/druid-filter-wall-permit-function-mysql.txt"); - loadResource(config.getPermitTables(), "META-INF/druid-filter-wall-permit-table-mysql.txt"); - loadResource(config.getPermitObjects(), "META-INF/druid-filter-wall-permit-object-mysql.txt"); + loadResource(config.getPermitNames(), "META-INF/druid/wall/mysql/permit-name.txt"); + loadResource(config.getPermitSchemas(), "META-INF/druid/wall/mysql/permit-schema.txt"); + loadResource(config.getPermitFunctions(), "META-INF/druid/wall/mysql/permit-function.txt"); + loadResource(config.getPermitTables(), "META-INF/druid/wall/mysql/permit-table.txt"); + loadResource(config.getPermitObjects(), "META-INF/druid/wall/mysql/permit-object.txt"); } public void loadDefault() { - loadResource(config.getPermitNames(), "META-INF/druid-filter-wall-permit-name-mysql-default.txt"); - loadResource(config.getPermitSchemas(), "META-INF/druid-filter-wall-permit-schema-mysql-default.txt"); - loadResource(config.getPermitFunctions(), "META-INF/druid-filter-wall-permit-function-mysql-default.txt"); - loadResource(config.getPermitTables(), "META-INF/druid-filter-wall-permit-table-mysql-default.txt"); - loadResource(config.getPermitObjects(), "META-INF/druid-filter-wall-permit-object-mysql-default.txt"); + loadResource(config.getPermitNames(), "META-INF/druid/wall/mysql/permit-name-default.txt"); + loadResource(config.getPermitSchemas(), "META-INF/druid/wall/mysql/permit-schema-default.txt"); + loadResource(config.getPermitFunctions(), "META-INF/druid/wall/mysql/permit-function-default.txt"); + loadResource(config.getPermitTables(), "META-INF/druid/wall/mysql/permit-table-default.txt"); + loadResource(config.getPermitObjects(), "META-INF/druid/wall/mysql/permit-object-default.txt"); } @Override diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java index 6ceba749b0..0e64de19dd 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java +++ b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallProvider.java @@ -31,19 +31,19 @@ public class OracleWallProvider extends WallProvider { } public void loadExtend() { - loadResource(config.getPermitNames(), "META-INF/druid-filter-wall-permit-name-oracle.txt"); - loadResource(config.getPermitSchemas(), "META-INF/druid-filter-wall-permit-schema-oracle.txt"); - loadResource(config.getPermitFunctions(), "META-INF/druid-filter-wall-permit-function-oracle.txt"); - loadResource(config.getPermitTables(), "META-INF/druid-filter-wall-permit-table-oracle.txt"); - loadResource(config.getPermitObjects(), "META-INF/druid-filter-wall-permit-object-oracle.txt"); + loadResource(config.getPermitNames(), "META-INF/druid/wall/oracle/permit-name.txt"); + loadResource(config.getPermitSchemas(), "META-INF/druid/wall/oracle/permit-schema.txt"); + loadResource(config.getPermitFunctions(), "META-INF/druid/wall/oracle/permit-function.txt"); + loadResource(config.getPermitTables(), "META-INF/druid/wall/oracle/permit-table.txt"); + loadResource(config.getPermitObjects(), "META-INF/druid/wall/oracle/permit-object.txt"); } public void loadDefault() { - loadResource(config.getPermitNames(), "META-INF/druid-filter-wall-permit-name-oracle-default.txt"); - loadResource(config.getPermitSchemas(), "META-INF/druid-filter-wall-permit-schema-oracle-default.txt"); - loadResource(config.getPermitFunctions(), "META-INF/druid-filter-wall-permit-function-oracle-default.txt"); - loadResource(config.getPermitTables(), "META-INF/druid-filter-wall-permit-table-oracle-default.txt"); - loadResource(config.getPermitObjects(), "META-INF/druid-filter-wall-permit-object-oracle-default.txt"); + loadResource(config.getPermitNames(), "META-INF/druid/wall/oracle/permit-name-default.txt"); + loadResource(config.getPermitSchemas(), "META-INF/druid/wall/oracle/permit-schema-default.txt"); + loadResource(config.getPermitFunctions(), "META-INF/druid/wall/oracle/permit-function-default.txt"); + loadResource(config.getPermitTables(), "META-INF/druid/wall/oracle/permit-table-default.txt"); + loadResource(config.getPermitObjects(), "META-INF/druid/wall/oracle/permit-object-default.txt"); } @Override diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-function-mysql-default.txt b/src/main/resources/META-INF/druid/wall/mysql/permit-function-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-function-mysql-default.txt rename to src/main/resources/META-INF/druid/wall/mysql/permit-function-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql-default.txt b/src/main/resources/META-INF/druid/wall/mysql/permit-schema-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-schema-mysql-default.txt rename to src/main/resources/META-INF/druid/wall/mysql/permit-schema-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-function-oracle-default.txt b/src/main/resources/META-INF/druid/wall/oracle/permit-function-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-function-oracle-default.txt rename to src/main/resources/META-INF/druid/wall/oracle/permit-function-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-name-oracle-default.txt b/src/main/resources/META-INF/druid/wall/oracle/permit-name-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-name-oracle-default.txt rename to src/main/resources/META-INF/druid/wall/oracle/permit-name-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-object-oracle-default.txt b/src/main/resources/META-INF/druid/wall/oracle/permit-object-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-object-oracle-default.txt rename to src/main/resources/META-INF/druid/wall/oracle/permit-object-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle-default.txt b/src/main/resources/META-INF/druid/wall/oracle/permit-schema-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-schema-oracle-default.txt rename to src/main/resources/META-INF/druid/wall/oracle/permit-schema-default.txt diff --git a/src/main/resources/META-INF/druid-filter-wall-permit-table-oracle-default.txt b/src/main/resources/META-INF/druid/wall/oracle/permit-table-default.txt similarity index 100% rename from src/main/resources/META-INF/druid-filter-wall-permit-table-oracle-default.txt rename to src/main/resources/META-INF/druid/wall/oracle/permit-table-default.txt