This is an automated email from the ASF dual-hosted git repository. zhaojinchao 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 59ff0c1e135 Move TransactionType to api module (#22568) 59ff0c1e135 is described below commit 59ff0c1e13536cb4178852b5234e7f2706055e86 Author: ZhangCheng <flyin...@outlook.com> AuthorDate: Thu Dec 1 19:34:19 2022 +0800 Move TransactionType to api module (#22568) * Move TransactionType to api module * Move TransactionType to api module --- .../plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java | 2 +- .../resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl | 2 +- .../example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java | 2 +- .../example/transaction/xa/bitronix/raw/jdbc/OrderServiceImpl.java | 2 +- .../example/transaction/xa/narayana/raw/jdbc/OrderServiceImpl.java | 2 +- .../example/transaction/xa/spring/boot/XAOrderService.java | 2 +- .../example/transaction/xa/spring/boot/XAOrderServiceTest.java | 2 +- .../example/transaction/xa/spring/namspace/XAOrderService.java | 2 +- .../example/transaction/xa/spring/namspace/XAOrderServiceTest.java | 2 +- .../example/transaction/base/seata/raw/jdbc/SeataATOrderService.java | 2 +- .../example/transaction/base/seata/spring/boot/SeataATOrderService.java | 2 +- .../transaction/base/seata/spring/boot/SeataATOrderServiceTest.java | 2 +- .../shardingsphere/driver/jdbc/core/connection/ConnectionManager.java | 2 +- .../driver/jdbc/core/statement/ShardingSpherePreparedStatement.java | 2 +- .../driver/jdbc/core/statement/ShardingSphereStatement.java | 2 +- .../apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java | 2 +- .../driver/jdbc/core/connection/ConnectionManagerTest.java | 2 +- .../driver/jdbc/core/connection/ShardingSphereConnectionTest.java | 2 +- .../org/apache/shardingsphere/transaction/api}/TransactionType.java | 2 +- .../org/apache/shardingsphere/transaction/ConnectionTransaction.java | 2 +- .../transaction/ShardingSphereTransactionManagerEngine.java | 2 +- .../transaction/annotation/ShardingSphereTransactionType.java | 2 +- .../apache/shardingsphere/transaction/core/TransactionTypeHolder.java | 1 + .../org/apache/shardingsphere/transaction/rule/TransactionRule.java | 2 +- .../rule/builder/DefaultTransactionRuleConfigurationBuilder.java | 2 +- .../transaction/spi/ShardingSphereTransactionManager.java | 2 +- .../transaction/ShardingSphereTransactionManagerEngineTest.java | 2 +- .../shardingsphere/transaction/core/TransactionTypeHolderTest.java | 1 + .../org/apache/shardingsphere/transaction/core/TransactionTypeTest.java | 1 + .../core/fixture/OtherShardingSphereTransactionManagerFixture.java | 2 +- .../core/fixture/ShardingSphereTransactionManagerFixture.java | 2 +- .../org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java | 2 +- .../rule/builder/DefaultTransactionRuleConfigurationBuilderTest.java | 2 +- .../handler/update/AlterTransactionRuleStatementUpdaterTest.java | 2 +- .../base/seata/at/SeataATShardingSphereTransactionManager.java | 2 +- .../base/seata/at/SeataATShardingSphereTransactionManagerTest.java | 2 +- .../transaction/xa/XAShardingSphereTransactionManager.java | 2 +- .../transaction/xa/XAShardingSphereTransactionManagerTest.java | 2 +- .../shardingsphere/proxy/backend/communication/ProxySQLExecutor.java | 2 +- .../proxy/backend/communication/ReactiveProxySQLExecutor.java | 2 +- .../backend/communication/jdbc/connection/JDBCBackendConnection.java | 2 +- .../backend/communication/jdbc/datasource/JDBCBackendDataSource.java | 2 +- .../communication/jdbc/transaction/JDBCBackendTransactionManager.java | 2 +- .../proxy/backend/communication/vertx/VertxBackendConnection.java | 2 +- .../backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java | 2 +- .../backend/handler/distsql/ral/updatable/SetDistVariableHandler.java | 2 +- .../apache/shardingsphere/proxy/backend/session/ConnectionSession.java | 2 +- .../proxy/backend/session/transaction/TransactionStatus.java | 2 +- .../proxy/backend/communication/ProxySQLExecutorTest.java | 2 +- .../communication/jdbc/connection/JDBCBackendConnectionTest.java | 2 +- .../jdbc/transaction/JDBCBackendTransactionManagerTest.java | 2 +- .../backend/communication/jdbc/transaction/TransactionStatusTest.java | 2 +- .../proxy/backend/handler/ProxyBackendHandlerFactoryTest.java | 2 +- .../handler/admin/mysql/executor/ShowProcessListExecutorTest.java | 2 +- .../distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java | 2 +- .../handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java | 2 +- .../distsql/ral/updatable/SetDistVariableBackendHandlerTest.java | 2 +- .../handler/distsql/ral/updatable/SetDistVariableExecutorTest.java | 2 +- .../backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java | 2 +- .../shardingsphere/proxy/backend/session/ConnectionSessionTest.java | 2 +- .../shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java | 2 +- .../shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java | 2 +- .../mysql/command/admin/MySQLComResetConnectionExecutorTest.java | 2 +- .../mysql/command/query/binary/reset/MySQLComStmtResetExecutorTest.java | 2 +- .../frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java | 2 +- .../command/query/extended/bind/PostgreSQLComBindExecutorTest.java | 2 +- .../command/query/extended/sync/PostgreSQLComSyncExecutorTest.java | 2 +- .../integration/transaction/cases/nested/NestedTransactionTestCase.java | 2 +- .../transaction/cases/truncate/MySQLLocalTruncateTestCase.java | 2 +- .../integration/transaction/cases/truncate/MySQLXATruncateTestCase.java | 2 +- .../shardingsphere/integration/transaction/engine/base/BaseITCase.java | 2 +- .../integration/transaction/engine/base/BaseTransactionITCase.java | 2 +- .../integration/transaction/engine/base/TransactionTestCase.java | 2 +- .../transaction/framework/param/TransactionParameterized.java | 2 +- 74 files changed, 74 insertions(+), 71 deletions(-) diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java index 639f35d3513..738729e6dc3 100644 --- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java +++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java @@ -27,7 +27,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.runner.RunWith; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; diff --git a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl index c17ee5da980..ffe191226e9 100644 --- a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl +++ b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/java/repository/jdbc/OrderRepository.ftl @@ -20,7 +20,7 @@ package org.apache.shardingsphere.example.${package}.${framework?replace('-', '. import org.apache.shardingsphere.example.${package}.${framework?replace('-', '.')}.entity.Order; <#if transaction?contains("xa")> -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; </#if> diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java index e78df5a5654..79abab845bb 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-atomikos-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/atomikos/raw/jdbc/XAOrderService.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.example.transaction.xa.atomikos.raw.jdbc; import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import javax.sql.DataSource; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/bitronix/raw/jdbc/OrderServiceImpl.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/bitronix/raw/jdbc/OrderServiceImpl.java index 2344c1e19be..614a57f285d 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/bitronix/raw/jdbc/OrderServiceImpl.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-bitronix-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/bitronix/raw/jdbc/OrderServiceImpl.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.example.transaction.xa.bitronix.raw.jdbc; import org.apache.shardingsphere.example.core.api.service.ExampleService; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import javax.sql.DataSource; import java.sql.Connection; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/narayana/raw/jdbc/OrderServiceImpl.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/narayana/raw/jdbc/OrderServiceImpl.java index 63a98de8569..73d4a2635bd 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/narayana/raw/jdbc/OrderServiceImpl.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-narayana-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/narayana/raw/jdbc/OrderServiceImpl.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.example.transaction.xa.narayana.raw.jdbc; import org.apache.shardingsphere.example.core.api.service.ExampleService; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import javax.sql.DataSource; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java index ee4455be33b..8892d93117a 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderService.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.xa.spring.boot; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderServiceTest.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderServiceTest.java index 16f2908e2cf..afde6078114 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderServiceTest.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/boot/XAOrderServiceTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.xa.spring.boot; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java index 815289e5216..e508243cef5 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderService.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.xa.spring.namspace; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderServiceTest.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderServiceTest.java index 3f751559bac..2f965498e7b 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderServiceTest.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/test/java/org/apache/shardingsphere/example/transaction/xa/spring/namspace/XAOrderServiceTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.xa.spring.namspace; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/raw/jdbc/SeataATOrderService.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/raw/jdbc/SeataATOrderService.java index 3c8bb9c8d73..b29e14a9271 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/raw/jdbc/SeataATOrderService.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/raw/jdbc/SeataATOrderService.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.example.transaction.base.seata.raw.jdbc; import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import javax.sql.DataSource; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java index 11642843ec5..810079eb2b4 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/main/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderService.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.base.seata.spring.boot; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderServiceTest.java b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderServiceTest.java index c5a2f832acf..4610125e2b9 100644 --- a/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderServiceTest.java +++ b/examples/shardingsphere-jdbc-example/single-feature-example/transaction-example/transaction-base-seata-spring-boot-example/src/test/java/org/apache/shardingsphere/example/transaction/base/seata/spring/boot/SeataATOrderServiceTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.example.transaction.base.seata.spring.boot; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java index 39a800d5e72..51b1815d731 100644 --- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java +++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManager.java @@ -39,7 +39,7 @@ import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.apache.shardingsphere.transaction.ConnectionSavepointManager; import org.apache.shardingsphere.transaction.ConnectionTransaction; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.apache.shardingsphere.transaction.rule.TransactionRule; diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java index b0c6a9c1762..70b25ed07ae 100644 --- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java +++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java @@ -91,7 +91,7 @@ import org.apache.shardingsphere.traffic.engine.TrafficEngine; import org.apache.shardingsphere.traffic.exception.metadata.EmptyTrafficExecutionUnitException; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.apache.shardingsphere.transaction.ConnectionTransaction; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.Connection; import java.sql.ParameterMetaData; diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java index ca2fad67d12..2d80e864700 100644 --- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java +++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java @@ -84,7 +84,7 @@ import org.apache.shardingsphere.traffic.engine.TrafficEngine; import org.apache.shardingsphere.traffic.exception.metadata.EmptyTrafficExecutionUnitException; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.apache.shardingsphere.transaction.ConnectionTransaction; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.Connection; import java.sql.ResultSet; diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java index e329226a019..1a985056369 100644 --- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java +++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/executor/AbstractBaseExecutorTest.java @@ -32,7 +32,7 @@ import org.apache.shardingsphere.sharding.rule.ShardingRule; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.apache.shardingsphere.traffic.rule.builder.DefaultTrafficRuleConfigurationBuilder; import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.After; diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java index 3c6438a522d..d157815e4b2 100644 --- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java +++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ConnectionManagerTest.java @@ -30,7 +30,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.mode.metadata.persist.MetaDataPersistService; import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; import org.apache.shardingsphere.traffic.rule.TrafficRule; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.After; diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java index 37bb5ba851d..0ca08fd98a5 100644 --- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java +++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/connection/ShardingSphereConnectionTest.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.traffic.rule.TrafficRule; import org.apache.shardingsphere.transaction.ConnectionTransaction; import org.apache.shardingsphere.transaction.ConnectionTransaction.DistributedTransactionOperationType; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.After; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionType.java b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/api/TransactionType.java similarity index 95% rename from kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionType.java rename to kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/api/TransactionType.java index c309097905d..e1bac3ae747 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionType.java +++ b/kernel/transaction/api/src/main/java/org/apache/shardingsphere/transaction/api/TransactionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.transaction.core; +package org.apache.shardingsphere.transaction.api; /** * Transaction type. diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java index 4e266d65e16..9736e1b1091 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ConnectionTransaction.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.transaction; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.TransactionTypeHolder; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java index f1308be9d25..2da6931125d 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngine.java @@ -21,7 +21,7 @@ import com.google.common.base.Preconditions; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManagerFactory; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java index ed513c90dcd..4b24bc62646 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/annotation/ShardingSphereTransactionType.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.transaction.annotation; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolder.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolder.java index 5fcb48ff5e9..3f79f10946e 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolder.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolder.java @@ -19,6 +19,7 @@ package org.apache.shardingsphere.transaction.core; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.apache.shardingsphere.transaction.api.TransactionType; /** * Hold transaction type for current thread. diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java index bec9b211703..2fdb584cd20 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/TransactionRule.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.rule.identifier.scope.GlobalRule; import org.apache.shardingsphere.infra.rule.identifier.type.ResourceHeldRule; import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import javax.sql.DataSource; import java.util.LinkedHashMap; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilder.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilder.java index c1f45c3a04b..58e8806698d 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilder.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilder.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.transaction.rule.builder; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; import org.apache.shardingsphere.transaction.constant.TransactionOrder; import org.apache.shardingsphere.infra.rule.builder.global.DefaultGlobalRuleConfigurationBuilder; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.Properties; diff --git a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java index fcf91c6d859..a3e2094b6f4 100644 --- a/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java +++ b/kernel/transaction/core/src/main/java/org/apache/shardingsphere/transaction/spi/ShardingSphereTransactionManager.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.transaction.spi; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.Connection; import java.sql.SQLException; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java index 6dacc323969..43c29ecf34d 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/ShardingSphereTransactionManagerEngineTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.transaction; import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.fixture.ShardingSphereTransactionManagerFixture; import org.junit.Test; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolderTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolderTest.java index b6396db57b2..9fdd7c23c9e 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolderTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeHolderTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.transaction.core; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeTest.java index 06ffad069c7..4cce8e578d5 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/TransactionTypeTest.java @@ -17,6 +17,7 @@ package org.apache.shardingsphere.transaction.core; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java index 48b475aeb15..8274471f9fc 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/OtherShardingSphereTransactionManagerFixture.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.transaction.core.fixture; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import java.sql.Connection; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java index 5b793d03001..30882d23d06 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/core/fixture/ShardingSphereTransactionManagerFixture.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.transaction.core.fixture; import lombok.Setter; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import java.sql.Connection; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java index 15c937b6ccc..e47a7e10591 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/TransactionRuleTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData; import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.core.fixture.ShardingSphereTransactionManagerFixture; import org.junit.Test; diff --git a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilderTest.java b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilderTest.java index e08040ebb1e..493b3cb8eea 100644 --- a/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilderTest.java +++ b/kernel/transaction/core/src/test/java/org/apache/shardingsphere/transaction/rule/builder/DefaultTransactionRuleConfigurationBuilderTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.transaction.rule.builder; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import java.util.Properties; 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 4d764b020c3..d21a41d323a 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 @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData; import org.apache.shardingsphere.infra.util.props.PropertiesConverter; import org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.distsql.parser.segment.TransactionProviderSegment; import org.apache.shardingsphere.transaction.distsql.parser.statement.updatable.AlterTransactionRuleStatement; import org.apache.shardingsphere.transaction.rule.TransactionRule; diff --git a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java index 5dd2a5bf52b..5895036c709 100644 --- a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java +++ b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java @@ -31,7 +31,7 @@ import io.seata.tm.api.GlobalTransactionContext; import lombok.SneakyThrows; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import javax.sql.DataSource; diff --git a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java index 9eb0a522b62..b947ad65367 100644 --- a/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java +++ b/kernel/transaction/type/base/seata-at/src/test/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManagerTest.java @@ -35,7 +35,7 @@ import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap; import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; import org.apache.shardingsphere.transaction.base.seata.at.fixture.MockSeataServer; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java index 7748806d2c6..c2689366900 100644 --- a/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java +++ b/kernel/transaction/type/xa/core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.transaction.xa; import lombok.SneakyThrows; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionDataSource; import org.apache.shardingsphere.transaction.xa.manager.XATransactionManagerProviderFactory; diff --git a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java index c3dac91cb5e..34b7731b1c2 100644 --- a/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java +++ b/kernel/transaction/type/xa/core/src/test/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java @@ -23,7 +23,7 @@ import lombok.SneakyThrows; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory; import org.apache.shardingsphere.transaction.core.ResourceDataSource; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.xa.fixture.DataSourceUtils; import org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionDataSource; import org.junit.After; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java index 29995964113..4992eb2170d 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutor.java @@ -60,7 +60,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl.OpenGaussCursorStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.Connection; import java.sql.SQLException; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java index c4ed1f15924..f5d2650f2ed 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/ReactiveProxySQLExecutor.java @@ -47,7 +47,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.TruncateSta import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl.OpenGaussCursorStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.SQLException; import java.util.Collection; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java index ba5260f66f2..c6e0825df05 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnection.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.exception.BackendConnectionExcept import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.util.TransactionUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.sql.Connection; import java.sql.SQLException; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java index f015e828242..a48e1c8a83e 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCBackendDataSource.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.exception.OverallConnectionNotEnoughExcep import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMode; import org.apache.shardingsphere.proxy.backend.communication.BackendDataSource; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java index 2621c9fe1e7..0173ec12529 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManager.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDB import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.transaction.ConnectionSavepointManager; import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendConnection.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendConnection.java index e48d3d16d74..68f2e54996d 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendConnection.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/VertxBackendConnection.java @@ -34,7 +34,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Con import org.apache.shardingsphere.proxy.backend.communication.vertx.transaction.VertxLocalTransactionManager; import org.apache.shardingsphere.proxy.backend.reactive.context.ReactiveProxyContext; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.ArrayList; import java.util.Collection; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java index b86a880c511..e9a5f79c197 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableHandler.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.QueryableRALB import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.enums.VariableEnum; import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException; import org.apache.shardingsphere.proxy.backend.util.SystemPropertyUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.Arrays; import java.util.Collection; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java index 46b81624ff7..4bcbf84f967 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableHandler.java @@ -31,7 +31,7 @@ import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableExce import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler; import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.enums.VariableEnum; import org.apache.shardingsphere.proxy.backend.util.SystemPropertyUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.Properties; diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java index 6ba901d3963..29600d3d4bf 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSession.java @@ -36,7 +36,7 @@ import org.apache.shardingsphere.proxy.backend.communication.vertx.VertxBackendS import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.sql.parser.sql.common.enums.TransactionIsolationLevel; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; /** * Connection session. diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/transaction/TransactionStatus.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/transaction/TransactionStatus.java index 3e3a13e4450..4ed595a20fa 100644 --- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/transaction/TransactionStatus.java +++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/session/transaction/TransactionStatus.java @@ -19,7 +19,7 @@ package org.apache.shardingsphere.proxy.backend.session.transaction; import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.exception.SwitchTypeInTransactionException; /** diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java index 5d79c3a7da0..77e1134e915 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/ProxySQLExecutorTest.java @@ -56,7 +56,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl. import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLCreateTableStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLTruncateStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.dml.PostgreSQLInsertStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java index 328fcc18482..eda71cbbd4d 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/JDBCBackendConnectionTest.java @@ -38,7 +38,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.RequiredSessionVariableRecorder; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java index bd7e0060439..ab39022b51d 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/JDBCBackendTransactionManagerTest.java @@ -28,7 +28,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.apache.shardingsphere.transaction.spi.ShardingSphereTransactionManager; import org.junit.Before; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/TransactionStatusTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/TransactionStatusTest.java index e8c738b01c9..5d5eff6a038 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/TransactionStatusTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/transaction/TransactionStatusTest.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java index 3370c3115f2..6e5ba757cf2 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java @@ -47,7 +47,7 @@ import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; import org.apache.shardingsphere.sql.parser.api.CacheOption; import org.apache.shardingsphere.sql.parser.exception.SQLParsingException; import org.apache.shardingsphere.transaction.ShardingSphereTransactionManagerEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.Before; import org.junit.Ignore; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcessListExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcessListExecutorTest.java index ba172598618..4cb306c4ed0 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcessListExecutorTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/admin/mysql/executor/ShowProcessListExecutorTest.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java index 526940c0398..c466904cda0 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableBackendHandlerTest.java @@ -32,7 +32,7 @@ import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.common.enums. import org.apache.shardingsphere.proxy.backend.exception.UnsupportedVariableException; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; import org.apache.shardingsphere.proxy.backend.util.SystemPropertyUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java index a694c3b2123..70d394b068b 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader; import org.apache.shardingsphere.proxy.backend.response.header.query.QueryResponseHeader; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java index 4c0114e1846..063f27baa6c 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableBackendHandlerTest.java @@ -39,7 +39,7 @@ import org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResp import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; import org.apache.shardingsphere.proxy.backend.util.SystemPropertyUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java index e6108150b1c..ef3586f7f74 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetDistVariableExecutorTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; import org.apache.shardingsphere.proxy.backend.util.SystemPropertyUtil; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java index 0a2e218a69a..423213d4de9 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/RuleDefinitionBackendHandlerTest.java @@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.handler.distsql.fixture.CreateFixtureRuleStatement; import org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.RuleDefinitionBackendHandler; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; diff --git a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java index bdf1594cfe2..4e5648414f6 100644 --- a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java +++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/session/ConnectionSessionTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDB import org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.JDBCBackendTransactionManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.apache.shardingsphere.transaction.exception.SwitchTypeInTransactionException; import org.apache.shardingsphere.transaction.rule.TransactionRule; import org.junit.Before; diff --git a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java index fe124427645..4bc525845f0 100644 --- a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java +++ b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyState.java @@ -26,7 +26,7 @@ import org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask; import org.apache.shardingsphere.proxy.frontend.executor.ConnectionThreadExecutorGroup; import org.apache.shardingsphere.proxy.frontend.executor.UserExecutorGroup; import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.concurrent.ExecutorService; diff --git a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java index 5834a592acd..672c5e6a721 100644 --- a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java +++ b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/state/impl/JDBCOKProxyStateTest.java @@ -30,7 +30,7 @@ import org.apache.shardingsphere.proxy.frontend.ProxyContextRestorer; import org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask; import org.apache.shardingsphere.proxy.frontend.executor.ConnectionThreadExecutorGroup; import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/MySQLComResetConnectionExecutorTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/MySQLComResetConnectionExecutorTest.java index dc50aa23ead..4ef5e825897 100644 --- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/MySQLComResetConnectionExecutorTest.java +++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/admin/MySQLComResetConnectionExecutorTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.ServerPreparedStatementRegistry; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.proxy.frontend.mysql.command.query.binary.MySQLServerPreparedStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import org.mockito.MockedConstruction; diff --git a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/reset/MySQLComStmtResetExecutorTest.java b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/reset/MySQLComStmtResetExecutorTest.java index 91850c52ed8..3a8d8d8da6a 100644 --- a/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/reset/MySQLComStmtResetExecutorTest.java +++ b/proxy/frontend/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/reset/MySQLComStmtResetExecutorTest.java @@ -25,7 +25,7 @@ import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.ServerPreparedStatementRegistry; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; import org.apache.shardingsphere.proxy.frontend.mysql.command.query.binary.MySQLServerPreparedStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import java.util.Collection; diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java index f47b0e40551..51448cdece0 100644 --- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java +++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngineTest.java @@ -35,7 +35,7 @@ import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionSt import org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType; import org.apache.shardingsphere.proxy.frontend.postgresql.ProxyContextRestorer; import org.apache.shardingsphere.proxy.frontend.postgresql.command.query.simple.PostgreSQLComQueryExecutor; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java index 1bc65407bf0..a4719d4cbb3 100644 --- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java +++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/bind/PostgreSQLComBindExecutorTest.java @@ -34,7 +34,7 @@ import org.apache.shardingsphere.proxy.frontend.postgresql.command.PortalContext import org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.JDBCPortal; import org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.PostgreSQLServerPreparedStatement; import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.dal.PostgreSQLEmptyStatement; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/sync/PostgreSQLComSyncExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/sync/PostgreSQLComSyncExecutorTest.java index d23cff4e6af..bec4cf6c375 100644 --- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/sync/PostgreSQLComSyncExecutorTest.java +++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/sync/PostgreSQLComSyncExecutorTest.java @@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extend import org.apache.shardingsphere.db.protocol.postgresql.packet.generic.PostgreSQLReadyForQueryPacket; import org.apache.shardingsphere.proxy.backend.session.ConnectionSession; import org.apache.shardingsphere.proxy.backend.session.transaction.TransactionStatus; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/nested/NestedTransactionTestCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/nested/NestedTransactionTestCase.java index 86242a67150..680bf17aad9 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/nested/NestedTransactionTestCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/nested/NestedTransactionTestCase.java @@ -22,7 +22,7 @@ import org.apache.shardingsphere.integration.transaction.cases.base.BaseTransact import org.apache.shardingsphere.integration.transaction.engine.base.BaseTransactionITCase; import org.apache.shardingsphere.integration.transaction.engine.base.TransactionTestCase; import org.apache.shardingsphere.test.integration.env.container.atomic.constants.AdapterContainerConstants; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import org.junit.Assert; import javax.sql.DataSource; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLLocalTruncateTestCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLLocalTruncateTestCase.java index 6da968b63fc..9bb24a3efaa 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLLocalTruncateTestCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLLocalTruncateTestCase.java @@ -21,7 +21,7 @@ import org.apache.shardingsphere.integration.transaction.cases.base.BaseTransact import org.apache.shardingsphere.integration.transaction.engine.base.BaseTransactionITCase; import org.apache.shardingsphere.integration.transaction.engine.base.TransactionTestCase; import org.apache.shardingsphere.integration.transaction.engine.constants.TransactionTestConstants; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLXATruncateTestCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLXATruncateTestCase.java index f68cec094db..64e290ae041 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLXATruncateTestCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/truncate/MySQLXATruncateTestCase.java @@ -24,7 +24,7 @@ import org.apache.shardingsphere.integration.transaction.engine.base.BaseTransac import org.apache.shardingsphere.integration.transaction.engine.base.TransactionTestCase; import org.apache.shardingsphere.integration.transaction.engine.constants.TransactionTestConstants; import org.apache.shardingsphere.test.integration.env.container.atomic.constants.AdapterContainerConstants; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java index f44f872f644..55c1d00ff93 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java @@ -42,7 +42,7 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.constants import org.apache.shardingsphere.test.integration.env.container.atomic.storage.DockerStorageContainer; import org.apache.shardingsphere.test.integration.env.container.atomic.util.StorageContainerUtil; import org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import javax.sql.DataSource; import javax.xml.bind.JAXB; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseTransactionITCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseTransactionITCase.java index 732d472b356..e4ad8c45a0d 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseTransactionITCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseTransactionITCase.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.integration.transaction.cases.base.BaseTransact import org.apache.shardingsphere.integration.transaction.engine.constants.TransactionTestConstants; import org.apache.shardingsphere.integration.transaction.framework.param.TransactionParameterized; import org.apache.shardingsphere.test.integration.env.container.atomic.constants.AdapterContainerConstants; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/TransactionTestCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/TransactionTestCase.java index 0696fe1233e..8eb6c394920 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/TransactionTestCase.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/TransactionTestCase.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.integration.transaction.engine.base; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java index 53d8c0e6226..a4bbd0ae20e 100644 --- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java +++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/param/TransactionParameterized.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.infra.database.type.DatabaseType; import org.apache.shardingsphere.integration.transaction.cases.base.BaseTransactionTestCase; -import org.apache.shardingsphere.transaction.core.TransactionType; +import org.apache.shardingsphere.transaction.api.TransactionType; import java.util.Collection; import java.util.List;