diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java index cbb41ab52857e..7e87614f3cf73 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.query; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CountBroadcastRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CountBroadcastRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java index bcb4baf2d23fa..522ae2dc99968 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.query; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.ShowBroadcastTableRulesStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.ShowBroadcastTableRulesStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdater.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdater.java index 41a6c8d6f5ac2..30eee07bc4cef 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdater.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.update; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CreateBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionCreateUpdater; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdater.java b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdater.java index 3ccdf5918aaed..d26ca4a25f2f6 100644 --- a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdater.java +++ b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdater.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.update; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.DropBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.distsql.handler.update.RuleDefinitionDropUpdater; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutorTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutorTest.java index 6bb51e9def4d3..6883530452548 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutorTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/CountBroadcastRuleExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.query; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CountBroadcastRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CountBroadcastRuleStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutorTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutorTest.java index 139e9ff1ca194..0f8d0b9b05661 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutorTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.query; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.ShowBroadcastTableRulesStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.ShowBroadcastTableRulesStatement; import org.apache.shardingsphere.broadcast.rule.BroadcastRule; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdaterTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdaterTest.java index cf8b6b322d178..305fb34fdcf71 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdaterTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/CreateBroadcastTableRuleStatementUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.update; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CreateBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.handler.exception.rule.DuplicateRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.junit.jupiter.api.Test; diff --git a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdaterTest.java b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdaterTest.java index 474ebc62a311d..e9b73a8ecc705 100644 --- a/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdaterTest.java +++ b/features/broadcast/distsql/handler/src/test/java/org/apache/shardingsphere/broadcast/distsql/handler/update/DropBroadcastTableRuleStatementUpdaterTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.broadcast.distsql.handler.update; import org.apache.shardingsphere.broadcast.api.config.BroadcastRuleConfiguration; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.DropBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.handler.exception.rule.MissingRequiredRuleException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.junit.jupiter.api.BeforeEach; diff --git a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java index 73c553c251d3a..4880c73ecd578 100644 --- a/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java +++ b/features/broadcast/distsql/parser/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/core/BroadcastDistSQLStatementVisitor.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.broadcast.distsql.parser.core; import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CountBroadcastRuleStatement; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CreateBroadcastTableRuleStatement; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.DropBroadcastTableRuleStatement; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.ShowBroadcastTableRulesStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CountBroadcastRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.ShowBroadcastTableRulesStatement; import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementBaseVisitor; import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementParser.CountBroadcastRuleContext; import org.apache.shardingsphere.distsql.parser.autogen.BroadcastDistSQLStatementParser.CreateBroadcastTableRuleContext; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CountBroadcastRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java similarity index 94% rename from features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CountBroadcastRuleStatement.java rename to features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java index 80f3b4f1fbd81..dcf7dfd3eda49 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CountBroadcastRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CountBroadcastRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.broadcast.distsql.parser.statement; +package org.apache.shardingsphere.broadcast.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CreateBroadcastTableRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java similarity index 94% rename from features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CreateBroadcastTableRuleStatement.java rename to features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java index ad5f45a19e893..152895872b4f8 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/CreateBroadcastTableRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/CreateBroadcastTableRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.broadcast.distsql.parser.statement; +package org.apache.shardingsphere.broadcast.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/DropBroadcastTableRuleStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java similarity index 94% rename from features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/DropBroadcastTableRuleStatement.java rename to features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java index 635e41be10d45..01d2712bee1e1 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/DropBroadcastTableRuleStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/DropBroadcastTableRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.broadcast.distsql.parser.statement; +package org.apache.shardingsphere.broadcast.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/ShowBroadcastTableRulesStatement.java b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java similarity index 94% rename from features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/ShowBroadcastTableRulesStatement.java rename to features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java index 9f41fdb09ba19..952df9f053cb2 100644 --- a/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/parser/statement/ShowBroadcastTableRulesStatement.java +++ b/features/broadcast/distsql/statement/src/main/java/org/apache/shardingsphere/broadcast/distsql/statement/ShowBroadcastTableRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.broadcast.distsql.parser.statement; +package org.apache.shardingsphere.broadcast.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverter.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverter.java index a486da95094a6..7b2db8d665e88 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverter.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverter.java @@ -23,9 +23,9 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import java.util.Collection; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java index c40032a088ed7..d333fd6ed97df 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.encrypt.distsql.handler.query; import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CountEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.CountEncryptRuleStatement; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java index e5cfb3d61538c..2a6b782231b14 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.ShowEncryptRulesStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.ShowEncryptRulesStatement; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java index c27191cb497d0..28ef0380a6a1d 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdater.java @@ -26,8 +26,8 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; import org.apache.shardingsphere.encrypt.distsql.handler.converter.EncryptRuleStatementConverter; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java index 1f401325eb547..4a1d70a9c483e 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdater.java @@ -29,9 +29,9 @@ import org.apache.shardingsphere.encrypt.api.encrypt.like.LikeEncryptAlgorithm; import org.apache.shardingsphere.encrypt.api.encrypt.standard.StandardEncryptAlgorithm; import org.apache.shardingsphere.encrypt.distsql.handler.converter.EncryptRuleStatementConverter; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CreateEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; import org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java index bda32ef159ae6..0c75c28915d6d 100644 --- a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java +++ b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdater.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java index ef1c1549495ef..89f7f95c53b07 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/converter/EncryptRuleStatementConverterTest.java @@ -19,9 +19,9 @@ import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutorTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutorTest.java index 00be1f3040070..dc12e0362d250 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutorTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/CountEncryptRuleExecutorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.encrypt.distsql.handler.query; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CountEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.CountEncryptRuleStatement; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java index 6a9c1d910883c..02d4d7ff7e317 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.ShowEncryptRulesStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.ShowEncryptRulesStatement; import org.apache.shardingsphere.encrypt.rule.EncryptRule; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.config.rule.RuleConfiguration; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java index 5ce67d58d59ed..5179b09a7bd68 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/AlterEncryptRuleStatementUpdaterTest.java @@ -24,10 +24,10 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java index 761d152e424d0..e73796c150fc6 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/CreateEncryptRuleStatementUpdaterTest.java @@ -22,10 +22,10 @@ import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CreateEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; import org.apache.shardingsphere.encrypt.exception.algorithm.EncryptAlgorithmInitializationException; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; diff --git a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java index 94db161ba52a8..1a4d908c0289c 100644 --- a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java +++ b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/update/DropEncryptRuleStatementUpdaterTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnItemRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration; import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.junit.jupiter.api.Test; diff --git a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java index 241649f5a42ff..eb3b187bf3bc7 100644 --- a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java +++ b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java @@ -32,14 +32,14 @@ import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.ShowEncryptRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.EncryptDistSQLStatementParser.TableNameContext; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnItemSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CountEncryptRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CreateEncryptRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.ShowEncryptRulesStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnItemSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.CountEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.ShowEncryptRulesStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnItemSegment.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java similarity index 94% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnItemSegment.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java index ae60ba3d12405..2a79493893e18 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnItemSegment.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnItemSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.segment; +package org.apache.shardingsphere.encrypt.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnSegment.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnSegment.java similarity index 95% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnSegment.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnSegment.java index 1c6a3918e9b67..a67c3df99427e 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptColumnSegment.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptColumnSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.segment; +package org.apache.shardingsphere.encrypt.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptRuleSegment.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptRuleSegment.java similarity index 94% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptRuleSegment.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptRuleSegment.java index a6ad1d0f79f81..7316b58a39b6f 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/segment/EncryptRuleSegment.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/segment/EncryptRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.segment; +package org.apache.shardingsphere.encrypt.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/AlterEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java similarity index 88% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/AlterEncryptRuleStatement.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java index e178e7947790b..cf0fb400800aa 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/AlterEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/AlterEncryptRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.statement; +package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import java.util.Collection; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CountEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java similarity index 94% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CountEncryptRuleStatement.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java index 235d1c9a964d2..ba484a64740c8 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CountEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CountEncryptRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.statement; +package org.apache.shardingsphere.encrypt.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CreateEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java similarity index 89% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CreateEncryptRuleStatement.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java index 25ab6e9df4f6b..57454e9046d88 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/CreateEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/CreateEncryptRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.statement; +package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import java.util.Collection; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java similarity index 94% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java index 34e91ea18f340..bb803add45481 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/DropEncryptRuleStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/DropEncryptRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.statement; +package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/ShowEncryptRulesStatement.java b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java similarity index 95% rename from features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/ShowEncryptRulesStatement.java rename to features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java index 19127f4d97961..3c8272a370736 100644 --- a/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/statement/ShowEncryptRulesStatement.java +++ b/features/encrypt/distsql/statement/src/main/java/org/apache/shardingsphere/encrypt/distsql/statement/ShowEncryptRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.encrypt.distsql.parser.statement; +package org.apache.shardingsphere.encrypt.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverter.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverter.java index 3f1497f26099f..716f64bbd6386 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverter.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverter.java @@ -23,8 +23,8 @@ import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import java.util.Collection; import java.util.HashMap; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java index 7d46e14ad2c46..fd5d854e35caf 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutor.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; -import org.apache.shardingsphere.mask.distsql.parser.statement.CountMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.CountMaskRuleStatement; import org.apache.shardingsphere.mask.rule.MaskRule; import java.util.Arrays; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java index 1590cca8d3ffd..28647e2e5d3f3 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.statement.ShowMaskRulesStatement; +import org.apache.shardingsphere.mask.distsql.statement.ShowMaskRulesStatement; import org.apache.shardingsphere.mask.rule.MaskRule; import java.util.Arrays; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdater.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdater.java index d063957df383c..af6f2aad039f1 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdater.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdater.java @@ -26,8 +26,8 @@ import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; import org.apache.shardingsphere.mask.distsql.handler.converter.MaskRuleStatementConverter; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.AlterMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; import java.util.Collection; import java.util.Collections; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdater.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdater.java index c9303817abd11..e58d0f7970d5d 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdater.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdater.java @@ -26,9 +26,9 @@ import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; import org.apache.shardingsphere.mask.distsql.handler.converter.MaskRuleStatementConverter; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.CreateMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; import org.apache.shardingsphere.mask.spi.MaskAlgorithm; import java.util.Collection; diff --git a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdater.java b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdater.java index 9aa9f0a44959f..dac856ee87e2b 100644 --- a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdater.java +++ b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdater.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.statement.DropMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; import java.util.Collection; import java.util.Collections; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java index 40239f0e8345a..cc0eb5ae33042 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/converter/MaskRuleStatementConverterTest.java @@ -19,8 +19,8 @@ import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java index 32983b59a0adb..acdd8d1af3aac 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/CountMaskRuleExecutorTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.infra.rule.identifier.type.TableNamesMapper; -import org.apache.shardingsphere.mask.distsql.parser.statement.CountMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.CountMaskRuleStatement; import org.apache.shardingsphere.mask.rule.MaskRule; import org.junit.jupiter.api.Test; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java index 64685824ed93b..a6e59fc54e54f 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.statement.ShowMaskRulesStatement; +import org.apache.shardingsphere.mask.distsql.statement.ShowMaskRulesStatement; import org.apache.shardingsphere.mask.rule.MaskRule; import org.junit.jupiter.api.Test; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java index 466275b882a44..44050f06fdbcd 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/AlterMaskRuleStatementUpdaterTest.java @@ -22,9 +22,9 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.AlterMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java index 553b9fe2a8ab4..39c5d9a30c878 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/CreateMaskRuleStatementUpdaterTest.java @@ -23,9 +23,9 @@ import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.CreateMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdaterTest.java b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdaterTest.java index d226795d33839..570afb002d505 100644 --- a/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdaterTest.java +++ b/features/mask/distsql/handler/src/test/java/org/apache/shardingsphere/mask/distsql/handler/update/DropMaskRuleStatementUpdaterTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.mask.api.config.MaskRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskColumnRuleConfiguration; import org.apache.shardingsphere.mask.api.config.rule.MaskTableRuleConfiguration; -import org.apache.shardingsphere.mask.distsql.parser.statement.DropMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java index e8cb3353b0119..1cd9769284f00 100644 --- a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java +++ b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java @@ -31,13 +31,13 @@ import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.PropertyContext; import org.apache.shardingsphere.distsql.parser.autogen.MaskDistSQLStatementParser.ShowMaskRulesContext; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.AlterMaskRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.CountMaskRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.CreateMaskRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.DropMaskRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.ShowMaskRulesStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.CountMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.ShowMaskRulesStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskColumnSegment.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java similarity index 95% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskColumnSegment.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java index 644b8e5d11145..02a615ab496bd 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskColumnSegment.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskColumnSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.segment; +package org.apache.shardingsphere.mask.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskRuleSegment.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskRuleSegment.java similarity index 94% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskRuleSegment.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskRuleSegment.java index 09c8d3495c513..3c967e01b7cde 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/segment/MaskRuleSegment.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/segment/MaskRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.segment; +package org.apache.shardingsphere.mask.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/AlterMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java similarity index 89% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/AlterMaskRuleStatement.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java index 291016b3a53d2..19d7da9ce6eee 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/AlterMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/AlterMaskRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.statement; +package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import java.util.Collection; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CountMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java similarity index 94% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CountMaskRuleStatement.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java index 960b54783fb7c..9861ad8927896 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CountMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CountMaskRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.statement; +package org.apache.shardingsphere.mask.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CreateMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java similarity index 90% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CreateMaskRuleStatement.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java index 05e15a1865b7b..058cc36378aff 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/CreateMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/CreateMaskRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.statement; +package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import java.util.Collection; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/DropMaskRuleStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java similarity index 95% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/DropMaskRuleStatement.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java index b84c270176930..4012ee78abc45 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/DropMaskRuleStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/DropMaskRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.statement; +package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/ShowMaskRulesStatement.java b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java similarity index 95% rename from features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/ShowMaskRulesStatement.java rename to features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java index d445bc788bacd..5a150f6b7d644 100644 --- a/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/parser/statement/ShowMaskRulesStatement.java +++ b/features/mask/distsql/statement/src/main/java/org/apache/shardingsphere/mask/distsql/statement/ShowMaskRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.mask.distsql.parser.statement; +package org.apache.shardingsphere.mask.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java index 7971e2b2eab85..af729839d23d3 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java @@ -32,7 +32,7 @@ import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.readwritesplitting.spi.ReadQueryLoadBalanceAlgorithm; import java.util.Arrays; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java index af4ae8cd450cd..38ccbdcc57341 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverter.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionalReadQueryStrategy; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import java.util.Collection; import java.util.HashMap; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java index 0e579c3f51ad2..17df5489e5a92 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutor.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CountReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CountReadwriteSplittingRuleStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import java.util.Arrays; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java index b06e099df18d8..cfcb2dfca75d4 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowReadwriteSplittingRulesStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import java.util.Arrays; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java index a1816f100b595..754b21166d8eb 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdater.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.distsql.handler.checker.ReadwriteSplittingRuleStatementChecker; import org.apache.shardingsphere.readwritesplitting.distsql.handler.converter.ReadwriteSplittingRuleStatementConverter; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; import java.util.Collection; import java.util.HashMap; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java index 4230a0b642d87..308088db01d7f 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdater.java @@ -23,8 +23,8 @@ import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.distsql.handler.checker.ReadwriteSplittingRuleStatementChecker; import org.apache.shardingsphere.readwritesplitting.distsql.handler.converter.ReadwriteSplittingRuleStatementConverter; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; import java.util.Collection; import java.util.LinkedList; diff --git a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java index 5572585fa2f90..f263bfe559b3b 100644 --- a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java +++ b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdater.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.distsql.handler.checker.ReadwriteSplittingRuleStatementChecker; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import org.apache.shardingsphere.single.rule.SingleRule; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java index e64e0820c35cf..88758673f0098 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/converter/ReadwriteSplittingRuleStatementConverterTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutorTest.java index e000044aff6d6..05c6d1afb22cf 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutorTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/CountReadwriteSplittingRuleExecutorTest.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CountReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CountReadwriteSplittingRuleStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import org.junit.jupiter.api.Test; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java index 876e568058ae1..f13e12bc5ea8b 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.rule.identifier.type.exportable.constant.ExportableConstants; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowReadwriteSplittingRulesStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java index 26d22aa37e3d8..e87031c48db13 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/AlterReadwriteSplittingRuleStatementUpdaterTest.java @@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java index e7c8e13dd7e99..110ce61d03f8d 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/CreateReadwriteSplittingRuleStatementUpdaterTest.java @@ -27,8 +27,8 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.junit.jupiter.api.BeforeEach; diff --git a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java index dd71799604ba2..bc2f8aa4e5e09 100644 --- a/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java +++ b/features/readwrite-splitting/distsql/handler/src/test/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/update/DropReadwriteSplittingRuleStatementUpdaterTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule; import org.apache.shardingsphere.readwritesplitting.api.ReadwriteSplittingRuleConfiguration; import org.apache.shardingsphere.readwritesplitting.api.rule.ReadwriteSplittingDataSourceRuleConfiguration; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java index cc7d45cc3fc7b..311742c7ef474 100644 --- a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java +++ b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java @@ -32,14 +32,14 @@ import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowReadwriteSplittingRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ReadwriteSplittingDistSQLStatementParser.ShowStatusFromReadwriteSplittingRulesContext; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CountReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowReadwriteSplittingRulesStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowStatusFromReadwriteSplittingRulesStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CountReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java similarity index 95% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java index 8c176e4ac3686..9033d12363234 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/segment/ReadwriteSplittingRuleSegment.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/segment/ReadwriteSplittingRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.segment; +package org.apache.shardingsphere.readwritesplitting.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/AlterReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java similarity index 86% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/AlterReadwriteSplittingRuleStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java index c3d925cf065c7..56c6bcb7ee739 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/AlterReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CountReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java similarity index 94% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CountReadwriteSplittingRuleStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java index 46409c762c562..a66f676ebe9f2 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CountReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CountReadwriteSplittingRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CreateReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java similarity index 88% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CreateReadwriteSplittingRuleStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java index 5e609a82e1e4b..346b0490b817e 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/CreateReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/CreateReadwriteSplittingRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import java.util.Collection; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java similarity index 94% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java index e8a44e0bf6a44..146e2b4a78afd 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/DropReadwriteSplittingRuleStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/DropReadwriteSplittingRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java similarity index 94% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowReadwriteSplittingRulesStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java index 966d20b55a9bc..56794fd8de2ae 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowReadwriteSplittingRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowStatusFromReadwriteSplittingRulesStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java similarity index 95% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowStatusFromReadwriteSplittingRulesStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java index 3c353691471dc..861da413c609f 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/ShowStatusFromReadwriteSplittingRulesStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement; +package org.apache.shardingsphere.readwritesplitting.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java similarity index 95% rename from features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java rename to features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java index 5f389d5eab118..8d02b60c7dcfd 100644 --- a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java +++ b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/status/AlterReadwriteSplittingStorageUnitStatusStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status; +package org.apache.shardingsphere.readwritesplitting.distsql.statement.status; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleStatementConverter.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleStatementConverter.java index bbad23886cb51..5152b7c1fa539 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleStatementConverter.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/converter/ShadowRuleStatementConverter.java @@ -24,8 +24,8 @@ import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.supporter.ShadowRuleStatementSupporter; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.ArrayList; import java.util.Collection; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java index bb6725239cae8..c1099c4f67afa 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/CountShadowRuleExecutor.java @@ -20,7 +20,7 @@ import org.apache.shardingsphere.distsql.handler.query.RQLExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CountShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CountShadowRuleStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import java.util.Arrays; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java index 7201e5a48f288..c1d87ed2de513 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import java.util.Arrays; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java index 060c024551787..0cd8841e7aec3 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowAlgorithmsStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import java.util.Arrays; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java index 07e4f85dc1a53..c8841cfe7a43f 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowRulesStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import java.util.Arrays; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java index 0afc6c3336a85..ef7268d8a1487 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowTableRulesStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import java.util.ArrayList; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/supporter/ShadowRuleStatementSupporter.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/supporter/ShadowRuleStatementSupporter.java index 55fa8cc940262..6da325c1ff8e3 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/supporter/ShadowRuleStatementSupporter.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/supporter/ShadowRuleStatementSupporter.java @@ -21,8 +21,8 @@ import lombok.NoArgsConstructor; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.ArrayList; import java.util.Arrays; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java index 2f706eabfcd0f..e9cc7b906de2c 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterDefaultShadowAlgorithmStatementUpdater.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm; import java.util.Collection; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java index 84b28cb0dc017..405a36cee25f3 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/AlterShadowRuleStatementUpdater.java @@ -29,9 +29,9 @@ import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; import org.apache.shardingsphere.shadow.distsql.handler.converter.ShadowRuleStatementConverter; import org.apache.shardingsphere.shadow.distsql.handler.supporter.ShadowRuleStatementSupporter; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm; import java.util.Collection; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java index 4a4f407cfa966..91db64ccc0a2d 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateDefaultShadowAlgorithmStatementUpdater.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm; import java.util.Collection; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java index c446d906cc079..f8a5fc67a86e5 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/CreateShadowRuleStatementUpdater.java @@ -27,9 +27,9 @@ import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; import org.apache.shardingsphere.shadow.distsql.handler.converter.ShadowRuleStatementConverter; import org.apache.shardingsphere.shadow.distsql.handler.supporter.ShadowRuleStatementSupporter; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; import org.apache.shardingsphere.shadow.spi.ShadowAlgorithm; import java.util.Collection; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java index f25327fa971cf..aec9b6e4efdda 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropDefaultShadowAlgorithmStatementUpdater.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropDefaultShadowAlgorithmStatement; import java.util.Collections; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java index c1b8ecf6cabe1..4288c3c16882c 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowAlgorithmStatementUpdater.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; import org.apache.shardingsphere.shadow.distsql.handler.supporter.ShadowRuleStatementSupporter; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; import java.util.Collection; import java.util.Collections; diff --git a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java index 1aa98110506f8..a09541781b146 100644 --- a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java +++ b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/update/DropShadowRuleStatementUpdater.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.checker.ShadowRuleStatementChecker; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java index b5f1bec48c344..51df13d17d248 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/converter/ShadowRuleStatementConverterTest.java @@ -21,8 +21,8 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.converter.ShadowRuleStatementConverter; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/CountShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/CountShadowRuleExecutorTest.java index 4fdd44829876b..3851987366127 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/CountShadowRuleExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/CountShadowRuleExecutorTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.shadow.distsql.handler.query.CountShadowRuleExecutor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CountShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CountShadowRuleStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import org.junit.jupiter.api.Test; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowDefaultShadowAlgorithmExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowDefaultShadowAlgorithmExecutorTest.java index 7ee289ddb9af7..6b3b9b7df3934 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowDefaultShadowAlgorithmExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowDefaultShadowAlgorithmExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.query.ShowDefaultShadowAlgorithmExecutor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java index c18f59f845be4..b2a0bd7c7604b 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowAlgorithmsExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowAlgorithmsExecutor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowAlgorithmsStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java index e69a58a74d92e..593cabbd9f8fe 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowRuleExecutor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowRulesStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import org.junit.jupiter.api.Test; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java index 1cdb283eb5ce9..7db3b9d25b2ea 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowTableRulesExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.query.ShowShadowTableRulesExecutor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowTableRulesStatement; import org.apache.shardingsphere.shadow.rule.ShadowRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java index 6bdf6e592e804..40fdef0db6c4a 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterDefaultShadowAlgorithmStatementUpdaterTest.java @@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.AlterDefaultShadowAlgorithmStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java index c241960af4748..d3420cd92dab3 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/AlterShadowRuleStatementUpdaterTest.java @@ -27,9 +27,9 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.AlterShadowRuleStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.BeforeEach; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java index 66d8a29edd593..f9a07e2a0b172 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateDefaultShadowAlgorithmStatementUpdaterTest.java @@ -22,8 +22,8 @@ import org.apache.shardingsphere.infra.spi.exception.ServiceProviderNotFoundException; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.CreateDefaultShadowAlgorithmStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.statement.CreateDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java index 1c68f0fd951cd..420db8ab2b176 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/CreateShadowRuleStatementUpdaterTest.java @@ -28,9 +28,9 @@ import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.CreateShadowRuleStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.BeforeEach; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java index 860e5c50368a6..700f6e6cea712 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropDefaultShadowAlgorithmStatementUpdaterTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.DropDefaultShadowAlgorithmStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropDefaultShadowAlgorithmStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java index 8b7c7714d1ea3..6ad14f1b94049 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowAlgorithmStatementUpdaterTest.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.DropShadowAlgorithmStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java index 2d81bfd630794..f0a16e4ab1eb5 100644 --- a/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java +++ b/features/shadow/distsql/handler/src/test/java/org/apache/shardingsphere/shadow/distsql/update/DropShadowRuleStatementUpdaterTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.shadow.api.config.datasource.ShadowDataSourceConfiguration; import org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration; import org.apache.shardingsphere.shadow.distsql.handler.update.DropShadowRuleStatementUpdater; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java index 8d4e0adf1e51a..d3b4186a19233 100644 --- a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java +++ b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java @@ -37,20 +37,20 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowRulesContext; import org.apache.shardingsphere.distsql.parser.autogen.ShadowDistSQLStatementParser.ShowShadowTableRulesContext; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CountShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowRulesStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CountShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowAlgorithmsStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowTableRulesStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowAlgorithmSegment.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java similarity index 95% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowAlgorithmSegment.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java index 54ec82dc722cf..22054d9871613 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowAlgorithmSegment.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowAlgorithmSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.segment; +package org.apache.shardingsphere.shadow.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowRuleSegment.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowRuleSegment.java similarity index 95% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowRuleSegment.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowRuleSegment.java index 342235e290cc1..d228f8e3cb12b 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/segment/ShadowRuleSegment.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/segment/ShadowRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.segment; +package org.apache.shardingsphere.shadow.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java similarity index 88% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterDefaultShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java index d12bc6510d3fc..983014a662f6e 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterDefaultShadowAlgorithmStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; /** * Alter default shadow algorithm rule statement. diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java similarity index 88% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java index 248851b212e17..7cae8692458f6 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowAlgorithmStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java similarity index 88% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowRuleStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java index 9f84c7f2672c1..29752b915ab2a 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/AlterShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/AlterShadowRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CountShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CountShadowRuleStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java index 76adb61736a32..1b89d1bbb80cf 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CountShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CountShadowRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java similarity index 89% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateDefaultShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java index 58351215473ee..3a1a42d44e5cf 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateDefaultShadowAlgorithmStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; /** * Create default shadow algorithm rule statement. diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java similarity index 89% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateShadowRuleStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java index df86e08647f87..993bc30364c2b 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/CreateShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/CreateShadowRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import java.util.Collection; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java index 33ebf7bf6d301..0efdfdb9f1f3d 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropDefaultShadowAlgorithmStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java similarity index 95% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java index 28532cf292941..4def6e78e8fae 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowAlgorithmStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java index 3630da12fdfe3..da1b89e7f5f88 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/DropShadowRuleStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/DropShadowRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowDefaultShadowAlgorithmStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowDefaultShadowAlgorithmStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java index b2d42aa15e6ee..7e8de33b6f2f8 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowDefaultShadowAlgorithmStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowDefaultShadowAlgorithmStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowAlgorithmsStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowAlgorithmsStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java index f199485b6e4c6..d486fc147ad80 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowAlgorithmsStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowAlgorithmsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java similarity index 95% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowRulesStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java index 90ec7492f5d82..1c4c34ef88dd7 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowTableRulesStatement.java b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java similarity index 94% rename from features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowTableRulesStatement.java rename to features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java index 12ed62747e3e8..ee9dfca9f34f0 100644 --- a/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/statement/ShowShadowTableRulesStatement.java +++ b/features/shadow/distsql/statement/src/main/java/org/apache/shardingsphere/shadow/distsql/statement/ShowShadowTableRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.shadow.distsql.parser.statement; +package org.apache.shardingsphere.shadow.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java index 70abf9cdee3e8..b9a579ff0a5a7 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java @@ -44,13 +44,13 @@ import org.apache.shardingsphere.sharding.api.sharding.ShardingAutoTableAlgorithm; import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyType; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; import org.apache.shardingsphere.sharding.exception.algorithm.sharding.ShardingAlgorithmClassImplementationException; import org.apache.shardingsphere.sharding.exception.metadata.ShardingTableRuleNotFoundException; import org.apache.shardingsphere.sharding.exception.strategy.InvalidShardingStrategyConfigurationException; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java index d0f4b27959cd7..021b63d33b7f2 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/converter/ShardingTableRuleStatementConverter.java @@ -30,13 +30,13 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyLevelType; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyType; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; import java.util.Collection; import java.util.HashMap; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java index 1c97bf4406402..6ca32ca98463f 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/CountShardingRuleExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CountShardingRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CountShardingRuleStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java index abb07f6f91921..5c89ca22a69d6 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyType; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowDefaultShardingStrategyStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java index 9f271506b6ba5..a2ba3cbdb3283 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAlgorithmsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java index eab3cd72650c4..142a4f0624cf6 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java index be662b18d12fb..a79d83a50f538 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java index af10aac1bdaee..9272c1ccf957e 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableNodesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableNodesStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.sharding.rule.TableRule; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java index 12e35a2a41349..03532a18ea1f2 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableReferenceRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableReferenceRulesStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java index eef64955654aa..a9bb3e73a792b 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java index 52860953016b8..d834e8fb488eb 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAlgorithmStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java index 5b4a4be132a8b..5452e6988046e 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAuditorStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java index dea10fdddffa4..d8378f3be1405 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java index da4b6dd02604d..17d996e880ab7 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAlgorithmsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java index 674845d74edb4..f84c0c9526ead 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAuditorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java index 22c0489b94c79..f87a92a5ffe05 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingKeyGeneratorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import java.util.Arrays; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java index ed96be7da53b9..70627b3a338f8 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterDefaultShardingStrategyStatementUpdater.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyLevelType; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyType; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterDefaultShardingStrategyStatement; import java.util.Optional; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleStatementUpdater.java index dae6507856d60..dad52c617bb9c 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableReferenceRuleStatementUpdater.java @@ -28,8 +28,8 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.checker.ShardingTableRuleStatementChecker; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableReferenceRuleStatement; import java.util.Arrays; import java.util.Collection; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java index d19dc4077f466..b6bc5b18da9da 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/AlterShardingTableRuleStatementUpdater.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.checker.ShardingTableRuleStatementChecker; import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableRuleStatement; import java.util.Collection; import java.util.stream.Collectors; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java index 79e74869d3eb4..a1448d6d8fecf 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateDefaultShardingStrategyStatementUpdater.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyLevelType; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyType; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateDefaultShardingStrategyStatement; import java.util.Optional; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleStatementUpdater.java index ff85e83c086b7..5a81d613320e4 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableReferenceRuleStatementUpdater.java @@ -28,8 +28,8 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.checker.ShardingTableRuleStatementChecker; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableReferenceRuleStatement; import java.util.Arrays; import java.util.Collection; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java index 5dd249535f875..4c2e3fc0057d5 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/CreateShardingTableRuleStatementUpdater.java @@ -24,8 +24,8 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.checker.ShardingTableRuleStatementChecker; import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import java.util.Collection; import java.util.Collections; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyStatementUpdater.java index ba6420a92bde2..836ccabbc2908 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropDefaultShardingStrategyStatementUpdater.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.enums.ShardingStrategyLevelType; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropDefaultShardingStrategyStatement; import java.util.Optional; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java index 48d9faa280383..214b21386a139 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAlgorithmStatementUpdater.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java index d47ed9b44ba38..13c949cbb2649 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingAuditorStatementUpdater.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAuditorStatement; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java index 8e6d3d39546ef..c77e7371c97d4 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingKeyGeneratorStatementUpdater.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingKeyGeneratorStatement; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java index 75e82c74fc1c2..811bf6c73e9ec 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableReferenceRuleStatementUpdater.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableReferenceRuleStatement; import java.util.Collection; import java.util.stream.Collectors; diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java index f6f77c248e81e..9de85f5367548 100644 --- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java +++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/update/DropShardingTableRuleStatementUpdater.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableRuleStatement; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java index ea36dbd10dec2..307c677b2afa6 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java @@ -36,13 +36,13 @@ import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.checker.ShardingTableRuleStatementChecker; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java index fc9bb16754479..3fdc8002043e7 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java @@ -22,13 +22,13 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.converter.ShardingTableRuleStatementConverter; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/CountShardingRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/CountShardingRuleExecutorTest.java index 93510757b5d65..b9db9c5a47b2a 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/CountShardingRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/CountShardingRuleExecutorTest.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.CountShardingRuleExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CountShardingRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CountShardingRuleStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.sharding.rule.TableRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowDefaultShardingStrategyExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowDefaultShardingStrategyExecutorTest.java index 869337748cee1..7859ddc73763a 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowDefaultShardingStrategyExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowDefaultShardingStrategyExecutorTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowDefaultShardingStrategyExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowDefaultShardingStrategyStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAlgorithmExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAlgorithmExecutorTest.java index 582992b358ff4..936ce1a39fc9d 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAlgorithmExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAlgorithmExecutorTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingAlgorithmExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAlgorithmsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java index a2f2f4e13a0af..5185eb20bcdbb 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingAuditorsExecutorTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingAuditorsExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java index 69200a7485993..0c81baf9170df 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingKeyGeneratorExecutorTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingKeyGeneratorExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableNodesExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableNodesExecutorTest.java index ba7ecabaa55ea..ffeffc4cdd024 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableNodesExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableNodesExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration; import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableNodesExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableNodesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableNodesStatement; import org.apache.shardingsphere.sharding.exception.metadata.ShardingRuleNotFoundException; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.sharding.yaml.swapper.ShardingRuleConfigurationConverter; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableReferenceRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableReferenceRuleExecutorTest.java index 9b4f6f6f3c89c..121ddfae033f4 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableReferenceRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableReferenceRuleExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableReferenceRuleExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableReferenceRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableReferenceRulesStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java index 792125fa69a3e..981bed6af9589 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java @@ -30,7 +30,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRuleExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAlgorithmExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAlgorithmExecutorTest.java index 5c4de3912c27e..292bc8b365f6e 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAlgorithmExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAlgorithmExecutorTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRulesUsedAlgorithmExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAlgorithmStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAuditorExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAuditorExecutorTest.java index cc4ce5e75a198..ff9ae76d8d593 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAuditorExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedAuditorExecutorTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRulesUsedAuditorExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAuditorStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedKeyGeneratorExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedKeyGeneratorExecutorTest.java index 8fd505abc4ea2..2cf52580a7454 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedKeyGeneratorExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRulesUsedKeyGeneratorExecutorTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowShardingTableRulesUsedKeyGeneratorExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAlgorithmsExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAlgorithmsExecutorTest.java index 99d3e20af4580..ed8f3db4f026c 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAlgorithmsExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAlgorithmsExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingAlgorithmsExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAlgorithmsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java index 2253f843f7acb..de62418838d84 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingAuditorsExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingAuditorsExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAuditorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java index 4c7c2f53f42a1..ea1b40a2c3a3d 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.query.ShowUnusedShardingKeyGeneratorExecutor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingKeyGeneratorsStatement; import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java index 44b0489d345cf..8ab14eae9d334 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.AlterDefaultShardingStrategyStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterDefaultShardingStrategyStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.BeforeEach; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleStatementUpdaterTest.java index da8e9c74203ae..c51c236fc0a68 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableReferenceRuleStatementUpdaterTest.java @@ -23,8 +23,8 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingTableReferenceRuleStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableReferenceRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java index 09d566e608d4e..c8d32f772fd31 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java @@ -28,11 +28,11 @@ import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.AlterShardingTableRuleStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableRuleStatement; import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java index 38f522675f21a..706a871ec7829 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateDefaultShardingStrategyStatementUpdaterTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.CreateDefaultShardingStrategyStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateDefaultShardingStrategyStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.BeforeEach; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java index 3d064c295af74..7f8d715ab91ec 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableReferenceRuleStatementUpdaterTest.java @@ -24,8 +24,8 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableReferenceRuleStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableReferenceRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java index 982fe175bd8a9..fa4fd86dfa46b 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java @@ -36,12 +36,12 @@ import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.CreateShardingTableRuleStatementUpdater; import org.apache.shardingsphere.sharding.distsql.parser.facade.ShardingDistSQLStatementParserFacade; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.sharding.exception.strategy.InvalidShardingStrategyConfigurationException; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.core.ParseASTNode; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java index 9c7da53e4e642..978bd83d2ab0f 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropDefaultShardingStrategyStatementUpdaterTest.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropDefaultShardingStrategyStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropDefaultShardingStrategyStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java index af41bd5da4cef..0739e40f314d7 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAlgorithmStatementUpdaterTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingAlgorithmStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorStatementUpdaterTest.java index d2e25849ab24f..b763df98632aa 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingAuditorStatementUpdaterTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.audit.ShardingAuditStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingAuditorStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAuditorStatement; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java index 947b675620580..5201796cd6440 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingKeyGeneratorStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingKeyGeneratorStatement; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceRuleStatementUpdaterTest.java index b7dbd81e557f2..78ca9b1a5754c 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableReferenceRuleStatementUpdaterTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration; import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingTableReferenceRuleStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableReferenceRuleStatement; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Answers; diff --git a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleStatementUpdaterTest.java b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleStatementUpdaterTest.java index 84e29f75097e0..defafbb9838b0 100644 --- a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleStatementUpdaterTest.java +++ b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingTableRuleStatementUpdaterTest.java @@ -30,7 +30,7 @@ import org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration; import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; import org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingTableRuleStatementUpdater; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableRuleStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; import org.junit.jupiter.api.Test; diff --git a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java index 22afc469d1026..b05bfe9b4ab51 100644 --- a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java +++ b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java @@ -63,40 +63,40 @@ import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableNameContext; import org.apache.shardingsphere.distsql.parser.autogen.ShardingDistSQLStatementParser.TableReferenceRuleDefinitionContext; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CountShardingRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAlgorithmStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAuditorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAlgorithmsStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAuditorsStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingKeyGeneratorsStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableNodesStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableReferenceRulesStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAlgorithmStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedAuditorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAlgorithmsStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingAuditorsStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowUnusedShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CountShardingRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingKeyGeneratorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableNodesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableReferenceRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowShardingTableRulesUsedKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAlgorithmsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingAuditorsStatement; +import org.apache.shardingsphere.sharding.distsql.statement.ShowUnusedShardingKeyGeneratorsStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/AuditStrategySegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/AuditStrategySegment.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/AuditStrategySegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/AuditStrategySegment.java index bfc81b69c5632..63b4d5ddd818e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/AuditStrategySegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/AuditStrategySegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.strategy; +package org.apache.shardingsphere.sharding.distsql.segment.strategy; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/KeyGenerateStrategySegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/KeyGenerateStrategySegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java index 867246fc8fa85..84b50f9165ef4 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/KeyGenerateStrategySegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/KeyGenerateStrategySegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.strategy; +package org.apache.shardingsphere.sharding.distsql.segment.strategy; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingAuditorSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingAuditorSegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java index d3c89ff24fdd7..187220ec49841 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingAuditorSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingAuditorSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.strategy; +package org.apache.shardingsphere.sharding.distsql.segment.strategy; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingStrategySegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingStrategySegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java index d19dc8e79c878..4f739d120ad61 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/strategy/ShardingStrategySegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/strategy/ShardingStrategySegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.strategy; +package org.apache.shardingsphere.sharding.distsql.segment.strategy; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AbstractTableRuleSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AbstractTableRuleSegment.java similarity index 83% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AbstractTableRuleSegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AbstractTableRuleSegment.java index fb6eee4c40e3d..b0b76e97b35ce 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AbstractTableRuleSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AbstractTableRuleSegment.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.table; +package org.apache.shardingsphere.sharding.distsql.segment.table; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; import org.apache.shardingsphere.sql.parser.api.ASTNode; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AutoTableRuleSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AutoTableRuleSegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java index 1a0616a33a569..8f230959f95ec 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/AutoTableRuleSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/AutoTableRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.table; +package org.apache.shardingsphere.sharding.distsql.segment.table; import lombok.Getter; import lombok.Setter; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableReferenceRuleSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableReferenceRuleSegment.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableReferenceRuleSegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableReferenceRuleSegment.java index 6e891429c903d..0ef0bcb6734d1 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableReferenceRuleSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableReferenceRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.table; +package org.apache.shardingsphere.sharding.distsql.segment.table; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableRuleSegment.java similarity index 79% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableRuleSegment.java index da7a88198f444..27f3805ca3b25 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/segment/table/TableRuleSegment.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.segment.table; +package org.apache.shardingsphere.sharding.distsql.segment.table; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.KeyGenerateStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.KeyGenerateStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingStrategySegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterDefaultShardingStrategyStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java index 75ca8813ca4f1..d31b8f6e03041 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterDefaultShardingStrategyStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java similarity index 90% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableReferenceRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java index e2834d2e65002..fa134de1b4289 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableReferenceRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; import java.util.Collection; import java.util.stream.Collectors; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java similarity index 87% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java index 179949de337f7..3bc1f9204f5d6 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/AlterShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/AlterShardingTableRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CountShardingRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CountShardingRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java index e977c927b749f..abd7eae091028 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CountShardingRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CountShardingRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java similarity index 96% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateDefaultShardingStrategyStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java index cf3ed7b35c253..fedd60ebb20ee 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateDefaultShardingStrategyStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java similarity index 90% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableReferenceRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java index 76d74364be646..ea43ddaba1537 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableReferenceRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; import java.util.Collection; import java.util.stream.Collectors; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java similarity index 89% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java index 4dbe1de84c4b6..2c240f8a84b2f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/CreateShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/CreateShardingTableRuleStatement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AbstractTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AbstractTableRuleSegment; import java.util.Collection; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java index f67eb98a0195a..cfb4749769608 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropDefaultShardingStrategyStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java index c85a2d8066df7..b81ec50ed3e35 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAlgorithmStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAlgorithmStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAuditorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAuditorStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java index a8845f4863708..436f132a53a90 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingAuditorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingAuditorStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java index 4219315fd8827..dee82cdccf50b 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingKeyGeneratorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingKeyGeneratorStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableReferenceRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableReferenceRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java index 2b418c40bc4c1..9c119ef8763de 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableReferenceRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableReferenceRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java index e3bd34ea9c0e0..d1db46521cde2 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/DropShardingTableRuleStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/DropShardingTableRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowDefaultShardingStrategyStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowDefaultShardingStrategyStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java index ae0920c940f89..e0119c6b77bcc 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowDefaultShardingStrategyStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowDefaultShardingStrategyStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAlgorithmsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java index 99d4fcddc7481..899f83b601e05 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAlgorithmsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAuditorsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java index 877e5b91820f3..e10a567b81b09 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingAuditorsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingKeyGeneratorsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java index ff2ae5c337c3f..d7c516ca58c88 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingKeyGeneratorsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableNodesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableNodesStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java index 3092af12d501a..72ff603e94330 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableNodesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableNodesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableReferenceRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableReferenceRulesStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java index bbb6769879037..9211b1d1956b7 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableReferenceRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableReferenceRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java index f2a0d50c7ff6c..f2af17640ad5e 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import lombok.Getter; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAlgorithmStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAlgorithmStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java index 612836b1197a5..bfdb8233b689f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAlgorithmStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAlgorithmStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAuditorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAuditorStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java index 75e24d1d9869a..5992ab3ab7597 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedAuditorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedAuditorStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java similarity index 95% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java index c7e49422ec7e5..b4f7a5097842f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowShardingTableRulesUsedKeyGeneratorStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAlgorithmsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAlgorithmsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java index 7e7c3c66c8da2..0f463ebaf155a 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAlgorithmsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAlgorithmsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAuditorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAuditorsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java index 11708b3c927c6..ce57ac0e0478f 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingAuditorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingAuditorsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingKeyGeneratorsStatement.java b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java similarity index 94% rename from features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingKeyGeneratorsStatement.java rename to features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java index dc2024c2cb43a..3adbf0c9072fe 100644 --- a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/statement/ShowUnusedShardingKeyGeneratorsStatement.java +++ b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/statement/ShowUnusedShardingKeyGeneratorsStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sharding.distsql.parser.statement; +package org.apache.shardingsphere.sharding.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; diff --git a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java index c3c53c8a734e6..884da140b7a34 100644 --- a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java +++ b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutor.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.authority.distsql.handler; import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration; -import org.apache.shardingsphere.authority.distsql.parser.statement.ShowAuthorityRuleStatement; +import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.distsql.handler.ral.query.MetaDataRequiredQueryableRALExecutor; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; diff --git a/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java b/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java index 70dd00356a5ea..14e458c146a2d 100644 --- a/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java +++ b/kernel/authority/distsql/handler/src/test/java/org/apache/shardingsphere/authority/distsql/handler/ShowAuthorityRuleExecutorTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.authority.distsql.handler; import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration; -import org.apache.shardingsphere.authority.distsql.parser.statement.ShowAuthorityRuleStatement; +import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement; import org.apache.shardingsphere.authority.rule.AuthorityRule; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; diff --git a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java index 07f6a50cec979..14de590e1ccad 100644 --- a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java +++ b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.authority.distsql.parser.core; -import org.apache.shardingsphere.authority.distsql.parser.statement.ShowAuthorityRuleStatement; +import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement; import org.apache.shardingsphere.distsql.parser.autogen.AuthorityDistSQLStatementBaseVisitor; import org.apache.shardingsphere.distsql.parser.autogen.AuthorityDistSQLStatementParser.ShowAuthorityRuleContext; import org.apache.shardingsphere.sql.parser.api.ASTNode; diff --git a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/parser/statement/ShowAuthorityRuleStatement.java b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java similarity index 93% rename from kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/parser/statement/ShowAuthorityRuleStatement.java rename to kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java index 251fa867a7853..ecf2f86914119 100644 --- a/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/parser/statement/ShowAuthorityRuleStatement.java +++ b/kernel/authority/distsql/statement/src/main/java/org/apache/shardingsphere/authority/distsql/statement/ShowAuthorityRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.authority.distsql.parser.statement; +package org.apache.shardingsphere.authority.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java index ac3b0543594e5..a70dad586cfe8 100644 --- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java +++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.globalclock.core.rule.GlobalClockRule; import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.queryable.ShowGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement; import java.util.Arrays; import java.util.Collection; diff --git a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java index 19e188bb6d70f..bb7cf4e36ac01 100644 --- a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java +++ b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdater.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.handler.ral.update.GlobalRuleRALUpdater; import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable.AlterGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; /** * Alter global clock rule statement updater. diff --git a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java index 3661f58a7e97a..c1f073e03fc12 100644 --- a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java +++ b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutorTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.queryable.ShowGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement; import org.junit.jupiter.api.Test; import java.util.Collection; diff --git a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdaterTest.java b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdaterTest.java index d51fd74af404e..084fedfb2be28 100644 --- a/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdaterTest.java +++ b/kernel/global-clock/distsql/handler/src/test/java/org/apache/shardingsphere/globalclock/distsql/handler/update/AlterGlobalClockRuleStatementUpdaterTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.globalclock.api.config.GlobalClockRuleConfiguration; import org.apache.shardingsphere.globalclock.core.rule.builder.DefaultGlobalClockRuleConfigurationBuilder; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable.AlterGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.junit.jupiter.api.Test; diff --git a/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/core/GlobalClockDistSQLStatementVisitor.java b/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/core/GlobalClockDistSQLStatementVisitor.java index 5ce632c366693..e4ebd0d09766b 100644 --- a/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/core/GlobalClockDistSQLStatementVisitor.java +++ b/kernel/global-clock/distsql/parser/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/core/GlobalClockDistSQLStatementVisitor.java @@ -24,8 +24,8 @@ import org.apache.shardingsphere.distsql.parser.autogen.GlobalClockDistSQLStatementParser.PropertiesDefinitionContext; import org.apache.shardingsphere.distsql.parser.autogen.GlobalClockDistSQLStatementParser.PropertyContext; import org.apache.shardingsphere.distsql.parser.autogen.GlobalClockDistSQLStatementParser.ShowGlobalClockRuleContext; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.queryable.ShowGlobalClockRuleStatement; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable.AlterGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.queryable.ShowGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; diff --git a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/queryable/ShowGlobalClockRuleStatement.java b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java similarity index 92% rename from kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/queryable/ShowGlobalClockRuleStatement.java rename to kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java index b1ecf741408bf..f8e71661c022a 100644 --- a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/queryable/ShowGlobalClockRuleStatement.java +++ b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/queryable/ShowGlobalClockRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.globalclock.distsql.parser.statement.queryable; +package org.apache.shardingsphere.globalclock.distsql.statement.queryable; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; diff --git a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/updatable/AlterGlobalClockRuleStatement.java b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java similarity index 94% rename from kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/updatable/AlterGlobalClockRuleStatement.java rename to kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java index ab59b221ee8ee..1897ebacd8844 100644 --- a/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/parser/statement/updatable/AlterGlobalClockRuleStatement.java +++ b/kernel/global-clock/distsql/statement/src/main/java/org/apache/shardingsphere/globalclock/distsql/statement/updatable/AlterGlobalClockRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable; +package org.apache.shardingsphere.globalclock.distsql.statement.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java index 7e182177cd345..a1f7317dc2b81 100644 --- a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java +++ b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration; -import org.apache.shardingsphere.parser.distsql.parser.statement.queryable.ShowSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.parser.rule.SQLParserRule; import java.util.Arrays; diff --git a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java index 73ba0e7af380d..5593bb21169f1 100644 --- a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java +++ b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdater.java @@ -19,8 +19,8 @@ import org.apache.shardingsphere.distsql.handler.ral.update.GlobalRuleRALUpdater; import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration; -import org.apache.shardingsphere.parser.distsql.parser.segment.CacheOptionSegment; -import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; +import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; import org.apache.shardingsphere.sql.parser.api.CacheOption; /** diff --git a/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutorTest.java b/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutorTest.java index 7836e2b2a584e..1ca22971dfa7b 100644 --- a/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutorTest.java +++ b/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutorTest.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration; -import org.apache.shardingsphere.parser.distsql.parser.statement.queryable.ShowSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; import org.apache.shardingsphere.parser.rule.SQLParserRule; import org.apache.shardingsphere.sql.parser.api.CacheOption; import org.junit.jupiter.api.Test; diff --git a/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdaterTest.java b/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdaterTest.java index 246987caf6f0f..74511af8e0a80 100644 --- a/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdaterTest.java +++ b/kernel/sql-parser/distsql/handler/src/test/java/org/apache/shardingsphere/parser/distsql/handler/update/AlterSQLParserRuleStatementUpdaterTest.java @@ -18,8 +18,8 @@ package org.apache.shardingsphere.parser.distsql.handler.update; import org.apache.shardingsphere.parser.config.SQLParserRuleConfiguration; -import org.apache.shardingsphere.parser.distsql.parser.segment.CacheOptionSegment; -import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; +import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder; import org.junit.jupiter.api.Test; diff --git a/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java b/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java index 69d43ed366a1c..76f6aad8d7edb 100644 --- a/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java +++ b/kernel/sql-parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java @@ -23,9 +23,9 @@ import org.apache.shardingsphere.distsql.parser.autogen.SQLParserDistSQLStatementParser.CacheOptionContext; import org.apache.shardingsphere.distsql.parser.autogen.SQLParserDistSQLStatementParser.ShowSQLParserRuleContext; import org.apache.shardingsphere.distsql.parser.autogen.SQLParserDistSQLStatementParser.SqlParserRuleDefinitionContext; -import org.apache.shardingsphere.parser.distsql.parser.segment.CacheOptionSegment; -import org.apache.shardingsphere.parser.distsql.parser.statement.queryable.ShowSQLParserRuleStatement; -import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; +import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/segment/CacheOptionSegment.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/segment/CacheOptionSegment.java similarity index 94% rename from kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/segment/CacheOptionSegment.java rename to kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/segment/CacheOptionSegment.java index 08990c578e45f..1380612cb4244 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/segment/CacheOptionSegment.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/segment/CacheOptionSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.parser.distsql.parser.segment; +package org.apache.shardingsphere.parser.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/queryable/ShowSQLParserRuleStatement.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java similarity index 92% rename from kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/queryable/ShowSQLParserRuleStatement.java rename to kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java index 815204696881d..eb48eee43d54a 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/queryable/ShowSQLParserRuleStatement.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/queryable/ShowSQLParserRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.parser.distsql.parser.statement.queryable; +package org.apache.shardingsphere.parser.distsql.statement.queryable; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; diff --git a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/updatable/AlterSQLParserRuleStatement.java b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java similarity index 89% rename from kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/updatable/AlterSQLParserRuleStatement.java rename to kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java index 0edc6d4489a01..e65d67addddb6 100644 --- a/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/parser/statement/updatable/AlterSQLParserRuleStatement.java +++ b/kernel/sql-parser/distsql/statement/src/main/java/org/apache/shardingsphere/parser/distsql/statement/updatable/AlterSQLParserRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.parser.distsql.parser.statement.updatable; +package org.apache.shardingsphere.parser.distsql.statement.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; -import org.apache.shardingsphere.parser.distsql.parser.segment.CacheOptionSegment; +import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; /** * Alter SQL parser rule statement. diff --git a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutor.java b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutor.java index ddb86ee7dc196..d42a473e9b4fb 100644 --- a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutor.java +++ b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration; -import org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLTranslatorRuleStatement; +import org.apache.shardingsphere.sqltranslator.distsql.statement.ShowSQLTranslatorRuleStatement; import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule; import java.util.Arrays; diff --git a/kernel/sql-translator/distsql/handler/src/test/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutorTest.java b/kernel/sql-translator/distsql/handler/src/test/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutorTest.java index 3d12cb633981a..5282a5ab9d5da 100644 --- a/kernel/sql-translator/distsql/handler/src/test/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutorTest.java +++ b/kernel/sql-translator/distsql/handler/src/test/java/org/apache/shardingsphere/sqltranslator/distsql/handler/ShowSQLTranslatorRuleExecutorTest.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData; import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData; import org.apache.shardingsphere.sqltranslator.api.config.SQLTranslatorRuleConfiguration; -import org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLTranslatorRuleStatement; +import org.apache.shardingsphere.sqltranslator.distsql.statement.ShowSQLTranslatorRuleStatement; import org.apache.shardingsphere.sqltranslator.rule.SQLTranslatorRule; import org.junit.jupiter.api.Test; diff --git a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java index 7a30a4e1e2158..37037fd4f5f14 100644 --- a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java +++ b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.distsql.parser.autogen.SQLTranslatorDistSQLStatementParser.ShowSQLTranslatorRuleContext; import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; -import org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLTranslatorRuleStatement; +import org.apache.shardingsphere.sqltranslator.distsql.statement.ShowSQLTranslatorRuleStatement; /** * SQL statement visitor for SQL translator DistSQL. diff --git a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/statement/ShowSQLTranslatorRuleStatement.java b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java similarity index 93% rename from kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/statement/ShowSQLTranslatorRuleStatement.java rename to kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java index 9465da3fba5c0..4a3433a50a53b 100644 --- a/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/statement/ShowSQLTranslatorRuleStatement.java +++ b/kernel/sql-translator/distsql/statement/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/statement/ShowSQLTranslatorRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.sqltranslator.distsql.parser.statement; +package org.apache.shardingsphere.sqltranslator.distsql.statement; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; diff --git a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java index 2d756e1529068..0c16447aa3cd2 100644 --- a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java +++ b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/convert/TrafficRuleConverter.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; import java.util.Collection; import java.util.Optional; diff --git a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java index 1aa41d11497c4..6d6c7e7865d94 100644 --- a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java +++ b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.props.PropertiesConverter; import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; -import org.apache.shardingsphere.traffic.distsql.parser.statement.queryable.ShowTrafficRulesStatement; +import org.apache.shardingsphere.traffic.distsql.statement.queryable.ShowTrafficRulesStatement; import org.apache.shardingsphere.traffic.rule.TrafficRule; import java.util.Arrays; diff --git a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java index d972ce20db9a4..a1a12fe29585e 100644 --- a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java +++ b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdater.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; import org.apache.shardingsphere.traffic.distsql.handler.convert.TrafficRuleConverter; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; -import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement; import org.apache.shardingsphere.traffic.spi.TrafficAlgorithm; import org.apache.shardingsphere.traffic.spi.TrafficLoadBalanceAlgorithm; diff --git a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java index 5847d5173e234..1cf1fa176bb63 100644 --- a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java +++ b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; -import org.apache.shardingsphere.traffic.distsql.parser.statement.queryable.ShowTrafficRulesStatement; +import org.apache.shardingsphere.traffic.distsql.statement.queryable.ShowTrafficRulesStatement; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.junit.jupiter.api.Test; diff --git a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java index 1cf9000422516..eccc5c7b22c70 100644 --- a/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java +++ b/kernel/traffic/distsql/handler/src/test/java/org/apache/shardingsphere/traffic/distsql/handler/update/AlterTrafficRuleStatementUpdaterTest.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.apache.shardingsphere.traffic.api.config.TrafficRuleConfiguration; import org.apache.shardingsphere.traffic.api.config.TrafficStrategyConfiguration; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; -import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java index 7951ff6a816eb..4415e3ab42a57 100644 --- a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java +++ b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java @@ -31,9 +31,9 @@ import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; -import org.apache.shardingsphere.traffic.distsql.parser.statement.queryable.ShowTrafficRulesStatement; -import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.statement.queryable.ShowTrafficRulesStatement; +import org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement; import java.util.Collection; import java.util.Collections; diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/segment/TrafficRuleSegment.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java similarity index 95% rename from kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/segment/TrafficRuleSegment.java rename to kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java index 446410bb585cf..02d3128b5c3fa 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/segment/TrafficRuleSegment.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/segment/TrafficRuleSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.traffic.distsql.parser.segment; +package org.apache.shardingsphere.traffic.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/queryable/ShowTrafficRulesStatement.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java similarity index 93% rename from kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/queryable/ShowTrafficRulesStatement.java rename to kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java index b7a8d6375eab3..3ec420826adc1 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/queryable/ShowTrafficRulesStatement.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/queryable/ShowTrafficRulesStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.traffic.distsql.parser.statement.queryable; +package org.apache.shardingsphere.traffic.distsql.statement.queryable; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/updatable/AlterTrafficRuleStatement.java b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java similarity index 88% rename from kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/updatable/AlterTrafficRuleStatement.java rename to kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java index b0be68db9958b..92e9d2892aca3 100644 --- a/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/statement/updatable/AlterTrafficRuleStatement.java +++ b/kernel/traffic/distsql/statement/src/main/java/org/apache/shardingsphere/traffic/distsql/statement/updatable/AlterTrafficRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.traffic.distsql.parser.statement.updatable; +package org.apache.shardingsphere.traffic.distsql.statement.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; import java.util.Collection; diff --git a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java index 19dbfcf3a75e9..952b6089e8db3 100644 --- a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java +++ b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow; import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData; import org.apache.shardingsphere.infra.props.PropertiesConverter; -import org.apache.shardingsphere.transaction.distsql.parser.statement.queryable.ShowTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.statement.queryable.ShowTransactionRuleStatement; import org.apache.shardingsphere.transaction.rule.TransactionRule; import java.util.Arrays; diff --git a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java index c29da5bf526b5..07bcc7375df56 100644 --- a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java +++ b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdater.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader; import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.distsql.parser.statement.updatable.AlterTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import java.util.Collection; diff --git a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutorTest.java b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutorTest.java index 0163fa2ca5c4c..03846b22f5f5e 100644 --- a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutorTest.java +++ b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutorTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.distsql.parser.statement.queryable.ShowTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.statement.queryable.ShowTransactionRuleStatement; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.jupiter.api.Test; diff --git a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdaterTest.java b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdaterTest.java index 6673612521055..d2f84d8c14379 100644 --- a/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdaterTest.java +++ b/kernel/transaction/distsql/handler/src/test/java/org/apache/shardingsphere/transaction/distsql/handler/update/AlterTransactionRuleStatementUpdaterTest.java @@ -25,8 +25,8 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; import org.apache.shardingsphere.transaction.distsql.handler.fixture.ShardingSphereTransactionManagerFixture; -import org.apache.shardingsphere.transaction.distsql.parser.segment.TransactionProviderSegment; -import org.apache.shardingsphere.transaction.distsql.parser.statement.updatable.AlterTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment; +import org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java index 54e9bc6dc7db5..9ed42659b4009 100644 --- a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java +++ b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java @@ -28,9 +28,9 @@ import org.apache.shardingsphere.sql.parser.api.ASTNode; import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; -import org.apache.shardingsphere.transaction.distsql.parser.segment.TransactionProviderSegment; -import org.apache.shardingsphere.transaction.distsql.parser.statement.updatable.AlterTransactionRuleStatement; -import org.apache.shardingsphere.transaction.distsql.parser.statement.queryable.ShowTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment; +import org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement; +import org.apache.shardingsphere.transaction.distsql.statement.queryable.ShowTransactionRuleStatement; import java.util.Properties; diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/segment/TransactionProviderSegment.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/segment/TransactionProviderSegment.java similarity index 94% rename from kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/segment/TransactionProviderSegment.java rename to kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/segment/TransactionProviderSegment.java index f1dbb4c0496b3..cc937b5e064cf 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/segment/TransactionProviderSegment.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/segment/TransactionProviderSegment.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.transaction.distsql.parser.segment; +package org.apache.shardingsphere.transaction.distsql.segment; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/queryable/ShowTransactionRuleStatement.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java similarity index 92% rename from kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/queryable/ShowTransactionRuleStatement.java rename to kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java index 3de050e50fab3..261fc4dd6d8fc 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/queryable/ShowTransactionRuleStatement.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/queryable/ShowTransactionRuleStatement.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.transaction.distsql.parser.statement.queryable; +package org.apache.shardingsphere.transaction.distsql.statement.queryable; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; diff --git a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/updatable/AlterTransactionRuleStatement.java b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java similarity index 87% rename from kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/updatable/AlterTransactionRuleStatement.java rename to kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java index 78468b0b777c3..79f6d05abe7b3 100644 --- a/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/statement/updatable/AlterTransactionRuleStatement.java +++ b/kernel/transaction/distsql/statement/src/main/java/org/apache/shardingsphere/transaction/distsql/statement/updatable/AlterTransactionRuleStatement.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.transaction.distsql.parser.statement.updatable; +package org.apache.shardingsphere.transaction.distsql.statement.updatable; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement; -import org.apache.shardingsphere.transaction.distsql.parser.segment.TransactionProviderSegment; +import org.apache.shardingsphere.transaction.distsql.segment.TransactionProviderSegment; /** * Alter transaction rule statement. diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java index 178ac8581017c..04839b27417e8 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutor.java @@ -37,7 +37,7 @@ import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.executor.ConnectionSessionRequiredQueryableRALExecutor; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowStatusFromReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; import java.util.Arrays; import java.util.Collection; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdater.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdater.java index c799f916239a9..9526311de6ae6 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdater.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdater.java @@ -38,7 +38,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service.StorageNodeStatusService; import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.readwritesplitting.rule.ReadwriteSplittingRule; import java.util.Arrays; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java index d3e3cb78ce128..fae9304bb3ecb 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java @@ -38,7 +38,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.readwritesplitting.distsql.handler.update.DropReadwriteSplittingRuleStatementUpdater; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.apache.shardingsphere.single.distsql.statement.rdl.LoadSingleTableStatement; import org.apache.shardingsphere.single.distsql.statement.rdl.SetDefaultSingleTableStorageUnitStatement; import org.apache.shardingsphere.single.distsql.statement.rdl.UnloadSingleTableStatement; diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java index b002d227d188d..652444088b4b9 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java @@ -34,7 +34,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.readwritesplitting.distsql.handler.update.DropReadwriteSplittingRuleStatementUpdater; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import java.util.Collection; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java index b167e61aae83f..2dbc999375713 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLBackendHandlerFactoryTest.java @@ -36,20 +36,20 @@ import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader; import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowRulesStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowAlgorithmsStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowRulesStatement; +import org.apache.shardingsphere.shadow.distsql.statement.ShowShadowTableRulesStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.test.mock.AutoMockExtension; import org.apache.shardingsphere.test.mock.StaticMockSettings; import org.apache.shardingsphere.test.util.PropertiesBuilder; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java index 8525b3ce5eccd..3aa449d831a20 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowStatusFromReadwriteSplittingRulesExecutorTest.java @@ -33,7 +33,7 @@ import org.apache.shardingsphere.mode.repository.cluster.zookeeper.ZookeeperRepository; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowStatusFromReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; import org.apache.shardingsphere.test.mock.AutoMockExtension; diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java index 90aef522d91fe..5e5026ba31a98 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/AlterReadwriteSplittingStorageUnitStatusStatementUpdaterTest.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment; import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.IdentifierValue; import org.apache.shardingsphere.test.mock.AutoMockExtension; diff --git a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java index df2f66bbc212a..8b92f9800b9e9 100644 --- a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java +++ b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommandTest.java @@ -19,7 +19,7 @@ import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.AnalyzeTableStatement; import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterFunctionStatement; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AutoTableRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AutoTableRuleAssert.java index b174ccfb00036..31a9ce4d96963 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AutoTableRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/AutoTableRuleAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.AuditStrategyAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedAutoTableRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/TableRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/TableRuleAssert.java index 3c715c2bc0a09..e074ad8d117c2 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/TableRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/TableRuleAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.AuditStrategyAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedTableRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/AuditStrategyAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/AuditStrategyAssert.java index 2c6bc235cc16c..a3d1371b592b3 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/AuditStrategyAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/AuditStrategyAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.AuditStrategySegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.AuditStrategySegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedAuditStrategy; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java index bcfdf427e81bb..c13f5d684bd67 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptColumnAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedEncryptColumn; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptRuleAssert.java index e12551b821ddf..0f66463db7a6d 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/EncryptRuleAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptColumnSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptColumnSegment; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedEncryptColumn; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedEncryptRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskColumnAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskColumnAssert.java index 042f5f487139e..826d34f61a16c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskColumnAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskColumnAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedMaskColumn; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskRuleAssert.java index 962cf7edfbb8b..b4fff101fc8e9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/MaskRuleAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskColumnSegment; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskColumnSegment; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedMaskColumn; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedMaskRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java index d845125877f18..59a1b9b3e85d5 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ReadwriteSplittingRuleAssert.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.PropertiesAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedAlgorithm; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShadowRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShadowRuleAssert.java index cdea20375d1b2..dc7e1ced2db8a 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShadowRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShadowRuleAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedShadowAlgorithm; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingAuditorAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingAuditorAssert.java index 3db595cb54ce3..be5ff561e26a9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingAuditorAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingAuditorAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.strategy.ShardingAuditorSegment; +import org.apache.shardingsphere.sharding.distsql.segment.strategy.ShardingAuditorSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedShardingAuditor; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingTableReferenceRuleAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingTableReferenceRuleAssert.java index cf68eccf11704..eabf4821131b8 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingTableReferenceRuleAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/distsql/rdl/ShardingTableReferenceRuleAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.rdl.ExpectedShardingTableReferenceRule; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java index 7add3f94b7b07..0bf0798680933 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/QueryableRALStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.authority.distsql.parser.statement.ShowAuthorityRuleStatement; +import org.apache.shardingsphere.authority.distsql.statement.ShowAuthorityRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.QueryableRALStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ConvertYamlConfigurationStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ExportDatabaseConfigurationStatement; @@ -31,9 +31,9 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariableStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowDistVariablesStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.queryable.ShowTableMetaDataStatement; -import org.apache.shardingsphere.parser.distsql.parser.statement.queryable.ShowSQLParserRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.ShowStatusFromReadwriteSplittingRulesStatement; -import org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLTranslatorRuleStatement; +import org.apache.shardingsphere.parser.distsql.statement.queryable.ShowSQLParserRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.ShowStatusFromReadwriteSplittingRulesStatement; +import org.apache.shardingsphere.sqltranslator.distsql.statement.ShowSQLTranslatorRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.queryable.ConvertYamlConfigurationStatementAssert; @@ -47,8 +47,8 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowDistVariablesStatementTestCase; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTableMetaDataStatementTestCase; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTrafficRulesStatementTestCase; -import org.apache.shardingsphere.traffic.distsql.parser.statement.queryable.ShowTrafficRulesStatement; -import org.apache.shardingsphere.transaction.distsql.parser.statement.queryable.ShowTransactionRuleStatement; +import org.apache.shardingsphere.traffic.distsql.statement.queryable.ShowTrafficRulesStatement; +import org.apache.shardingsphere.transaction.distsql.statement.queryable.ShowTransactionRuleStatement; /** * Queryable RAL statement assert. diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java index 1a8bde443f12e..08b9c19fb0b76 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/UpdatableRALStatementAssert.java @@ -28,9 +28,9 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement; import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.UnlabelComputeNodeStatement; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable.AlterGlobalClockRuleStatement; -import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; +import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ral.impl.updatable.AlterComputeNodeStatementAssert; @@ -58,8 +58,8 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.RefreshTableMetaDataStatementTestCase; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.SetDistVariableStatementTestCase; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.UnlabelComputeNodeStatementTestCase; -import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement; -import org.apache.shardingsphere.transaction.distsql.parser.statement.updatable.AlterTransactionRuleStatement; +import org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement; +import org.apache.shardingsphere.transaction.distsql.statement.updatable.AlterTransactionRuleStatement; /** * Updatable RAL statement assert. diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTrafficRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTrafficRulesStatementAssert.java index 69ab9079dee0a..73b8cd33d876c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTrafficRulesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTrafficRulesStatementAssert.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.ShowTrafficRulesStatementTestCase; -import org.apache.shardingsphere.traffic.distsql.parser.statement.queryable.ShowTrafficRulesStatement; +import org.apache.shardingsphere.traffic.distsql.statement.queryable.ShowTrafficRulesStatement; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterGlobalClockRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterGlobalClockRuleStatementAssert.java index 590936ca2d125..42ab8af4f5c9c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterGlobalClockRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterGlobalClockRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.globalclock.distsql.parser.statement.updatable.AlterGlobalClockRuleStatement; +import org.apache.shardingsphere.globalclock.distsql.statement.updatable.AlterGlobalClockRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterGlobalClockRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java index e63e65a1e4ca5..9a56b7bdbb2c3 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.status.AlterReadwriteSplittingStorageUnitStatusStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.database.DatabaseAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterSQLParserRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterSQLParserRuleStatementAssert.java index a58baac473fa5..a0a052c01121a 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterSQLParserRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterSQLParserRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.parser.distsql.parser.segment.CacheOptionSegment; -import org.apache.shardingsphere.parser.distsql.parser.statement.updatable.AlterSQLParserRuleStatement; +import org.apache.shardingsphere.parser.distsql.segment.CacheOptionSegment; +import org.apache.shardingsphere.parser.distsql.statement.updatable.AlterSQLParserRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ExpectedCacheOption; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterTrafficRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterTrafficRuleStatementAssert.java index 215273362fa75..9ab06bd9ce45c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterTrafficRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterTrafficRuleStatementAssert.java @@ -24,8 +24,8 @@ import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.distsql.ral.ExpectedTrafficRule; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ral.AlterTrafficRuleStatementTestCase; -import org.apache.shardingsphere.traffic.distsql.parser.segment.TrafficRuleSegment; -import org.apache.shardingsphere.traffic.distsql.parser.statement.updatable.AlterTrafficRuleStatement; +import org.apache.shardingsphere.traffic.distsql.segment.TrafficRuleSegment; +import org.apache.shardingsphere.traffic.distsql.statement.updatable.AlterTrafficRuleStatement; import java.util.Collection; import java.util.List; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java index e3484ebb49514..3507fbdbeb10b 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/AlterRuleStatementAssert.java @@ -20,14 +20,14 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.shardingsphere.distsql.parser.statement.rdl.alter.AlterRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.AlterMaskRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterDefaultShadowAlgorithmStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.alter.impl.AlterDefaultShardingStrategyStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShadowAlgorithmStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShadowAlgorithmStatementAssert.java index 50bae4d8aec41..963b9bff9c0f9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShadowAlgorithmStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShadowAlgorithmStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShardingStrategyStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShardingStrategyStatementAssert.java index e1aba27625582..052bc7f0eeb54 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShardingStrategyStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterDefaultShardingStrategyStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.AlterDefaultShardingStrategyStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.AlterDefaultShardingStrategyStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java index 753cf23e6c712..b4fe7299aa2d4 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterEncryptRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.AlterEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.AlterEncryptRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.EncryptRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterMaskRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterMaskRuleStatementAssert.java index 58c8d5a6ab427..e714e74a7ed4d 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterMaskRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterMaskRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.AlterMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.AlterMaskRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.MaskRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java index ebe27021e9fa6..3144eb0fcaf13 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterReadwriteSplittingRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.AlterReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.AlterReadwriteSplittingRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ReadwriteSplittingRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java index 2c139c9d002be..6101e2c977503 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShadowRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.AlterShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.AlterShadowRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ShadowRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java index bad63f96e38db..a004cebfb6fc3 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableReferenceRulesStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableReferenceRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ShardingTableReferenceRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java index f8f5720e013cb..05c977cba5c32 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/alter/impl/AlterShardingTableRuleStatementAssert.java @@ -19,9 +19,9 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.AlterShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.AlterShardingTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AutoTableRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.TableRuleAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java index 498828cbb1061..3ef0faaeb54dc 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/CreateRuleStatementAssert.java @@ -19,16 +19,16 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CreateBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.CreateRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CreateEncryptRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.CreateMaskRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateDefaultShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.single.distsql.statement.rdl.SetDefaultSingleTableStorageUnitStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.create.impl.CreateBroadcastTableRuleStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateBroadcastTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateBroadcastTableRuleStatementAssert.java index 147d94a437aa9..7ad8c9c8d1aec 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateBroadcastTableRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateBroadcastTableRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.CreateBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.CreateBroadcastTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.CreateBroadcastTableRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShadowAlgorithmStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShadowAlgorithmStatementAssert.java index 9a805ce2e0f37..970722c4a98f9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShadowAlgorithmStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShadowAlgorithmStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowAlgorithmSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateDefaultShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowAlgorithmSegment; +import org.apache.shardingsphere.shadow.distsql.statement.CreateDefaultShadowAlgorithmStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AlgorithmAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShardingStrategyStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShardingStrategyStatementAssert.java index cfa5ad8675c94..650a55e6e48c4 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShardingStrategyStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateDefaultShardingStrategyStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.CreateDefaultShardingStrategyStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.CreateDefaultShardingStrategyStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java index 6e7f7576586eb..36385ee4d086c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateEncryptRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.encrypt.distsql.parser.segment.EncryptRuleSegment; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.CreateEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.segment.EncryptRuleSegment; +import org.apache.shardingsphere.encrypt.distsql.statement.CreateEncryptRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.EncryptRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateMaskRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateMaskRuleStatementAssert.java index f4e4de5fb9c34..97849d13c43f8 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateMaskRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateMaskRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.mask.distsql.parser.segment.MaskRuleSegment; -import org.apache.shardingsphere.mask.distsql.parser.statement.CreateMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.segment.MaskRuleSegment; +import org.apache.shardingsphere.mask.distsql.statement.CreateMaskRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.MaskRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java index 57dbf45f86b61..9ee8960f369f0 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateReadwriteSplittingRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.segment.ReadwriteSplittingRuleSegment; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.CreateReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.segment.ReadwriteSplittingRuleSegment; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.CreateReadwriteSplittingRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ReadwriteSplittingRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java index 5a8f88f8403de..53bd92de244a5 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShadowRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.segment.ShadowRuleSegment; -import org.apache.shardingsphere.shadow.distsql.parser.statement.CreateShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.segment.ShadowRuleSegment; +import org.apache.shardingsphere.shadow.distsql.statement.CreateShadowRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ShadowRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java index 02d600e0ec3c5..a96f0d26f8c53 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableReferenceRuleStatementAssert.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableReferenceRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableReferenceRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableReferenceRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.rdl.ShardingTableReferenceRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java index e37e91e2f3e39..e75909dcf58f9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/create/impl/CreateShardingTableRuleStatementAssert.java @@ -19,9 +19,9 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.AutoTableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.segment.table.TableRuleSegment; -import org.apache.shardingsphere.sharding.distsql.parser.statement.CreateShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.segment.table.AutoTableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.segment.table.TableRuleSegment; +import org.apache.shardingsphere.sharding.distsql.statement.CreateShardingTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.AutoTableRuleAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.distsql.TableRuleAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java index 64fe9a2db18f7..9efd94a15651c 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/DropRuleStatementAssert.java @@ -19,19 +19,19 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.DropBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.distsql.parser.statement.rdl.drop.DropRuleStatement; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement; -import org.apache.shardingsphere.mask.distsql.parser.statement.DropMaskRuleStatement; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAlgorithmStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAuditorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableReferenceRuleStatement; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropBroadcastTableRuleStatementAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rdl.drop.impl.DropDefaultShardingStrategyStatementAssert; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropBroadcastTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropBroadcastTableRuleStatementAssert.java index 64456d5aaf8b1..4898ac83af5a8 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropBroadcastTableRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropBroadcastTableRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.broadcast.distsql.parser.statement.DropBroadcastTableRuleStatement; +import org.apache.shardingsphere.broadcast.distsql.statement.DropBroadcastTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropBroadcastTableRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java index c7620eb7008d8..146b26a9da4c5 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropDefaultShardingStrategyStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropDefaultShardingStrategyStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropDefaultShardingStrategyStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropDefaultShardingStrategyStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropEncryptRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropEncryptRuleStatementAssert.java index f618c88ce8591..3a27de9838237 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropEncryptRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropEncryptRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.encrypt.distsql.parser.statement.DropEncryptRuleStatement; +import org.apache.shardingsphere.encrypt.distsql.statement.DropEncryptRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.encrypt.DropEncryptRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropMaskRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropMaskRuleStatementAssert.java index 4e12f8f7835b3..78fa9f7ea660e 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropMaskRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropMaskRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.mask.distsql.parser.statement.DropMaskRuleStatement; +import org.apache.shardingsphere.mask.distsql.statement.DropMaskRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.mask.DropMaskRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java index c472ba998e89f..1792f90d16e26 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropReadwriteSplittingRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.readwritesplitting.distsql.parser.statement.DropReadwriteSplittingRuleStatement; +import org.apache.shardingsphere.readwritesplitting.distsql.statement.DropReadwriteSplittingRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.readwritesplitting.DropReadwriteSplittingRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java index dac0627569ea9..96bad20b208a5 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowAlgorithmStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowAlgorithmStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowAlgorithmStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.shadow.DropShadowAlgorithmStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowRuleStatementAssert.java index be8644c7ec150..04b6ca39271ca 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShadowRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.shadow.distsql.parser.statement.DropShadowRuleStatement; +import org.apache.shardingsphere.shadow.distsql.statement.DropShadowRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.shadow.DropShadowRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java index f5934c5ffd6e5..62385ab687e9e 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAlgorithmStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAlgorithmStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAlgorithmStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropShardingAlgorithmStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAuditorStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAuditorStatementAssert.java index a3e8a84068926..50758731eebc9 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAuditorStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingAuditorStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingAuditorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingAuditorStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropShardingAuditorStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java index b0882367ae92e..a0e076fdadab4 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingKeyGeneratorStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingKeyGeneratorStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropShardingKeyGeneratorStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableReferenceRulesStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableReferenceRulesStatementAssert.java index a3f53b6078ee1..ff551be657468 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableReferenceRulesStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableReferenceRulesStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableReferenceRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableReferenceRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropShardingTableReferenceRuleStatementTestCase; diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableRuleStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableRuleStatementAssert.java index 19a53f9870650..dc137c93dbc45 100644 --- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableRuleStatementAssert.java +++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rdl/drop/impl/DropShardingTableRuleStatementAssert.java @@ -19,7 +19,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingTableRuleStatement; +import org.apache.shardingsphere.sharding.distsql.statement.DropShardingTableRuleStatement; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.ExistingAssert; import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding.DropShardingTableRuleStatementTestCase;