This is an automated email from the ASF dual-hosted git repository. zhangliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push: new 736414d9466 Add shardingsphere-infra-rewrite-core module (#35733) 736414d9466 is described below commit 736414d9466459d47db056ca3b712dc48a64a0b7 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Tue Jun 17 15:22:33 2025 +0800 Add shardingsphere-infra-rewrite-core module (#35733) * Add shardingsphere-infra-rewrite-core module * Add shardingsphere-infra-rewrite-core module * Add shardingsphere-infra-rewrite-core module --- features/shadow/core/pom.xml | 2 +- infra/executor/pom.xml | 2 +- infra/rewrite/{ => core}/pom.xml | 4 ++-- .../infra/rewrite/SQLRewriteEntry.java | 0 .../infra/rewrite/context/SQLRewriteContext.java | 0 .../context/SQLRewriteContextDecorator.java | 0 .../rewrite/engine/GenericSQLRewriteEngine.java | 0 .../rewrite/engine/RouteSQLRewriteEngine.java | 0 .../engine/result/GenericSQLRewriteResult.java | 0 .../engine/result/RouteSQLRewriteResult.java | 0 .../rewrite/engine/result/SQLRewriteResult.java | 0 .../rewrite/engine/result/SQLRewriteUnit.java | 0 .../parameter/builder/ParameterBuilder.java | 0 .../builder/impl/GroupedParameterBuilder.java | 0 .../builder/impl/StandardParameterBuilder.java | 0 .../parameter/rewriter/ParameterRewriter.java | 0 .../rewriter/ParameterRewritersBuilder.java | 0 .../rewriter/ParameterRewritersRegistry.java | 0 .../GeneratedKeyInsertValueParameterRewriter.java | 0 .../infra/rewrite/sql/SQLBuilder.java | 0 .../infra/rewrite/sql/impl/AbstractSQLBuilder.java | 0 .../infra/rewrite/sql/impl/DefaultSQLBuilder.java | 0 .../infra/rewrite/sql/impl/RouteSQLBuilder.java | 0 .../generator/CollectionSQLTokenGenerator.java | 0 .../generator/OptionalSQLTokenGenerator.java | 0 .../token/common/generator/SQLTokenGenerator.java | 0 .../token/common/generator/SQLTokenGenerators.java | 0 .../generator/aware/ConnectionContextAware.java | 0 .../common/generator/aware/ParametersAware.java | 0 .../generator/aware/PreviousSQLTokensAware.java | 0 .../common/generator/aware/RouteContextAware.java | 0 .../generator/aware/SchemaMetaDataAware.java | 0 .../builder/DefaultTokenGeneratorBuilder.java | 0 .../builder/SQLTokenGeneratorBuilder.java | 0 .../generator/generic/RemoveTokenGenerator.java | 0 .../rewrite/sql/token/common/pojo/Attachable.java | 0 .../sql/token/common/pojo/RouteUnitAware.java | 0 .../rewrite/sql/token/common/pojo/SQLToken.java | 0 .../sql/token/common/pojo/Substitutable.java | 0 .../common/pojo/generic/ColumnDefinitionToken.java | 0 .../common/pojo/generic/InsertColumnsToken.java | 2 +- .../sql/token/common/pojo/generic/InsertValue.java | 0 .../common/pojo/generic/InsertValuesToken.java | 0 .../sql/token/common/pojo/generic/RemoveToken.java | 0 .../pojo/generic/SubstitutableColumnNameToken.java | 0 .../generic/SubstituteColumnDefinitionToken.java | 0 .../pojo/generic/UseDefaultInsertColumnsToken.java | 2 +- .../generator/BaseGeneratedKeyTokenGenerator.java | 0 .../GeneratedKeyAssignmentTokenGenerator.java | 0 ...eyForUseDefaultInsertColumnsTokenGenerator.java | 0 .../GeneratedKeyInsertColumnTokenGenerator.java | 0 .../GeneratedKeyInsertValuesTokenGenerator.java | 0 .../keygen/pojo/GeneratedKeyAssignmentToken.java | 0 .../keygen/pojo/GeneratedKeyInsertColumnToken.java | 0 .../pojo/LiteralGeneratedKeyAssignmentToken.java | 0 ...ParameterMarkerGeneratedKeyAssignmentToken.java | 0 .../infra/rewrite/SQLRewriteEntryTest.java | 0 .../rewrite/context/SQLRewriteContextTest.java | 0 .../engine/GenericSQLRewriteEngineTest.java | 0 .../rewrite/engine/RouteSQLRewriteEngineTest.java | 0 .../builder/impl/GroupedParameterBuilderTest.java | 0 .../builder/impl/StandardParameterBuilderTest.java | 0 ...neratedKeyInsertValueParameterRewriterTest.java | 0 .../sql/fixture/RouteUnitAwareSQLTokenFixture.java | 0 .../infra/rewrite/sql/fixture/SQLTokenFixture.java | 0 .../rewrite/sql/impl/DefaultSQLBuilderTest.java | 0 .../rewrite/sql/impl/RouteSQLBuilderTest.java | 0 .../common/generator/SQLTokenGeneratorsTest.java | 0 .../builder/DefaultTokenGeneratorBuilderTest.java | 0 .../sql/token/common/pojo/SQLTokenTest.java | 0 .../pojo/generic/InsertColumnsTokenTest.java | 0 .../token/common/pojo/generic/InsertValueTest.java | 0 .../token/common/pojo/generic/RemoveTokenTest.java | 0 .../generic/SubstitutableColumnNameTokenTest.java | 0 .../generic/UseDefaultInsertColumnsTokenTest.java | 0 .../GeneratedKeyAssignmentTokenGeneratorTest.java | 0 ...rUseDefaultInsertColumnsTokenGeneratorTest.java | 0 ...GeneratedKeyInsertColumnTokenGeneratorTest.java | 0 ...GeneratedKeyInsertValuesTokenGeneratorTest.java | 0 .../pojo/GeneratedKeyAssignmentTokenTest.java | 0 .../pojo/GeneratedKeyInsertColumnTokenTest.java | 0 infra/rewrite/pom.xml | 28 ++++------------------ 82 files changed, 10 insertions(+), 30 deletions(-) diff --git a/features/shadow/core/pom.xml b/features/shadow/core/pom.xml index c7bc3089657..1ec911d3d82 100644 --- a/features/shadow/core/pom.xml +++ b/features/shadow/core/pom.xml @@ -34,7 +34,7 @@ </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-infra-rewrite</artifactId> + <artifactId>shardingsphere-infra-rewrite-core</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/infra/executor/pom.xml b/infra/executor/pom.xml index 426512a0366..7bec7d13d46 100644 --- a/infra/executor/pom.xml +++ b/infra/executor/pom.xml @@ -29,7 +29,7 @@ <dependencies> <dependency> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-infra-rewrite</artifactId> + <artifactId>shardingsphere-infra-rewrite-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/infra/rewrite/pom.xml b/infra/rewrite/core/pom.xml similarity index 94% copy from infra/rewrite/pom.xml copy to infra/rewrite/core/pom.xml index 909e707d22f..a34007f3125 100644 --- a/infra/rewrite/pom.xml +++ b/infra/rewrite/core/pom.xml @@ -20,10 +20,10 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-infra</artifactId> + <artifactId>shardingsphere-infra-rewrite</artifactId> <version>5.5.3-SNAPSHOT</version> </parent> - <artifactId>shardingsphere-infra-rewrite</artifactId> + <artifactId>shardingsphere-infra-rewrite-core</artifactId> <name>${project.artifactId}</name> <dependencies> diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextDecorator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextDecorator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextDecorator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextDecorator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/GenericSQLRewriteResult.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/GenericSQLRewriteResult.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/GenericSQLRewriteResult.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/GenericSQLRewriteResult.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/RouteSQLRewriteResult.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/RouteSQLRewriteResult.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/RouteSQLRewriteResult.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/RouteSQLRewriteResult.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteResult.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteResult.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteResult.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteResult.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteUnit.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteUnit.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteUnit.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/result/SQLRewriteUnit.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/ParameterBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/ParameterBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/ParameterBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/ParameterBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersRegistry.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/SQLBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/SQLBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/SQLBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/SQLBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/CollectionSQLTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/CollectionSQLTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/CollectionSQLTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/CollectionSQLTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/OptionalSQLTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/OptionalSQLTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/OptionalSQLTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/OptionalSQLTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerators.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerators.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerators.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGenerators.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ConnectionContextAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ConnectionContextAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ConnectionContextAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ConnectionContextAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ParametersAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ParametersAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ParametersAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/ParametersAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/PreviousSQLTokensAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/PreviousSQLTokensAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/PreviousSQLTokensAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/PreviousSQLTokensAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/RouteContextAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/RouteContextAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/RouteContextAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/RouteContextAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/SchemaMetaDataAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/SchemaMetaDataAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/SchemaMetaDataAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/aware/SchemaMetaDataAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/SQLTokenGeneratorBuilder.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/SQLTokenGeneratorBuilder.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/SQLTokenGeneratorBuilder.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/SQLTokenGeneratorBuilder.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/generic/RemoveTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/generic/RemoveTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/generic/RemoveTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/generic/RemoveTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Attachable.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Attachable.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Attachable.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Attachable.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/RouteUnitAware.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/RouteUnitAware.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/RouteUnitAware.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/RouteUnitAware.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Substitutable.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Substitutable.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Substitutable.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/Substitutable.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/ColumnDefinitionToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/ColumnDefinitionToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/ColumnDefinitionToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/ColumnDefinitionToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java similarity index 97% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java index de092e2f7bc..84ac3bc87d3 100644 --- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java +++ b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsToken.java @@ -36,7 +36,7 @@ public final class InsertColumnsToken extends SQLToken implements Attachable { public InsertColumnsToken(final int startIndex, final List<String> columns) { super(startIndex); this.columns = columns; - this.quoteCharacter = QuoteCharacter.NONE; + quoteCharacter = QuoteCharacter.NONE; } public InsertColumnsToken(final int startIndex, final List<String> columns, final QuoteCharacter quoteCharacter) { diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValue.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValue.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValue.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValue.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValuesToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValuesToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValuesToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValuesToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstituteColumnDefinitionToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstituteColumnDefinitionToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstituteColumnDefinitionToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstituteColumnDefinitionToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java similarity index 97% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java index fa259e42cab..55f2a9606ba 100644 --- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java +++ b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsToken.java @@ -39,7 +39,7 @@ public final class UseDefaultInsertColumnsToken extends SQLToken implements Atta public UseDefaultInsertColumnsToken(final int startIndex, final List<String> columns) { super(startIndex); this.columns = columns; - this.quoteCharacter = QuoteCharacter.NONE; + quoteCharacter = QuoteCharacter.NONE; } public UseDefaultInsertColumnsToken(final int startIndex, final List<String> columns, final QuoteCharacter quoteCharacter) { diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/BaseGeneratedKeyTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/BaseGeneratedKeyTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/BaseGeneratedKeyTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/BaseGeneratedKeyTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGenerator.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGenerator.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGenerator.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGenerator.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/LiteralGeneratedKeyAssignmentToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/LiteralGeneratedKeyAssignmentToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/LiteralGeneratedKeyAssignmentToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/LiteralGeneratedKeyAssignmentToken.java diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java b/infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java similarity index 100% rename from infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java rename to infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntryTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContextTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngineTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngineTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngineTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngineTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngineTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngineTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngineTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngineTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilderTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilderTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilderTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilderTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/RouteUnitAwareSQLTokenFixture.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/RouteUnitAwareSQLTokenFixture.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/RouteUnitAwareSQLTokenFixture.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/RouteUnitAwareSQLTokenFixture.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/SQLTokenFixture.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/SQLTokenFixture.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/SQLTokenFixture.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/fixture/SQLTokenFixture.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGeneratorsTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGeneratorsTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGeneratorsTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/SQLTokenGeneratorsTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilderTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilderTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilderTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/generator/builder/DefaultTokenGeneratorBuilderTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/SQLTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertColumnsTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValueTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValueTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValueTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/InsertValueTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/RemoveTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/SubstitutableColumnNameTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/common/pojo/generic/UseDefaultInsertColumnsTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGeneratorTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGeneratorTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGeneratorTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyAssignmentTokenGeneratorTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGeneratorTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGeneratorTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGeneratorTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertColumnTokenGeneratorTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGeneratorTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGeneratorTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGeneratorTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/generator/GeneratedKeyInsertValuesTokenGeneratorTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyAssignmentTokenTest.java diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnTokenTest.java b/infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnTokenTest.java similarity index 100% rename from infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnTokenTest.java rename to infra/rewrite/core/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/token/keygen/pojo/GeneratedKeyInsertColumnTokenTest.java diff --git a/infra/rewrite/pom.xml b/infra/rewrite/pom.xml index 909e707d22f..b0dabcb66dd 100644 --- a/infra/rewrite/pom.xml +++ b/infra/rewrite/pom.xml @@ -24,30 +24,10 @@ <version>5.5.3-SNAPSHOT</version> </parent> <artifactId>shardingsphere-infra-rewrite</artifactId> + <packaging>pom</packaging> <name>${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-infra-route-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-sql-translator-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-sql-translator-native-provider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-test-fixture-database</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <modules> + <module>core</module> + </modules> </project>