refactor parseWhere

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/mysql/MySQLSelectParser.java

@@ -37,8 +37,6 @@ public final class MySQLSelectParser extends AbstractSelectParser {
     
     private final MySQLSelectOptionSQLParser selectOptionSQLParser;
     
-    private final WhereSQLParser whereSQLParser;
-    
     private final GroupBySQLParser groupBySQLParser;
     
     private final HavingSQLParser havingSQLParser;
@@ -50,9 +48,9 @@ public final class MySQLSelectParser extends AbstractSelectParser {
     private final SelectRestSQLParser selectRestSQLParser;
     
     public MySQLSelectParser(final ShardingRule shardingRule, final LexerEngine lexerEngine) {
-        super(shardingRule, lexerEngine, new MySQLDistinctSQLParser(lexerEngine), new SelectListSQLParser(shardingRule, lexerEngine), new MySQLTableSQLParser(shardingRule, lexerEngine));
+        super(shardingRule, lexerEngine, 
+                new MySQLDistinctSQLParser(lexerEngine), new SelectListSQLParser(shardingRule, lexerEngine), new MySQLTableSQLParser(shardingRule, lexerEngine), new WhereSQLParser(lexerEngine));
         selectOptionSQLParser = new MySQLSelectOptionSQLParser(lexerEngine);
-        whereSQLParser = new WhereSQLParser(lexerEngine);
         groupBySQLParser = new MySQLGroupBySQLParser(lexerEngine);
         havingSQLParser = new HavingSQLParser(lexerEngine);
         orderBySQLParser = new MySQLOrderBySQLParser(lexerEngine);
@@ -66,7 +64,7 @@ public final class MySQLSelectParser extends AbstractSelectParser {
         selectOptionSQLParser.parse();
         parseSelectList(selectStatement, getItems());
         parseFrom(selectStatement);
-        whereSQLParser.parse(getShardingRule(), selectStatement, getItems());
+        parseWhere(getShardingRule(), selectStatement, getItems());
         groupBySQLParser.parse(selectStatement);
         havingSQLParser.parse();
         orderBySQLParser.parse(selectStatement);

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/oracle/OracleSelectParser.java

@@ -23,7 +23,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.GroupBySQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.HavingSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.OrderBySQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.SelectRestSQLParser;
-import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.WhereSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.AbstractSelectParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.SelectStatement;
 
@@ -34,8 +33,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.Sel
  */
 public final class OracleSelectParser extends AbstractSelectParser {
     
-    private final WhereSQLParser whereSQLParser;
-    
     private final OracleHierarchicalQueryClauseParser hierarchicalQueryClauseParser;
     
     private final GroupBySQLParser groupBySQLParser;
@@ -51,8 +48,9 @@ public final class OracleSelectParser extends AbstractSelectParser {
     private final SelectRestSQLParser selectRestSQLParser;
     
     public OracleSelectParser(final ShardingRule shardingRule, final LexerEngine lexerEngine) {
-        super(shardingRule, lexerEngine, new OracleDistinctSQLParser(lexerEngine), new OracleSelectListSQLParser(shardingRule, lexerEngine), new OracleTableSQLParser(shardingRule, lexerEngine));
-        whereSQLParser = new OracleWhereSQLParser(lexerEngine);
+        super(shardingRule, lexerEngine, 
+                new OracleDistinctSQLParser(lexerEngine), new OracleSelectListSQLParser(shardingRule, lexerEngine), 
+                new OracleTableSQLParser(shardingRule, lexerEngine), new OracleWhereSQLParser(lexerEngine));
         hierarchicalQueryClauseParser = new OracleHierarchicalQueryClauseParser(shardingRule, lexerEngine);
         groupBySQLParser = new OracleGroupBySQLParser(lexerEngine);
         havingSQLParser = new HavingSQLParser(lexerEngine);
@@ -67,7 +65,7 @@ public final class OracleSelectParser extends AbstractSelectParser {
         parseDistinct();
         parseSelectList(selectStatement, getItems());
         parseFrom(selectStatement);
-        whereSQLParser.parse(getShardingRule(), selectStatement, getItems());
+        parseWhere(getShardingRule(), selectStatement, getItems());
         hierarchicalQueryClauseParser.parse(selectStatement);
         groupBySQLParser.parse(selectStatement);
         havingSQLParser.parse();

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/postgresql/PostgreSQLSelectParser.java

@@ -37,8 +37,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.Sel
  */
 public final class PostgreSQLSelectParser extends AbstractSelectParser {
     
-    private final WhereSQLParser whereSQLParser;
-    
     private final GroupBySQLParser groupBySQLParser;
     
     private final HavingSQLParser havingSQLParser;
@@ -52,8 +50,8 @@ public final class PostgreSQLSelectParser extends AbstractSelectParser {
     private final SelectRestSQLParser selectRestSQLParser;
     
     public PostgreSQLSelectParser(final ShardingRule shardingRule, final LexerEngine lexerEngine) {
-        super(shardingRule, lexerEngine, new DistinctSQLParser(lexerEngine), new SelectListSQLParser(shardingRule, lexerEngine), new TableSQLParser(shardingRule, lexerEngine));
-        whereSQLParser = new WhereSQLParser(lexerEngine);
+        super(shardingRule, lexerEngine, new DistinctSQLParser(lexerEngine), 
+                new SelectListSQLParser(shardingRule, lexerEngine), new TableSQLParser(shardingRule, lexerEngine), new WhereSQLParser(lexerEngine));
         groupBySQLParser = new GroupBySQLParser(lexerEngine);
         havingSQLParser = new HavingSQLParser(lexerEngine);
         orderBySQLParser = new PostgreSQLOrderBySQLParser(lexerEngine);
@@ -67,7 +65,7 @@ public final class PostgreSQLSelectParser extends AbstractSelectParser {
         parseDistinct();
         parseSelectList(selectStatement, getItems());
         parseFrom(selectStatement);
-        whereSQLParser.parse(getShardingRule(), selectStatement, getItems());
+        parseWhere(getShardingRule(), selectStatement, getItems());
         groupBySQLParser.parse(selectStatement);
         havingSQLParser.parse();
         orderBySQLParser.parse(selectStatement);

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/dialect/sqlserver/SQLServerSelectParser.java

@@ -25,7 +25,6 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.GroupBySQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.HavingSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.OrderBySQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.SelectRestSQLParser;
-import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.WhereSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.AbstractSelectParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.dql.select.SelectStatement;
 
@@ -38,8 +37,6 @@ public final class SQLServerSelectParser extends AbstractSelectParser {
     
     private final SQLServerTopParser sqlServerTopParser;
     
-    private final WhereSQLParser whereSQLParser;
-    
     private final GroupBySQLParser groupBySQLParser;
     
     private final HavingSQLParser havingSQLParser;
@@ -53,9 +50,10 @@ public final class SQLServerSelectParser extends AbstractSelectParser {
     private final SelectRestSQLParser selectRestSQLParser;
     
     public SQLServerSelectParser(final ShardingRule shardingRule, final LexerEngine lexerEngine) {
-        super(shardingRule, lexerEngine, new DistinctSQLParser(lexerEngine), new SQLServerSelectListSQLParser(shardingRule, lexerEngine), new SQLServerTableSQLParser(shardingRule, lexerEngine));
+        super(shardingRule, lexerEngine, 
+                new DistinctSQLParser(lexerEngine), new SQLServerSelectListSQLParser(shardingRule, lexerEngine), new SQLServerTableSQLParser(shardingRule, lexerEngine), 
+                new SQLServerWhereSQLParser(lexerEngine));
         sqlServerTopParser = new SQLServerTopParser(lexerEngine);
-        whereSQLParser = new SQLServerWhereSQLParser(lexerEngine);
         groupBySQLParser = new GroupBySQLParser(lexerEngine);
         havingSQLParser = new HavingSQLParser(lexerEngine);
         orderBySQLParser = new MySQLOrderBySQLParser(lexerEngine);
@@ -70,7 +68,7 @@ public final class SQLServerSelectParser extends AbstractSelectParser {
         parseTop(selectStatement);
         parseSelectList(selectStatement, getItems());
         parseFrom(selectStatement);
-        whereSQLParser.parse(getShardingRule(), selectStatement, getItems());
+        parseWhere(getShardingRule(), selectStatement, getItems());
         groupBySQLParser.parse(selectStatement);
         havingSQLParser.parse();
         orderBySQLParser.parse(selectStatement);

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/dql/select/AbstractSelectParser.java

@@ -30,6 +30,7 @@ import com.dangdang.ddframe.rdb.sharding.parsing.parser.exception.SQLParsingUnsu
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.DistinctSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.SelectListSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.TableSQLParser;
+import com.dangdang.ddframe.rdb.sharding.parsing.parser.sql.WhereSQLParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.statement.SQLStatementParser;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.ItemsToken;
 import com.dangdang.ddframe.rdb.sharding.parsing.parser.token.OrderByToken;
@@ -68,6 +69,8 @@ public abstract class AbstractSelectParser implements SQLStatementParser {
     
     private final TableSQLParser tableSQLParser;
     
+    private final WhereSQLParser whereSQLParser;
+    
     private final List<SelectItem> items = new LinkedList<>();
     
     @Override
@@ -91,6 +94,14 @@ public abstract class AbstractSelectParser implements SQLStatementParser {
     
     protected abstract void parseInternal(final SelectStatement selectStatement);
     
+    protected final void parseDistinct() {
+        distinctSQLParser.parse();
+    }
+    
+    protected final void parseSelectList(final SelectStatement selectStatement, final List<SelectItem> items) {
+        selectListSQLParser.parse(selectStatement, items);
+    }
+    
     protected final void parseFrom(final SelectStatement selectStatement) {
         if (lexerEngine.equalAny(DefaultKeyword.INTO)) {
             throw new SQLParsingUnsupportedException(DefaultKeyword.INTO);
@@ -111,12 +122,8 @@ public abstract class AbstractSelectParser implements SQLStatementParser {
         tableSQLParser.parseJoinTable(selectStatement);
     }
     
-    protected final void parseDistinct() {
-        distinctSQLParser.parse();
-    }
-    
-    protected final void parseSelectList(final SelectStatement selectStatement, final List<SelectItem> items) {
-        selectListSQLParser.parse(selectStatement, items);
+    protected final void parseWhere(final ShardingRule shardingRule, final SelectStatement selectStatement, final List<SelectItem> items) {
+        whereSQLParser.parse(shardingRule, selectStatement, items);
     }
     
     private void appendDerivedColumns(final SelectStatement selectStatement) {