revise #727: adjust package structure

sharding-core/src/main/java/io/shardingjdbc/core/optimizer/OptimizeEngine.java

@@ -17,7 +17,7 @@
 
 package io.shardingjdbc.core.optimizer;
 
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 
 /**
  * Optimize engine.

sharding-core/src/main/java/io/shardingjdbc/core/optimizer/OptimizeEngineFactory.java

@@ -17,11 +17,13 @@
 
 package io.shardingjdbc.core.optimizer;
 
+import io.shardingjdbc.core.optimizer.insert.InsertOptimizeEngine;
+import io.shardingjdbc.core.optimizer.query.QueryOptimizeEngine;
 import io.shardingjdbc.core.parsing.parser.sql.SQLStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dml.DMLStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dml.insert.InsertStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dql.select.SelectStatement;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

sharding-core/src/main/java/io/shardingjdbc/core/routing/sharding/ShardingCondition.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/condition/ShardingCondition.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingjdbc.core.routing.sharding;
+package io.shardingjdbc.core.optimizer.condition;
 
 import io.shardingjdbc.core.api.algorithm.sharding.ShardingValue;
 import lombok.Getter;

sharding-core/src/main/java/io/shardingjdbc/core/routing/sharding/ShardingConditions.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/condition/ShardingConditions.java

@@ -15,8 +15,9 @@
  * </p>
  */
 
-package io.shardingjdbc.core.routing.sharding;
+package io.shardingjdbc.core.optimizer.condition;
 
+import io.shardingjdbc.core.optimizer.query.AlwaysFalseShardingCondition;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

sharding-core/src/main/java/io/shardingjdbc/core/optimizer/InsertOptimizeEngine.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/insert/InsertOptimizeEngine.java

@@ -15,16 +15,17 @@
  * </p>
  */
 
-package io.shardingjdbc.core.optimizer;
+package io.shardingjdbc.core.optimizer.insert;
 
 import io.shardingjdbc.core.api.algorithm.sharding.ListShardingValue;
+import io.shardingjdbc.core.optimizer.OptimizeEngine;
+import io.shardingjdbc.core.optimizer.condition.ShardingCondition;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 import io.shardingjdbc.core.parsing.parser.context.condition.AndCondition;
 import io.shardingjdbc.core.parsing.parser.context.condition.Condition;
 import io.shardingjdbc.core.parsing.parser.context.condition.GeneratedKeyCondition;
 import io.shardingjdbc.core.parsing.parser.context.condition.OrCondition;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
-import io.shardingjdbc.core.routing.sharding.ShardingCondition;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import lombok.RequiredArgsConstructor;
 
 import java.util.Collection;

sharding-core/src/main/java/io/shardingjdbc/core/routing/sharding/AlwaysFalseShardingCondition.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/query/AlwaysFalseShardingCondition.java

@@ -15,7 +15,9 @@
  * </p>
  */
 
-package io.shardingjdbc.core.routing.sharding;
+package io.shardingjdbc.core.optimizer.query;
+
+import io.shardingjdbc.core.optimizer.condition.ShardingCondition;
 
 /**
  * Always false sharding condition.

sharding-core/src/main/java/io/shardingjdbc/core/optimizer/AlwaysFalseShardingValue.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/query/AlwaysFalseShardingValue.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingjdbc.core.optimizer;
+package io.shardingjdbc.core.optimizer.query;
 
 import io.shardingjdbc.core.api.algorithm.sharding.ShardingValue;
 

sharding-core/src/main/java/io/shardingjdbc/core/optimizer/QueryOptimizeEngine.java → sharding-core/src/main/java/io/shardingjdbc/core/optimizer/query/QueryOptimizeEngine.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingjdbc.core.optimizer;
+package io.shardingjdbc.core.optimizer.query;
 
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Range;
@@ -24,13 +24,13 @@ import io.shardingjdbc.core.api.algorithm.sharding.RangeShardingValue;
 import io.shardingjdbc.core.api.algorithm.sharding.ShardingValue;
 import io.shardingjdbc.core.constant.ShardingOperator;
 import io.shardingjdbc.core.exception.ShardingJdbcException;
+import io.shardingjdbc.core.optimizer.OptimizeEngine;
+import io.shardingjdbc.core.optimizer.condition.ShardingCondition;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 import io.shardingjdbc.core.parsing.parser.context.condition.AndCondition;
 import io.shardingjdbc.core.parsing.parser.context.condition.Column;
 import io.shardingjdbc.core.parsing.parser.context.condition.Condition;
 import io.shardingjdbc.core.parsing.parser.context.condition.OrCondition;
-import io.shardingjdbc.core.routing.sharding.AlwaysFalseShardingCondition;
-import io.shardingjdbc.core.routing.sharding.ShardingCondition;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayList;

sharding-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java

@@ -38,7 +38,7 @@ import io.shardingjdbc.core.parsing.parser.token.TableToken;
 import io.shardingjdbc.core.rewrite.placeholder.IndexPlaceholder;
 import io.shardingjdbc.core.rewrite.placeholder.SchemaPlaceholder;
 import io.shardingjdbc.core.rewrite.placeholder.TablePlaceholder;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import io.shardingjdbc.core.routing.type.TableUnit;
 import io.shardingjdbc.core.routing.type.TableUnits;
 import io.shardingjdbc.core.routing.type.complex.CartesianTableReference;

sharding-core/src/main/java/io/shardingjdbc/core/routing/SQLRouteResult.java

@@ -18,7 +18,7 @@
 package io.shardingjdbc.core.routing;
 
 import io.shardingjdbc.core.parsing.parser.sql.SQLStatement;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

sharding-core/src/main/java/io/shardingjdbc/core/routing/sharding/GeneratedKey.java → sharding-core/src/main/java/io/shardingjdbc/core/routing/router/GeneratedKey.java

@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingjdbc.core.routing.sharding;
+package io.shardingjdbc.core.routing.router;
 
 import io.shardingjdbc.core.parsing.parser.context.condition.Column;
 import io.shardingjdbc.core.parsing.parser.context.condition.GeneratedKeyCondition;

sharding-core/src/main/java/io/shardingjdbc/core/routing/router/ParsingSQLRouter.java

@@ -36,8 +36,7 @@ import io.shardingjdbc.core.rewrite.SQLBuilder;
 import io.shardingjdbc.core.rewrite.SQLRewriteEngine;
 import io.shardingjdbc.core.routing.SQLExecutionUnit;
 import io.shardingjdbc.core.routing.SQLRouteResult;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 import io.shardingjdbc.core.routing.type.RoutingEngine;
 import io.shardingjdbc.core.routing.type.RoutingResult;
 import io.shardingjdbc.core.routing.type.TableUnit;

sharding-core/src/main/java/io/shardingjdbc/core/routing/type/complex/ComplexRoutingEngine.java

@@ -21,7 +21,7 @@ import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import io.shardingjdbc.core.exception.ShardingJdbcException;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 import io.shardingjdbc.core.routing.type.RoutingEngine;
 import io.shardingjdbc.core.routing.type.RoutingResult;
 import io.shardingjdbc.core.routing.type.standard.StandardRoutingEngine;

sharding-core/src/main/java/io/shardingjdbc/core/routing/type/standard/StandardRoutingEngine.java

@@ -22,7 +22,7 @@ import com.google.common.base.Preconditions;
 import io.shardingjdbc.core.api.algorithm.sharding.ShardingValue;
 import io.shardingjdbc.core.hint.HintManagerHolder;
 import io.shardingjdbc.core.hint.ShardingKey;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
 import io.shardingjdbc.core.routing.strategy.ShardingStrategy;
 import io.shardingjdbc.core.routing.type.RoutingEngine;
 import io.shardingjdbc.core.routing.type.RoutingResult;

sharding-core/src/test/java/io/shardingjdbc/core/optimizer/InsertOptimizeEngineTest.java

@@ -18,14 +18,15 @@
 package io.shardingjdbc.core.optimizer;
 
 import io.shardingjdbc.core.api.algorithm.sharding.ListShardingValue;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
+import io.shardingjdbc.core.optimizer.insert.InsertOptimizeEngine;
 import io.shardingjdbc.core.parsing.parser.context.condition.AndCondition;
 import io.shardingjdbc.core.parsing.parser.context.condition.Column;
 import io.shardingjdbc.core.parsing.parser.context.condition.Condition;
 import io.shardingjdbc.core.parsing.parser.context.condition.OrCondition;
 import io.shardingjdbc.core.parsing.parser.expression.SQLNumberExpression;
 import io.shardingjdbc.core.parsing.parser.expression.SQLPlaceholderExpression;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import org.junit.Test;
 
 import java.util.Collections;

sharding-core/src/test/java/io/shardingjdbc/core/optimizer/QueryOptimizeEngineTest.java

@@ -21,14 +21,15 @@ import com.google.common.collect.Range;
 import io.shardingjdbc.core.api.algorithm.sharding.ListShardingValue;
 import io.shardingjdbc.core.api.algorithm.sharding.RangeShardingValue;
 import io.shardingjdbc.core.api.algorithm.sharding.ShardingValue;
+import io.shardingjdbc.core.optimizer.condition.ShardingCondition;
+import io.shardingjdbc.core.optimizer.condition.ShardingConditions;
+import io.shardingjdbc.core.optimizer.query.QueryOptimizeEngine;
 import io.shardingjdbc.core.parsing.parser.context.condition.AndCondition;
 import io.shardingjdbc.core.parsing.parser.context.condition.Column;
 import io.shardingjdbc.core.parsing.parser.context.condition.Condition;
 import io.shardingjdbc.core.parsing.parser.context.condition.OrCondition;
 import io.shardingjdbc.core.parsing.parser.expression.SQLExpression;
 import io.shardingjdbc.core.parsing.parser.expression.SQLNumberExpression;
-import io.shardingjdbc.core.routing.sharding.ShardingCondition;
-import io.shardingjdbc.core.routing.sharding.ShardingConditions;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 

sharding-core/src/test/java/io/shardingjdbc/core/rewrite/SQLRewriteEngineTest.java

@@ -36,7 +36,7 @@ import io.shardingjdbc.core.parsing.parser.token.OrderByToken;
 import io.shardingjdbc.core.parsing.parser.token.RowCountToken;
 import io.shardingjdbc.core.parsing.parser.token.SchemaToken;
 import io.shardingjdbc.core.parsing.parser.token.TableToken;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import io.shardingjdbc.core.routing.type.TableUnit;
 import io.shardingjdbc.core.routing.type.complex.CartesianTableReference;
 import io.shardingjdbc.core.rule.ShardingRule;

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/statement/ShardingPreparedStatement.java

@@ -38,7 +38,7 @@ import io.shardingjdbc.core.parsing.parser.sql.dal.DALStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dml.insert.InsertStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dql.DQLStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dql.select.SelectStatement;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import io.shardingjdbc.core.routing.PreparedStatementRoutingEngine;
 import io.shardingjdbc.core.routing.SQLExecutionUnit;
 import io.shardingjdbc.core.routing.SQLRouteResult;

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/statement/ShardingStatement.java

@@ -34,7 +34,7 @@ import io.shardingjdbc.core.parsing.parser.sql.dal.DALStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dml.insert.InsertStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dql.DQLStatement;
 import io.shardingjdbc.core.parsing.parser.sql.dql.select.SelectStatement;
-import io.shardingjdbc.core.routing.sharding.GeneratedKey;
+import io.shardingjdbc.core.routing.router.GeneratedKey;
 import io.shardingjdbc.core.routing.SQLExecutionUnit;
 import io.shardingjdbc.core.routing.SQLRouteResult;
 import io.shardingjdbc.core.routing.StatementRoutingEngine;