diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/BaseSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/BaseSQLRewriter.java index d432ff734b4910cb7ee1ceae89fa077000dafbea..58871c695e275486e9487f1cd58996864d60a862 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/BaseSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/BaseSQLRewriter.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.core.rewrite.rewriter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; +import org.apache.shardingsphere.core.rewrite.token.pojo.Substitutable; import org.apache.shardingsphere.core.rewrite.token.pojo.InsertColumnsToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/AggregationDistinctToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/AggregationDistinctToken.java index 7985c5f8cc5d2be43ae1daed4f50f6571ff8cf7e..c325a228e6ae8016232d1fb306e45921001576f7 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/AggregationDistinctToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/AggregationDistinctToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import com.google.common.base.Optional; import lombok.Getter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Aggregation distinct token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/EncryptColumnToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/EncryptColumnToken.java index e87187fe507d448df27cdef1cf3ffd721f1caa52..dd80879da20ec467f32dc26d0610b187bb52441c 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/EncryptColumnToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/EncryptColumnToken.java @@ -21,7 +21,6 @@ import lombok.Getter; import lombok.ToString; import org.apache.shardingsphere.core.parse.sql.context.condition.Column; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Encrypt column token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/IndexToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/IndexToken.java index da393306d962df04ba086ef48bd59e5ef30b76ca..121c7cdb6a86d446b6b280841046c661730a276a 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/IndexToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/IndexToken.java @@ -21,7 +21,6 @@ import lombok.Getter; import lombok.ToString; import org.apache.shardingsphere.core.parse.constant.QuoteCharacter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Index token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertAssistedColumnsToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertAssistedColumnsToken.java index de764509760c226979ea8c768bdf6c9af35dab89..1447f9f2800b8afb18269f24899ff770d13270a7 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertAssistedColumnsToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertAssistedColumnsToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import java.util.Collection; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertColumnsToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertColumnsToken.java index 279b014f642ad13d90a6437750e7f95a77ae7290..aade45c571d8683f48329aa45a70dc347d3fe8fb 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertColumnsToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertColumnsToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import java.util.Collection; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertGeneratedKeyToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertGeneratedKeyToken.java index fd78a771384c347a54d2276078d6647b96cafdb3..604887df7e1e6aca4e2b35c2130004b73fdb6220 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertGeneratedKeyToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertGeneratedKeyToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; /** diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddAssistedColumnsToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddAssistedColumnsToken.java index eea8642148f25ec60f894abe4215767e2583c600..902e274f705434d39d2458077454be059967f698 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddAssistedColumnsToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddAssistedColumnsToken.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import java.util.Collection; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddGeneratedKeyToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddGeneratedKeyToken.java index 0c04059f7a8f554fcff7683e1b839892444db514..ad8c4e1453cf89bad280f554cdd1b4beb1633719 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddGeneratedKeyToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetAddGeneratedKeyToken.java @@ -18,7 +18,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; /** diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetEncryptValueToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetEncryptValueToken.java index e962c9ad21174346d0ebae41aeb097c4af0caaa9..8f32a1b851be2effcb0bc0d048f720d2589227fb 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetEncryptValueToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertSetEncryptValueToken.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Insert set encrypt value token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertValuesToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertValuesToken.java index 6e9c1932414b8163fa93eefd33ffde515f6c5ecd..4a77ed32505ccf31a921ebdc3afddecdc4e35ba5 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertValuesToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/InsertValuesToken.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Insert values token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java index 9c72a883af35c6090af460e3d916f14435d720b6..c9822ccda17b83fbc18cc85cbe3c51aa249e5c81 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OffsetToken.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Offset token for limit. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OrderByToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OrderByToken.java index 3c631c3e4279e05c7b9d996bb29ce656768e0f54..46c1ce5cb90ebe36f621fabbe25870b4cef8a75e 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OrderByToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/OrderByToken.java @@ -17,7 +17,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; /** diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RemoveToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RemoveToken.java index 223c8c5ad3b7cf15e8cbe61cf0e3ddca0d3ff9c8..be0c88d2e5d603fbd95116aa653787ba63a4cafb 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RemoveToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RemoveToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import lombok.ToString; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Remove token. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RowCountToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RowCountToken.java index 9b4ae5abf530b5106eb7a080259986c76bf10cde..e1f7ede82514a4261c5a383868077a06590ce3c0 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RowCountToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/RowCountToken.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; /** * Row count token for limit. diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemPrefixToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemPrefixToken.java index 896b264cedf15184edbd96cdb3b1a0123c3d75ec..6b6172d532898d4d91e849da327924b1e579904c 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemPrefixToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemPrefixToken.java @@ -19,7 +19,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; /** diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemsToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemsToken.java index 7c73ffc5625e03b517c75605633a02a6ca185abd..f21d620409659c6f4b067f8bb74a0a7d53723c91 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemsToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/SelectItemsToken.java @@ -20,7 +20,6 @@ package org.apache.shardingsphere.core.rewrite.token.pojo; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import org.apache.shardingsphere.core.parse.sql.token.Attachable; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import java.util.Collection; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/TableToken.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/TableToken.java index d8b095c390683bbf3fd2156105cf5905b7408fc3..518303a9cb8df477b5e4771cdc421f08208e9b13 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/TableToken.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/token/pojo/TableToken.java @@ -21,7 +21,6 @@ import lombok.Getter; import lombok.ToString; import org.apache.shardingsphere.core.parse.constant.QuoteCharacter; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; -import org.apache.shardingsphere.core.parse.sql.token.Substitutable; import org.apache.shardingsphere.core.parse.util.SQLUtil; /** diff --git a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriterTest.java b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriterTest.java index b908a78d8af9413ba2f14689ef71051516cdf97a..0ea7a94cdb49c26ae7b57959dbd6765de9adfa89 100644 --- a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriterTest.java +++ b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriterTest.java @@ -537,9 +537,6 @@ public final class ShardingSQLRewriterTest { List parameters = new ArrayList<>(2); parameters.add(1); parameters.add("x"); - selectStatement.addSQLToken(new TableToken(7, 13, "table_x", QuoteCharacter.NONE)); - selectStatement.addSQLToken(new TableToken(31, 37, "table_x", QuoteCharacter.NONE)); - selectStatement.addSQLToken(new TableToken(58, 64, "table_x", QuoteCharacter.NONE)); selectStatement.getTables().add(new Table("table_x", "x")); selectStatement.getTables().add(new Table("table_y", "y")); routeResult = new SQLRouteResult(selectStatement);