diff --git a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/BaseShardingEngine.java b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/BaseShardingEngine.java index affd495ea987e3f3d733ed8c858081d4df930aee..adfc4e27d90b83cb01f0f4b68606859acc0e234d 100644 --- a/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/BaseShardingEngine.java +++ b/sharding-core/sharding-core-entry/src/main/java/org/apache/shardingsphere/core/BaseShardingEngine.java @@ -24,9 +24,9 @@ import org.apache.shardingsphere.core.constant.properties.ShardingProperties; import org.apache.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import org.apache.shardingsphere.core.metadata.ShardingMetaData; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; -import org.apache.shardingsphere.core.rewrite.rewriter.EncryptSQLRewriter; -import org.apache.shardingsphere.core.rewrite.rewriter.ShardingParameterRewriter; -import org.apache.shardingsphere.core.rewrite.rewriter.ShardingSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.parameter.ShardingParameterRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.ShardingSQLRewriter; import org.apache.shardingsphere.core.route.RouteUnit; import org.apache.shardingsphere.core.route.SQLLogger; import org.apache.shardingsphere.core.route.SQLRouteResult; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java index 1318c0a1cf9f0b5472690bc16ca0ce7b46cb0588..9eaf6418976b6c1e30c998f41f5f89ac9013bbb5 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/SQLRewriteEngine.java @@ -22,9 +22,9 @@ import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; -import org.apache.shardingsphere.core.rewrite.rewriter.BaseSQLRewriter; -import org.apache.shardingsphere.core.rewrite.rewriter.ParameterRewriter; -import org.apache.shardingsphere.core.rewrite.rewriter.SQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.parameter.ParameterRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.BaseSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.SQLRewriter; import org.apache.shardingsphere.core.rewrite.token.BaseTokenGenerateEngine; import org.apache.shardingsphere.core.rewrite.token.EncryptTokenGenerateEngine; import org.apache.shardingsphere.core.rewrite.token.MasterSlaveTokenGenerateEngine; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ParameterRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ParameterRewriter.java similarity index 94% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ParameterRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ParameterRewriter.java index 62128746391f49fb892cac0b842a73cd6dd21615..a21711d569c58ece72d4bf708e571625c06b8103 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ParameterRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ParameterRewriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.parameter; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingParameterRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ShardingParameterRewriter.java similarity index 97% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingParameterRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ShardingParameterRewriter.java index 01644150577dedb2f1d7e224bc28b5e9af178b26..3aa16f849d2c01baa6962ee8faef9360c5833046 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingParameterRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/parameter/ShardingParameterRewriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.parameter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.core.constant.DatabaseType; 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/sql/BaseSQLRewriter.java similarity index 98% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/BaseSQLRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/BaseSQLRewriter.java index 58871c695e275486e9487f1cd58996864d60a862..d60c67424b36fe9fd7ca402bf4d47524f97b40b2 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/sql/BaseSQLRewriter.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.sql; 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.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; import org.apache.shardingsphere.core.rewrite.placeholder.InsertColumnsPlaceholder; +import org.apache.shardingsphere.core.rewrite.token.pojo.InsertColumnsToken; +import org.apache.shardingsphere.core.rewrite.token.pojo.Substitutable; import java.util.List; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java similarity index 99% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java index 87662ad6fbf43537df9fbd270e991574832c00ac..4a6499824cbb01754471105f054a33892fc5fd87 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/EncryptSQLRewriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.sql; import com.google.common.base.Optional; import com.google.common.base.Preconditions; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/SQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/SQLRewriter.java similarity index 95% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/SQLRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/SQLRewriter.java index 10782991ebb7525c3c861d4cb03429d0ff2b7772..97e6830338b1a17d6640aa4eea3891f5a5c90e25 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/SQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/SQLRewriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.sql; import org.apache.shardingsphere.core.parse.sql.token.SQLToken; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; diff --git a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriter.java b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java similarity index 99% rename from sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriter.java rename to sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java index 3e34c9615643e7072395bca60044ab921098ac77..6906b0560cd7fc89611d5c409916f00968d749d4 100644 --- a/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/ShardingSQLRewriter.java +++ b/sharding-core/sharding-core-rewrite/src/main/java/org/apache/shardingsphere/core/rewrite/rewriter/sql/ShardingSQLRewriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.core.rewrite.rewriter; +package org.apache.shardingsphere.core.rewrite.rewriter.sql; import com.google.common.base.Optional; import com.google.common.base.Strings; diff --git a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriterTest.java b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriterTest.java index 6d32c25d0387567e509760e94eb81b8e3b200b41..b5b6ff83ff111118f76d856d67e8deb91c7ea87a 100644 --- a/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriterTest.java +++ b/sharding-core/sharding-core-rewrite/src/test/java/org/apache/shardingsphere/core/rewrite/rewriter/EncryptSQLRewriterTest.java @@ -28,6 +28,7 @@ import org.apache.shardingsphere.core.optimize.result.OptimizeResult; import org.apache.shardingsphere.core.parse.entry.EncryptSQLParseEntry; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; import org.apache.shardingsphere.core.route.SQLUnit; import org.apache.shardingsphere.core.rule.EncryptRule; import org.junit.Before; 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 982cc50b4107d19d4b08245a600009c5117f5faa..5537908f258aaf595bba0b2606b36736ec617de5 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 @@ -53,6 +53,9 @@ import org.apache.shardingsphere.core.parse.sql.statement.dml.UpdateStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; import org.apache.shardingsphere.core.rewrite.builder.ParameterBuilder; import org.apache.shardingsphere.core.rewrite.builder.SQLBuilder; +import org.apache.shardingsphere.core.rewrite.rewriter.parameter.ShardingParameterRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.ShardingSQLRewriter; import org.apache.shardingsphere.core.rewrite.token.pojo.IndexToken; import org.apache.shardingsphere.core.rewrite.token.pojo.OrderByToken; import org.apache.shardingsphere.core.rewrite.token.pojo.RemoveToken; diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java index 3ac51a25324a6653daad47ebdb504ba4601d08eb..395ef32bd306d449ef29a8edadd6d9931b031451 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.core.optimize.OptimizeEngineFactory; import org.apache.shardingsphere.core.optimize.result.OptimizeResult; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; -import org.apache.shardingsphere.core.rewrite.rewriter.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; import org.apache.shardingsphere.core.route.SQLUnit; import org.apache.shardingsphere.shardingjdbc.jdbc.adapter.AbstractShardingPreparedStatementAdapter; import org.apache.shardingsphere.shardingjdbc.jdbc.core.connection.EncryptConnection; diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatement.java index 66aac0edc82df8844732f96ac1da4ceb8112d122..7b40d4041563fbfc0ce6e2602d1a0720f0885c76 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptStatement.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.core.optimize.OptimizeEngineFactory; import org.apache.shardingsphere.core.optimize.result.OptimizeResult; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; -import org.apache.shardingsphere.core.rewrite.rewriter.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; import org.apache.shardingsphere.shardingjdbc.jdbc.core.connection.EncryptConnection; import org.apache.shardingsphere.shardingjdbc.jdbc.core.resultset.EncryptResultSet; import org.apache.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationStatement; diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java index 4b27631023b050bb47b2eabfe7961aed7b6795d0..cd5db68c27763404845dffc617d94efbd0a3128d 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.core.optimize.OptimizeEngineFactory; import org.apache.shardingsphere.core.optimize.result.OptimizeResult; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; -import org.apache.shardingsphere.core.rewrite.rewriter.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; import org.apache.shardingsphere.core.route.RouteUnit; import org.apache.shardingsphere.core.route.SQLRouteResult; import org.apache.shardingsphere.core.route.SQLUnit; diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java index 9f26a2ca3464b49104de5cd9ec271cb72c3b7c54..53d9febc688b1b818326be5080f34ff9977c4fc3 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.core.optimize.OptimizeEngineFactory; import org.apache.shardingsphere.core.optimize.result.OptimizeResult; import org.apache.shardingsphere.core.parse.sql.statement.SQLStatement; import org.apache.shardingsphere.core.rewrite.SQLRewriteEngine; -import org.apache.shardingsphere.core.rewrite.rewriter.EncryptSQLRewriter; +import org.apache.shardingsphere.core.rewrite.rewriter.sql.EncryptSQLRewriter; import org.apache.shardingsphere.core.route.RouteUnit; import org.apache.shardingsphere.core.route.SQLRouteResult; import org.apache.shardingsphere.core.route.SQLUnit;