From c5b5023dd0f55c861cfacc4e950d25184f1e870a Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 1 Aug 2013 21:42:17 +0800 Subject: [PATCH] refactor --- .../sql/visitor/ParameterizedVisitor.java | 2 +- .../druid/sql/visitor/PrintableVisitor.java | 23 +++++++++++++++++++ .../sql/visitor/SQLASTOutputVisitor.java | 2 +- .../sql/visitor/SQLASTOutputVisitorUtils.java | 19 +++++++++++++-- .../sql/visitor/SQLPrintableVisitor.java | 8 ------- 5 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/sql/visitor/PrintableVisitor.java delete mode 100644 src/main/java/com/alibaba/druid/sql/visitor/SQLPrintableVisitor.java diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java index 348baa7d33..16db80a22f 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedVisitor.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.visitor; -public interface ParameterizedVisitor extends SQLPrintableVisitor { +public interface ParameterizedVisitor extends PrintableVisitor { int getReplaceCount(); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/PrintableVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/PrintableVisitor.java new file mode 100644 index 0000000000..0fb29a18a3 --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/visitor/PrintableVisitor.java @@ -0,0 +1,23 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.sql.visitor; + +public interface PrintableVisitor extends SQLASTVisitor { + + void print(char value); + + void print(String text); +} 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 cbd639ddbc..ff2c5e471e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -120,7 +120,7 @@ import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.ast.statement.SQLUseStatement; import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause; -public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements SQLPrintableVisitor { +public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements PrintableVisitor { protected final Appendable appender; private String indent = "\t"; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java index db567b72c4..9ebecce55a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitorUtils.java @@ -1,3 +1,18 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.alibaba.druid.sql.visitor; import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; @@ -5,12 +20,12 @@ import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; public class SQLASTOutputVisitorUtils { - public static boolean visit(SQLPrintableVisitor visitor, SQLIntegerExpr x) { + public static boolean visit(PrintableVisitor visitor, SQLIntegerExpr x) { visitor.print(x.getNumber().toString()); return false; } - public static boolean visit(SQLPrintableVisitor visitor, SQLNumberExpr x) { + public static boolean visit(PrintableVisitor visitor, SQLNumberExpr x) { visitor.print(x.getNumber().toString()); return false; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLPrintableVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLPrintableVisitor.java deleted file mode 100644 index bc251da9a0..0000000000 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLPrintableVisitor.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.alibaba.druid.sql.visitor; - -public interface SQLPrintableVisitor extends SQLASTVisitor { - - void print(char value); - - void print(String text); -}