diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java index c42114c0819af..71475caf3b709 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/spring/boot/SpringBootConfiguration.java @@ -18,10 +18,10 @@ package io.shardingsphere.jdbc.spring.boot; import com.google.common.base.Preconditions; -import io.shardingsphere.core.api.MasterSlaveDataSourceFactory; -import io.shardingsphere.core.api.ShardingDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.util.DataSourceUtil; +import io.shardingsphere.shardingjdbc.util.DataSourceUtil; import io.shardingsphere.jdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties; import io.shardingsphere.jdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties; import io.shardingsphere.jdbc.spring.boot.util.PropertyUtil; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 634d1845b34ff..b39189b47be4e 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -64,7 +64,7 @@ { "name": "sharding.jdbc.datasource", "type": "java.util.Map>", - "sourceType": "io.shardingsphere.core.util.DataSourceUtil" + "sourceType": "io.shardingsphere.shardingjdbc.util.DataSourceUtil" }, { "sourceType": "io.shardingsphere.core.yaml.sharding.YamlShardingStrategyConfiguration", diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java index fd6871647ee3e..aa8e1d81ed8ea 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootMasterSlaveTest.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.spring.boot.type; import io.shardingsphere.core.api.ConfigMapContext; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import org.apache.commons.dbcp2.BasicDataSource; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java index 097dcd00651d8..41a07afe24353 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/SpringBootShardingTest.java @@ -20,8 +20,8 @@ import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import org.apache.commons.dbcp2.BasicDataSource; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java index 6804ea54efb78..848911f84487b 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringMasterSlaveDataSource.java @@ -20,7 +20,7 @@ import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm; import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithmType; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java index 1e363fc96022a..7cb05a2df3ec8 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingsphere/jdbc/spring/datasource/SpringShardingDataSource.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.spring.datasource; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import javax.sql.DataSource; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java index 965d0de1a7598..c598944694ba4 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/AbstractSpringJUnitTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.spring; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import lombok.Getter; import org.apache.commons.dbcp2.BasicDataSource; import org.h2.tools.RunScript; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java index 6628cd666ecaa..e750c11aea076 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/GenerateKeyJUnitTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.spring; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.TableRule; import io.shardingsphere.jdbc.spring.fixture.DecrementKeyGenerator; import io.shardingsphere.jdbc.spring.fixture.IncrementKeyGenerator; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java index 1c4cae55a27fb..ad313daecec5e 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/MasterSlaveNamespaceTest.java @@ -21,7 +21,7 @@ import io.shardingsphere.core.api.algorithm.masterslave.MasterSlaveLoadBalanceAlgorithm; import io.shardingsphere.core.api.algorithm.masterslave.RandomMasterSlaveLoadBalanceAlgorithm; import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.core.rule.MasterSlaveRule; import io.shardingsphere.jdbc.spring.util.FieldValueUtil; import org.junit.Test; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java index c6f5231de2c42..5c13931ce596e 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/java/io/shardingsphere/jdbc/spring/ShardingNamespaceTest.java @@ -27,7 +27,7 @@ import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.BindingTableRule; import io.shardingsphere.core.rule.DataNode; import io.shardingsphere.core.rule.ShardingRule; diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/AbstractSoftTransaction.java b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/AbstractSoftTransaction.java index a1cdb9698a870..377b240853acc 100644 --- a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/AbstractSoftTransaction.java +++ b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/AbstractSoftTransaction.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import io.shardingsphere.transaction.constants.SoftTransactionType; import lombok.Getter; diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/config/SoftTransactionConfiguration.java b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/config/SoftTransactionConfiguration.java index fa9937c27a9c8..22929da4d48da 100644 --- a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/config/SoftTransactionConfiguration.java +++ b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/main/java/io/shardingsphere/transaction/api/config/SoftTransactionConfiguration.java @@ -18,7 +18,7 @@ package io.shardingsphere.transaction.api.config; import com.google.common.base.Optional; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.transaction.constants.TransactionLogDataSourceType; import io.shardingsphere.transaction.datasource.TransactionLogDataSource; import io.shardingsphere.transaction.datasource.impl.MemoryTransactionLogDataSource; diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/base/AbstractSoftTransactionIntegrationTest.java b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/base/AbstractSoftTransactionIntegrationTest.java index 1e45e87583a02..75d60cbd053a9 100644 --- a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/base/AbstractSoftTransactionIntegrationTest.java +++ b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/base/AbstractSoftTransactionIntegrationTest.java @@ -19,7 +19,7 @@ import io.shardingsphere.core.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.api.config.TableRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/integrate/SoftTransactionTest.java b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/integrate/SoftTransactionTest.java index 00e6f29abd6dc..8ebec29a7dc11 100644 --- a/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/integrate/SoftTransactionTest.java +++ b/sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/io/shardingsphere/transaction/integrate/SoftTransactionTest.java @@ -17,7 +17,7 @@ package io.shardingsphere.transaction.integrate; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.transaction.api.SoftTransactionManager; import io.shardingsphere.transaction.api.config.SoftTransactionConfiguration; import io.shardingsphere.transaction.base.AbstractSoftTransactionIntegrationTest; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactory.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactory.java similarity index 93% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactory.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactory.java index 90a0db2444903..3fbe790a50941 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactory.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactory.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.api; +package io.shardingsphere.shardingjdbc.api; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/ShardingDataSourceFactory.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactory.java similarity index 93% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/api/ShardingDataSourceFactory.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactory.java index a21aace9f40c3..73b510295f529 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/ShardingDataSourceFactory.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactory.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.api; +package io.shardingsphere.shardingjdbc.api; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlMasterSlaveDataSourceFactory.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlMasterSlaveDataSourceFactory.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlMasterSlaveDataSourceFactory.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlMasterSlaveDataSourceFactory.java index 03bc9ab152dfa..2263a3c305dc2 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlMasterSlaveDataSourceFactory.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlMasterSlaveDataSourceFactory.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.api.yaml; +package io.shardingsphere.shardingjdbc.api.yaml; -import io.shardingsphere.core.api.MasterSlaveDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory; import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveConfiguration; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlShardingDataSourceFactory.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlShardingDataSourceFactory.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlShardingDataSourceFactory.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlShardingDataSourceFactory.java index 063d7c2a65ed2..de9848e6a6758 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/api/yaml/YamlShardingDataSourceFactory.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/api/yaml/YamlShardingDataSourceFactory.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.api.yaml; +package io.shardingsphere.shardingjdbc.api.yaml; -import io.shardingsphere.core.api.ShardingDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory; import io.shardingsphere.core.yaml.sharding.YamlShardingConfiguration; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/AbstractStatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java similarity index 92% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/executor/AbstractStatementExecutor.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java index 239d0a1e7cfad..19244e50dc895 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/AbstractStatementExecutor.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java @@ -15,18 +15,21 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import com.google.common.base.Function; import com.google.common.collect.Lists; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.constant.transaction.TransactionType; +import io.shardingsphere.core.executor.ShardingExecuteEngine; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback; import io.shardingsphere.core.executor.sql.execute.SQLExecuteTemplate; import io.shardingsphere.core.executor.sql.prepare.SQLExecutePrepareTemplate; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.transaction.TransactionTypeHolder; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.transaction.TransactionTypeHolder; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutor.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java index 8321ffd3f3abc..4d2a035abb331 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutor.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import com.google.common.base.Function; import com.google.common.base.Optional; @@ -24,10 +24,12 @@ import com.google.common.collect.Lists; import io.shardingsphere.core.constant.ConnectionMode; import io.shardingsphere.core.constant.DatabaseType; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; import io.shardingsphere.core.executor.sql.prepare.SQLExecutePrepareCallback; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import io.shardingsphere.core.routing.BatchRouteUnit; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLRouteResult; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/PreparedStatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutor.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/executor/PreparedStatementExecutor.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutor.java index b2e0391d6cae4..099438b484cf7 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/PreparedStatementExecutor.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutor.java @@ -15,15 +15,17 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.ConnectionMode; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback; import io.shardingsphere.core.executor.sql.execute.result.MemoryQueryResult; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; import io.shardingsphere.core.executor.sql.prepare.SQLExecutePrepareCallback; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLRouteResult; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/StatementExecutor.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/StatementExecutor.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/executor/StatementExecutor.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/StatementExecutor.java index ca81caab5086e..e8adc07e92a6a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/executor/StatementExecutor.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/executor/StatementExecutor.java @@ -15,15 +15,17 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.ConnectionMode; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.executor.sql.execute.SQLExecuteCallback; import io.shardingsphere.core.executor.sql.execute.result.MemoryQueryResult; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; import io.shardingsphere.core.executor.sql.prepare.SQLExecutePrepareCallback; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLRouteResult; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java index cc0c65b67a56a..17c99be83a6d8 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; @@ -26,13 +26,13 @@ import io.shardingsphere.core.event.ShardingEventBusInstance; import io.shardingsphere.core.event.transaction.xa.XATransactionEvent; import io.shardingsphere.core.hint.HintManagerHolder; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteCallback; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteTemplate; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationConnection; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteCallback; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteTemplate; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationConnection; import io.shardingsphere.core.routing.router.masterslave.MasterVisitedManager; +import io.shardingsphere.shardingjdbc.transaction.TransactionTypeHolder; import io.shardingsphere.spi.root.RootInvokeHook; import io.shardingsphere.spi.root.SPIRootInvokeHook; -import io.shardingsphere.core.transaction.TransactionTypeHolder; import javax.sql.DataSource; import java.sql.Connection; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractDataSourceAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractDataSourceAdapter.java similarity index 94% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractDataSourceAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractDataSourceAdapter.java index 3cdbfee698de1..6a90c76e90676 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractDataSourceAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractDataSourceAdapter.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.base.Preconditions; import io.shardingsphere.core.bootstrap.ShardingBootstrap; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationDataSource; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationDataSource; import lombok.Getter; import lombok.Setter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java similarity index 98% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java index 7d40b5fd8344b..49f0aacad3a41 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractMasterSlavePreparedStatementAdapter.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; import java.io.InputStream; import java.io.Reader; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractResultSetAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractResultSetAdapter.java similarity index 91% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractResultSetAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractResultSetAdapter.java index 9905208cfbc1c..ac2bce9578763 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractResultSetAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractResultSetAdapter.java @@ -15,13 +15,13 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteCallback; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteTemplate; -import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSetMetaData; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationResultSet; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteCallback; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteTemplate; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSetMetaData; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationResultSet; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java index 6079b149c2a8c..0be22f0bfd22a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractShardingPreparedStatementAdapter.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.jdbc.adapter.invocation.SetParameterMethodInvocation; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.SetParameterMethodInvocation; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; import lombok.Getter; import java.io.InputStream; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractStatementAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractStatementAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java index cf60d3a2495c4..246ea05edf251 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractStatementAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteCallback; -import io.shardingsphere.core.jdbc.adapter.executor.ForceExecuteTemplate; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationStatement; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteCallback; +import io.shardingsphere.shardingjdbc.jdbc.adapter.executor.ForceExecuteTemplate; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationStatement; import lombok.RequiredArgsConstructor; import java.sql.SQLException; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/WrapperAdapter.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/WrapperAdapter.java similarity index 94% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/WrapperAdapter.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/WrapperAdapter.java index f2e275a709d89..6346d18c42276 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/WrapperAdapter.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/WrapperAdapter.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.jdbc.adapter.invocation.JdbcMethodInvocation; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.JdbcMethodInvocation; import java.sql.SQLException; import java.sql.Wrapper; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteCallback.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteCallback.java similarity index 94% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteCallback.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteCallback.java index 5518bd1941dfa..44c7961f3215a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteCallback.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteCallback.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.executor; +package io.shardingsphere.shardingjdbc.jdbc.adapter.executor; import java.sql.SQLException; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteTemplate.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteTemplate.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteTemplate.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteTemplate.java index 182cb767e8475..fd4081727eabf 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/executor/ForceExecuteTemplate.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/executor/ForceExecuteTemplate.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.executor; +package io.shardingsphere.shardingjdbc.jdbc.adapter.executor; import java.sql.SQLException; import java.util.Collection; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocation.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocation.java similarity index 95% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocation.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocation.java index 85a1d16ddc615..9ba0d242c0ed2 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocation.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocation.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.invocation; +package io.shardingsphere.shardingjdbc.jdbc.adapter.invocation; import io.shardingsphere.core.exception.ShardingException; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocation.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocation.java similarity index 95% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocation.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocation.java index f403f65e9e302..11ed6407f3d89 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocation.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocation.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.invocation; +package io.shardingsphere.shardingjdbc.jdbc.adapter.invocation; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/ShardingContext.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/ShardingContext.java similarity index 95% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/ShardingContext.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/ShardingContext.java index 5db5a4374bfe4..f90b971c4e508 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/ShardingContext.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/ShardingContext.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.core; +package io.shardingsphere.shardingjdbc.jdbc.core; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.executor.ShardingExecuteEngine; -import io.shardingsphere.core.jdbc.metadata.JDBCTableMetaDataConnectionManager; +import io.shardingsphere.shardingjdbc.jdbc.metadata.JDBCTableMetaDataConnectionManager; import io.shardingsphere.core.metadata.ShardingMetaData; import io.shardingsphere.core.rule.ShardingRule; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/MasterSlaveConnection.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/MasterSlaveConnection.java similarity index 89% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/MasterSlaveConnection.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/MasterSlaveConnection.java index 717b195e057db..38be699fe95f3 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/MasterSlaveConnection.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/MasterSlaveConnection.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.core.connection; +package io.shardingsphere.shardingjdbc.jdbc.core.connection; -import io.shardingsphere.core.jdbc.adapter.AbstractConnectionAdapter; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; -import io.shardingsphere.core.jdbc.core.statement.MasterSlavePreparedStatement; -import io.shardingsphere.core.jdbc.core.statement.MasterSlaveStatement; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractConnectionAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.MasterSlavePreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.MasterSlaveStatement; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnection.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnection.java similarity index 91% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnection.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnection.java index 1c11750016893..969cc951ce23d 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnection.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnection.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.core.connection; +package io.shardingsphere.shardingjdbc.jdbc.core.connection; -import io.shardingsphere.core.jdbc.adapter.AbstractConnectionAdapter; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.statement.ShardingPreparedStatement; -import io.shardingsphere.core.jdbc.core.statement.ShardingStatement; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractConnectionAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingPreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingStatement; import io.shardingsphere.core.rule.MasterSlaveRule; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSource.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSource.java similarity index 95% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSource.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSource.java index 535d2370c7fdb..aa125030a9417 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSource.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSource.java @@ -15,14 +15,14 @@ *

*/ -package io.shardingsphere.core.jdbc.core.datasource; +package io.shardingsphere.shardingjdbc.jdbc.core.datasource; import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.adapter.AbstractDataSourceAdapter; -import io.shardingsphere.core.jdbc.core.connection.MasterSlaveConnection; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractDataSourceAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.MasterSlaveConnection; import io.shardingsphere.core.rule.MasterSlaveRule; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSource.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSource.java similarity index 93% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSource.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSource.java index 356a45305b929..aefc22f28c446 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSource.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSource.java @@ -15,16 +15,16 @@ *

*/ -package io.shardingsphere.core.jdbc.core.datasource; +package io.shardingsphere.shardingjdbc.jdbc.core.datasource; import com.google.common.base.Preconditions; import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; import io.shardingsphere.core.executor.ShardingExecuteEngine; -import io.shardingsphere.core.jdbc.adapter.AbstractDataSourceAdapter; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractDataSourceAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import io.shardingsphere.core.rule.ShardingRule; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSet.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSet.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSet.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSet.java index c347ada29b505..c22a2266827d7 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSet.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSet.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedGeneratedKeysResultSet; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedGeneratedKeysResultSet; import lombok.RequiredArgsConstructor; import java.math.BigDecimal; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java index 3a26c7c4f1c21..5f8c45da49681 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaData.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import lombok.RequiredArgsConstructor; import java.sql.ResultSetMetaData; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtil.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtil.java similarity index 98% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtil.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtil.java index a5b9f7aee6038..49da8b5ab1735 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtil.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtil.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; import io.shardingsphere.core.exception.ShardingException; import lombok.AccessLevel; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSet.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSet.java similarity index 98% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSet.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSet.java index 1e1410aa567bc..e36a6b8e3e9e3 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSet.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSet.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; -import io.shardingsphere.core.jdbc.adapter.AbstractResultSetAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractResultSetAdapter; import io.shardingsphere.core.merger.MergedResult; import java.io.InputStream; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetMetaData.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetMetaData.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetMetaData.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetMetaData.java index 0550da4ba8d6a..d6e88514c089f 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetMetaData.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetMetaData.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import io.shardingsphere.core.parsing.parser.constant.DerivedColumn; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlavePreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlavePreparedStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java index 717e3c43f4c22..8729b891952bc 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlavePreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlavePreparedStatement.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.adapter.AbstractMasterSlavePreparedStatementAdapter; -import io.shardingsphere.core.jdbc.core.connection.MasterSlaveConnection; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractMasterSlavePreparedStatementAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.MasterSlaveConnection; import io.shardingsphere.core.routing.router.masterslave.MasterSlaveRouter; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlaveStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlaveStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java index 565b05ba190f0..8953dc89a928a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/MasterSlaveStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/MasterSlaveStatement.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; import com.google.common.base.Preconditions; -import io.shardingsphere.core.jdbc.adapter.AbstractStatementAdapter; -import io.shardingsphere.core.jdbc.core.connection.MasterSlaveConnection; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractStatementAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.MasterSlaveConnection; import io.shardingsphere.core.routing.router.masterslave.MasterSlaveRouter; import lombok.AccessLevel; import lombok.Getter; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java similarity index 94% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java index 1861180129132..cd5aea7acb5fa 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatement.java @@ -15,21 +15,21 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.collect.Collections2; import io.shardingsphere.core.constant.SQLType; -import io.shardingsphere.core.executor.BatchPreparedStatementExecutor; -import io.shardingsphere.core.executor.PreparedStatementExecutor; +import io.shardingsphere.shardingjdbc.executor.BatchPreparedStatementExecutor; +import io.shardingsphere.shardingjdbc.executor.PreparedStatementExecutor; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; -import io.shardingsphere.core.jdbc.adapter.AbstractShardingPreparedStatementAdapter; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSet; -import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSet; -import io.shardingsphere.core.jdbc.metadata.JDBCTableMetaDataConnectionManager; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractShardingPreparedStatementAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSet; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSet; +import io.shardingsphere.shardingjdbc.jdbc.metadata.JDBCTableMetaDataConnectionManager; import io.shardingsphere.core.merger.MergeEngine; import io.shardingsphere.core.merger.MergeEngineFactory; import io.shardingsphere.core.merger.QueryResult; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java similarity index 95% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java index 0d58fd2415204..83323dfbb37f6 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatement.java @@ -15,18 +15,18 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; import com.google.common.base.Optional; import io.shardingsphere.core.constant.SQLType; -import io.shardingsphere.core.executor.StatementExecutor; +import io.shardingsphere.shardingjdbc.executor.StatementExecutor; import io.shardingsphere.core.executor.sql.execute.result.StreamQueryResult; -import io.shardingsphere.core.jdbc.adapter.AbstractStatementAdapter; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSet; -import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSet; -import io.shardingsphere.core.jdbc.metadata.JDBCTableMetaDataConnectionManager; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractStatementAdapter; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSet; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSet; +import io.shardingsphere.shardingjdbc.jdbc.metadata.JDBCTableMetaDataConnectionManager; import io.shardingsphere.core.merger.MergeEngine; import io.shardingsphere.core.merger.MergeEngineFactory; import io.shardingsphere.core.merger.QueryResult; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/JDBCTableMetaDataConnectionManager.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/metadata/JDBCTableMetaDataConnectionManager.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/JDBCTableMetaDataConnectionManager.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/metadata/JDBCTableMetaDataConnectionManager.java index 1ffaa277f5b56..c5292c6aec28c 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/metadata/JDBCTableMetaDataConnectionManager.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/metadata/JDBCTableMetaDataConnectionManager.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.metadata; +package io.shardingsphere.shardingjdbc.jdbc.metadata; import io.shardingsphere.core.metadata.table.executor.TableMetaDataConnectionManager; import lombok.RequiredArgsConstructor; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java similarity index 99% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java index 736b6e8b951f1..9d1cf6f5243ed 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedGeneratedKeysResultSet.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; import java.io.InputStream; import java.io.Reader; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationConnection.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationConnection.java similarity index 98% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationConnection.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationConnection.java index 00b02e9a8ea27..727f02f6856f4 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationConnection.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationConnection.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import java.sql.Array; import java.sql.Blob; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java similarity index 91% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java index 4b7f4897aa84d..243530d58eea1 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationDataSource.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java similarity index 97% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java index e8e75019017d0..c99b62413bb72 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationPreparedStatement.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.adapter.AbstractStatementAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractStatementAdapter; import java.io.Reader; import java.sql.Array; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java similarity index 99% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java index a999782423fb5..3000372715240 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationResultSet.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; import java.io.Reader; import java.sql.Array; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationStatement.java similarity index 94% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationStatement.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationStatement.java index 75934cd43e3fb..026848b98c936 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedOperationStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedOperationStatement.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java similarity index 99% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java index 98d4a167e84d8..976487aed7415 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AbstractUnsupportedUpdateOperationResultSet.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.adapter.WrapperAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter; import java.io.InputStream; import java.io.Reader; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/transaction/TransactionTypeHolder.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolder.java similarity index 96% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/transaction/TransactionTypeHolder.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolder.java index cc0d767ed12da..ece6fcc8228d2 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/transaction/TransactionTypeHolder.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolder.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.transaction; +package io.shardingsphere.shardingjdbc.transaction; import io.shardingsphere.core.constant.transaction.TransactionType; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/util/DataSourceUtil.java b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/util/DataSourceUtil.java similarity index 98% rename from sharding-jdbc/src/main/java/io/shardingsphere/core/util/DataSourceUtil.java rename to sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/util/DataSourceUtil.java index c83f336e0a3ea..670ce332c232a 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/util/DataSourceUtil.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/shardingjdbc/util/DataSourceUtil.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.util; +package io.shardingsphere.shardingjdbc.util; import com.google.common.base.CaseFormat; import com.google.common.collect.Sets; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/BaseIntegrateTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/BaseIntegrateTest.java index 917876ad1f7af..61e7361fd608e 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/BaseIntegrateTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/dbtest/engine/BaseIntegrateTest.java @@ -18,10 +18,10 @@ package io.shardingsphere.dbtest.engine; import com.google.common.base.Joiner; -import io.shardingsphere.core.api.yaml.YamlMasterSlaveDataSourceFactory; -import io.shardingsphere.core.api.yaml.YamlShardingDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.yaml.YamlMasterSlaveDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.yaml.YamlShardingDataSourceFactory; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.metadata.datasource.DataSourceMetaData; import io.shardingsphere.core.metadata.datasource.DataSourceMetaDataFactory; import io.shardingsphere.core.parsing.cache.ParsingResultCache; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/AllTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllTests.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/AllTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllTests.java index e67c2fbad32c3..6c32d55479a4c 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/AllTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core; +package io.shardingsphere.shardingjdbc; import io.shardingsphere.dbtest.AllIntegrateTests; import org.junit.runner.RunWith; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/AllUnitTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllUnitTests.java similarity index 73% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/AllUnitTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllUnitTests.java index f1a87e24fafe2..b1a811b6380f4 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/AllUnitTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/AllUnitTests.java @@ -15,13 +15,13 @@ *

*/ -package io.shardingsphere.core; +package io.shardingsphere.shardingjdbc; -import io.shardingsphere.core.api.AllApiTests; -import io.shardingsphere.core.executor.AllExecutorTests; -import io.shardingsphere.core.jdbc.AllJDBCTests; -import io.shardingsphere.core.transaction.AllTransactionTests; -import io.shardingsphere.core.util.AllUtilTests; +import io.shardingsphere.shardingjdbc.api.AllApiTests; +import io.shardingsphere.shardingjdbc.executor.AllExecutorTests; +import io.shardingsphere.shardingjdbc.jdbc.AllJDBCTests; +import io.shardingsphere.shardingjdbc.transaction.AllTransactionTests; +import io.shardingsphere.shardingjdbc.util.AllUtilTests; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/AllApiTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/AllApiTests.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/api/AllApiTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/AllApiTests.java index d3fe27d73274e..0fd11ce7ec017 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/AllApiTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/AllApiTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.api; +package io.shardingsphere.shardingjdbc.api; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactoryTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactoryTest.java similarity index 92% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactoryTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactoryTest.java index 66c33f2cab3d3..c93ee8078e783 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/MasterSlaveDataSourceFactoryTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/MasterSlaveDataSourceFactoryTest.java @@ -15,11 +15,12 @@ *

*/ -package io.shardingsphere.core.api; +package io.shardingsphere.shardingjdbc.api; +import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; -import io.shardingsphere.core.fixture.TestDataSource; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.fixture.TestDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/ShardingDataSourceFactoryTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactoryTest.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/api/ShardingDataSourceFactoryTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactoryTest.java index fe1974253971c..1088c0e74accc 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/api/ShardingDataSourceFactoryTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/api/ShardingDataSourceFactoryTest.java @@ -15,11 +15,13 @@ *

*/ -package io.shardingsphere.core.api; +package io.shardingsphere.shardingjdbc.api; +import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.api.config.TableRuleConfiguration; -import io.shardingsphere.core.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; import io.shardingsphere.core.rule.ShardingRule; import org.junit.Test; import org.mockito.ArgumentMatchers; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractSQLTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractSQLTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java index e66cb7559ebf1..9173a1a46dbd8 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractSQLTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractSQLTest.java @@ -15,13 +15,13 @@ *

*/ -package io.shardingsphere.core.common.base; +package io.shardingsphere.shardingjdbc.common.base; import com.google.common.collect.Sets; -import io.shardingsphere.core.common.env.DatabaseEnvironment; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.common.env.DatabaseEnvironment; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import org.apache.commons.dbcp2.BasicDataSource; import org.h2.tools.RunScript; import org.junit.AfterClass; @@ -77,7 +77,7 @@ static Set getDatabaseTypes() { return databaseTypes; } - protected static String getDatabaseName(final String dataSetFile) { + private static String getDatabaseName(final String dataSetFile) { String fileName = new File(dataSetFile).getName(); if (-1 == fileName.lastIndexOf(".")) { return fileName; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractShardingJDBCDatabaseAndTableTest.java similarity index 92% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractShardingJDBCDatabaseAndTableTest.java index 86c4b9602bd9b..b5bb54142ba3f 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/base/AbstractShardingJDBCDatabaseAndTableTest.java @@ -15,18 +15,18 @@ *

*/ -package io.shardingsphere.core.common.base; +package io.shardingsphere.shardingjdbc.common.base; import com.google.common.base.Joiner; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.api.config.TableRuleConfiguration; import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.fixture.IncrementKeyGenerator; -import io.shardingsphere.core.fixture.PreciseOrderShardingAlgorithm; -import io.shardingsphere.core.fixture.RangeOrderShardingAlgorithm; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; +import io.shardingsphere.shardingjdbc.fixture.IncrementKeyGenerator; +import io.shardingsphere.shardingjdbc.fixture.PreciseOrderShardingAlgorithm; +import io.shardingsphere.shardingjdbc.fixture.RangeOrderShardingAlgorithm; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import org.junit.Before; import javax.sql.DataSource; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/env/DatabaseEnvironment.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/env/DatabaseEnvironment.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/common/env/DatabaseEnvironment.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/env/DatabaseEnvironment.java index 043aab6ec9558..4bc483f114e04 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/common/env/DatabaseEnvironment.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/common/env/DatabaseEnvironment.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.common.env; +package io.shardingsphere.shardingjdbc.common.env; import io.shardingsphere.core.constant.DatabaseType; import lombok.Getter; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AbstractBaseExecutorTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AbstractBaseExecutorTest.java similarity index 85% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AbstractBaseExecutorTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AbstractBaseExecutorTest.java index 7d24667f908fa..6c26a50c44758 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AbstractBaseExecutorTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AbstractBaseExecutorTest.java @@ -15,17 +15,18 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.event.ShardingEventBusInstance; -import io.shardingsphere.core.executor.fixture.EventCaller; -import io.shardingsphere.core.executor.fixture.ExecutorTestUtil; -import io.shardingsphere.core.executor.fixture.TestDMLExecutionEventListener; -import io.shardingsphere.core.executor.fixture.TestDQLExecutionEventListener; +import io.shardingsphere.core.executor.ShardingExecuteEngine; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.executor.fixture.EventCaller; +import io.shardingsphere.shardingjdbc.executor.fixture.ExecutorTestUtil; +import io.shardingsphere.shardingjdbc.executor.fixture.TestDMLExecutionEventListener; +import io.shardingsphere.shardingjdbc.executor.fixture.TestDQLExecutionEventListener; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import lombok.AccessLevel; import lombok.Getter; import org.junit.After; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AllExecutorTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AllExecutorTests.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AllExecutorTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AllExecutorTests.java index d1b194203720f..2073e55ec38bf 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/AllExecutorTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/AllExecutorTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutorTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutorTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java index 001a7bd1f472d..d9a51b774fe40 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/BatchPreparedStatementExecutorTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java @@ -15,14 +15,17 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.ConnectionMode; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.event.ShardingEventType; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.routing.BatchRouteUnit; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLUnit; +import io.shardingsphere.shardingjdbc.executor.BatchPreparedStatementExecutor; import org.junit.Test; import java.lang.reflect.Field; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/PreparedStatementExecutorTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/PreparedStatementExecutorTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java index 2ceaae88067f7..9375cb0223303 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/PreparedStatementExecutorTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java @@ -15,14 +15,17 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.ConnectionMode; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.event.ShardingEventType; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLUnit; +import io.shardingsphere.shardingjdbc.executor.PreparedStatementExecutor; import org.junit.Test; import java.lang.reflect.Field; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/StatementExecutorTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java similarity index 99% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/StatementExecutorTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java index df3fde090a8ac..466b54395b0f0 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/StatementExecutorTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java @@ -15,15 +15,18 @@ *

*/ -package io.shardingsphere.core.executor; +package io.shardingsphere.shardingjdbc.executor; import io.shardingsphere.core.constant.ConnectionMode; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.event.ShardingEventType; +import io.shardingsphere.core.executor.ShardingExecuteGroup; +import io.shardingsphere.core.executor.StatementExecuteUnit; import io.shardingsphere.core.executor.sql.execute.threadlocal.ExecutorExceptionHandler; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.routing.RouteUnit; import io.shardingsphere.core.routing.SQLUnit; +import io.shardingsphere.shardingjdbc.executor.StatementExecutor; import org.junit.Test; import java.lang.reflect.Field; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/EventCaller.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/EventCaller.java similarity index 94% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/EventCaller.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/EventCaller.java index 6f5c8c09cbcc8..c5e03a41f3115 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/EventCaller.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/EventCaller.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor.fixture; +package io.shardingsphere.shardingjdbc.executor.fixture; import io.shardingsphere.core.event.ShardingEventType; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/ExecutorTestUtil.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/ExecutorTestUtil.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/ExecutorTestUtil.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/ExecutorTestUtil.java index 6075e35f31e2b..e25a0c949bdb1 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/ExecutorTestUtil.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/ExecutorTestUtil.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor.fixture; +package io.shardingsphere.shardingjdbc.executor.fixture; import io.shardingsphere.core.event.ShardingEventType; import io.shardingsphere.core.event.executor.SQLExecutionEvent; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDMLExecutionEventListener.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDMLExecutionEventListener.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDMLExecutionEventListener.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDMLExecutionEventListener.java index 20c9ccb013723..9f5af0d104d94 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDMLExecutionEventListener.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDMLExecutionEventListener.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor.fixture; +package io.shardingsphere.shardingjdbc.executor.fixture; import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDQLExecutionEventListener.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDQLExecutionEventListener.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDQLExecutionEventListener.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDQLExecutionEventListener.java index 8e0e914756a4e..6ccc02014322e 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/executor/fixture/TestDQLExecutionEventListener.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/executor/fixture/TestDQLExecutionEventListener.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.executor.fixture; +package io.shardingsphere.shardingjdbc.executor.fixture; import com.google.common.eventbus.AllowConcurrentEvents; import com.google.common.eventbus.Subscribe; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/IncrementKeyGenerator.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/IncrementKeyGenerator.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/IncrementKeyGenerator.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/IncrementKeyGenerator.java index f6eec3372d3c3..178f4f505aad7 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/IncrementKeyGenerator.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/IncrementKeyGenerator.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.fixture; +package io.shardingsphere.shardingjdbc.fixture; import io.shardingsphere.core.keygen.KeyGenerator; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/PreciseOrderShardingAlgorithm.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/PreciseOrderShardingAlgorithm.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/PreciseOrderShardingAlgorithm.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/PreciseOrderShardingAlgorithm.java index b12174dc5b1c3..8474b4ffae394 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/PreciseOrderShardingAlgorithm.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/PreciseOrderShardingAlgorithm.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.fixture; +package io.shardingsphere.shardingjdbc.fixture; import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue; import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/RangeOrderShardingAlgorithm.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/RangeOrderShardingAlgorithm.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/RangeOrderShardingAlgorithm.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/RangeOrderShardingAlgorithm.java index 32ad121231ca1..060ed44322e0a 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/RangeOrderShardingAlgorithm.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/RangeOrderShardingAlgorithm.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.fixture; +package io.shardingsphere.shardingjdbc.fixture; import io.shardingsphere.core.api.algorithm.sharding.RangeShardingValue; import io.shardingsphere.core.api.algorithm.sharding.standard.RangeShardingAlgorithm; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/TestDataSource.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/TestDataSource.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/TestDataSource.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/TestDataSource.java index 7697d1dfce973..efb6060e1ec0f 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/fixture/TestDataSource.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/fixture/TestDataSource.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.fixture; +package io.shardingsphere.shardingjdbc.fixture; -import io.shardingsphere.core.jdbc.adapter.AbstractDataSourceAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractDataSourceAdapter; import lombok.EqualsAndHashCode; import lombok.Setter; import org.mockito.Mockito; @@ -32,7 +32,7 @@ import static org.mockito.Mockito.when; @Setter -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public final class TestDataSource extends AbstractDataSourceAdapter { private final String name; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/AllJDBCTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/AllJDBCTests.java similarity index 78% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/AllJDBCTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/AllJDBCTests.java index f02c9117d87a1..0cc54fc694000 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/AllJDBCTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/AllJDBCTests.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc; +package io.shardingsphere.shardingjdbc.jdbc; -import io.shardingsphere.core.jdbc.adapter.AllAdapterTests; -import io.shardingsphere.core.jdbc.core.AllCoreTests; -import io.shardingsphere.core.jdbc.unsupported.AllUnsupportedTests; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AllAdapterTests; +import io.shardingsphere.shardingjdbc.jdbc.core.AllCoreTests; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AllUnsupportedTests; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/JDBCTestSQL.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/JDBCTestSQL.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/JDBCTestSQL.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/JDBCTestSQL.java index 7e68845f0442e..5b5caf87376ae 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/JDBCTestSQL.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/JDBCTestSQL.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc; +package io.shardingsphere.shardingjdbc.jdbc; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/AllAdapterTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AllAdapterTests.java similarity index 82% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/AllAdapterTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AllAdapterTests.java index 31d3b24452343..6a02d5133f017 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/AllAdapterTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AllAdapterTests.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.jdbc.adapter.invocation.JdbcMethodInvocationTest; -import io.shardingsphere.core.jdbc.adapter.invocation.SetParameterMethodInvocationTest; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.JdbcMethodInvocationTest; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.SetParameterMethodInvocationTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ConnectionAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ConnectionAdapterTest.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ConnectionAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ConnectionAdapterTest.java index b42cd882a7cb6..b3998429bae60 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ConnectionAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ConnectionAdapterTest.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.collect.Multimap; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.Test; import java.lang.reflect.Field; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/DataSourceAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/DataSourceAdapterTest.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/DataSourceAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/DataSourceAdapterTest.java index d2d98926b8a93..6850daadf08a3 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/DataSourceAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/DataSourceAdapterTest.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import org.junit.Test; import java.io.PrintWriter; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/PreparedStatementAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/PreparedStatementAdapterTest.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/PreparedStatementAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/PreparedStatementAdapterTest.java index 578d8c9837a79..d717068e4631f 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/PreparedStatementAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/PreparedStatementAdapterTest.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.core.statement.ShardingPreparedStatement; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingPreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetAdapterTest.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetAdapterTest.java index be734f52bccec..c746eacd698ab 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetAdapterTest.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetGetterAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetGetterAdapterTest.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetGetterAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetGetterAdapterTest.java index 46386b4b29e31..028aabfecdb08 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/ResultSetGetterAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/ResultSetGetterAdapterTest.java @@ -15,12 +15,12 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/StatementAdapterTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/StatementAdapterTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/StatementAdapterTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/StatementAdapterTest.java index 620741031bf69..41de8d5a32629 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/StatementAdapterTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/StatementAdapterTest.java @@ -15,14 +15,14 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter; +package io.shardingsphere.shardingjdbc.jdbc.adapter; import com.google.common.collect.Lists; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.core.statement.ShardingStatement; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingStatement; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocationTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocationTest.java similarity index 90% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocationTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocationTest.java index a2992062d1389..0b9cb6836a929 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/JdbcMethodInvocationTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/JdbcMethodInvocationTest.java @@ -15,9 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.invocation; +package io.shardingsphere.shardingjdbc.jdbc.adapter.invocation; import io.shardingsphere.core.exception.ShardingException; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.JdbcMethodInvocation; import org.junit.Test; public final class JdbcMethodInvocationTest { diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java similarity index 90% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java index b130f40f3fbc8..cf2a0f7c924aa 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/adapter/invocation/SetParameterMethodInvocationTest.java @@ -15,8 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.adapter.invocation; +package io.shardingsphere.shardingjdbc.jdbc.adapter.invocation; +import io.shardingsphere.shardingjdbc.jdbc.adapter.invocation.SetParameterMethodInvocation; import org.junit.Test; import java.sql.PreparedStatement; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/AllCoreTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/AllCoreTests.java similarity index 59% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/AllCoreTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/AllCoreTests.java index 3d8f7ac440c0c..05cb37cb06560 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/AllCoreTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/AllCoreTests.java @@ -15,17 +15,17 @@ *

*/ -package io.shardingsphere.core.jdbc.core; +package io.shardingsphere.shardingjdbc.jdbc.core; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnectionTest; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSourceTest; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSourceTest; -import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSetMetaDataTest; -import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSetTest; -import io.shardingsphere.core.jdbc.core.resultset.ResultSetUtilTest; -import io.shardingsphere.core.jdbc.core.resultset.ShardingResultSetTest; -import io.shardingsphere.core.jdbc.core.statement.ShardingPreparedStatementTest; -import io.shardingsphere.core.jdbc.core.statement.ShardingStatementTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnectionTest; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSourceTest; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSourceTest; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSetMetaDataTest; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSetTest; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ResultSetUtilTest; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSetTest; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingPreparedStatementTest; +import io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingStatementTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnectionTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnectionTest.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnectionTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnectionTest.java index 16eee56f8db7a..a27a29ba635a1 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/connection/ShardingConnectionTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/connection/ShardingConnectionTest.java @@ -15,15 +15,15 @@ *

*/ -package io.shardingsphere.core.jdbc.core.connection; +package io.shardingsphere.shardingjdbc.jdbc.core.connection; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.api.config.TableRuleConfiguration; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.fixture.TestDataSource; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.fixture.TestDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSourceTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSourceTest.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSourceTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSourceTest.java index 7443a559375cd..e9ba02f3526b4 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/MasterSlaveDataSourceTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/MasterSlaveDataSourceTest.java @@ -15,15 +15,15 @@ *

*/ -package io.shardingsphere.core.jdbc.core.datasource; +package io.shardingsphere.shardingjdbc.jdbc.core.datasource; -import io.shardingsphere.core.api.MasterSlaveDataSourceFactory; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.core.constant.DatabaseType; -import io.shardingsphere.core.fixture.TestDataSource; import io.shardingsphere.core.hint.HintManagerHolder; -import io.shardingsphere.core.jdbc.core.connection.MasterSlaveConnection; import io.shardingsphere.core.routing.router.masterslave.MasterVisitedManager; +import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory; +import io.shardingsphere.shardingjdbc.fixture.TestDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.MasterSlaveConnection; import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Before; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSourceTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSourceTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java index 91fb5eccc586b..3b6a009f82d83 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/datasource/ShardingDataSourceTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java @@ -15,15 +15,17 @@ *

*/ -package io.shardingsphere.core.jdbc.core.datasource; +package io.shardingsphere.shardingjdbc.jdbc.core.datasource; import com.google.common.base.Joiner; -import io.shardingsphere.core.api.MasterSlaveDataSourceFactory; +import io.shardingsphere.shardingjdbc.api.MasterSlaveDataSourceFactory; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; import io.shardingsphere.core.api.config.TableRuleConfiguration; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.rule.ShardingRule; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import org.junit.Test; import org.mockito.ArgumentMatchers; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java index 148cb995cb730..3e30c2c5ca650 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetMetaDataTest.java @@ -15,8 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSet; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSetMetaData; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetTest.java index aca2a9c4e4094..57127b47479ba 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/GeneratedKeysResultSetTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/GeneratedKeysResultSetTest.java @@ -15,8 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSet; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtilTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtilTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtilTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtilTest.java index 40121cc1157df..57df4adca20e7 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ResultSetUtilTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ResultSetUtilTest.java @@ -15,9 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; import io.shardingsphere.core.exception.ShardingException; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ResultSetUtil; import org.junit.Test; import java.math.BigDecimal; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetTest.java similarity index 99% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetTest.java index 0fab85b63057e..4221170d7e998 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/resultset/ShardingResultSetTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/resultset/ShardingResultSetTest.java @@ -15,9 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.core.resultset; +package io.shardingsphere.shardingjdbc.jdbc.core.resultset; import io.shardingsphere.core.merger.MergedResult; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSet; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatementTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatementTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java index 7a9aa9244f5cf..601b677472e4e 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatementTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.JDBCTestSQL; -import io.shardingsphere.core.util.SQLPlaceholderUtil; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.util.SQLPlaceholderUtil; import org.junit.Test; import java.sql.Connection; @@ -37,7 +37,6 @@ public final class ShardingPreparedStatementTest extends AbstractShardingJDBCDat @Test public void assertAddBatch() throws SQLException { - try ( Connection connection = getShardingDataSource().getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(JDBCTestSQL.INSERT_ORDER_ITEM_WITH_ALL_PLACEHOLDERS_SQL)) { diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatementTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatementTest.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatementTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatementTest.java index eea20165da7dd..1328c9bc1e3cc 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatementTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingStatementTest.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.core.statement; +package io.shardingsphere.shardingjdbc.jdbc.core.statement; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; import org.junit.Test; import java.sql.Connection; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/AllUnsupportedTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AllUnsupportedTests.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/AllUnsupportedTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AllUnsupportedTests.java index 7511b4d35f261..d13708490c87d 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/AllUnsupportedTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/AllUnsupportedTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java index 5bd67cfbfa3fe..1f5c22b90adc0 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedGeneratedKeysResultSetTest.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.jdbc.core.resultset.GeneratedKeysResultSet; +import io.shardingsphere.shardingjdbc.jdbc.core.resultset.GeneratedKeysResultSet; import org.junit.Test; import java.sql.ResultSet; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationConnectionTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationConnectionTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationConnectionTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationConnectionTest.java index 441a20788962b..44e2df4d12f0a 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationConnectionTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationConnectionTest.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationDataSourceTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationDataSourceTest.java similarity index 88% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationDataSourceTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationDataSourceTest.java index 92fbce8188bac..935b299310e33 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationDataSourceTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationDataSourceTest.java @@ -15,9 +15,9 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; import org.junit.Test; import java.sql.SQLException; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java index a20f8e896daed..54a7cba70ccec 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationPreparedStatementTest.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.JDBCTestSQL; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationResultSetTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationResultSetTest.java similarity index 97% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationResultSetTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationResultSetTest.java index 583dd620b4d3a..07300763200f4 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationResultSetTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationResultSetTest.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.JDBCTestSQL; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationStatementTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationStatementTest.java similarity index 93% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationStatementTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationStatementTest.java index 79e34bceb1913..13cdab4092476 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedOperationStatementTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedOperationStatementTest.java @@ -15,10 +15,10 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java index 9086df540e467..59300215bc580 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/unsupported/UnsupportedUpdateOperationResultSetTest.java @@ -15,11 +15,11 @@ *

*/ -package io.shardingsphere.core.jdbc.unsupported; +package io.shardingsphere.shardingjdbc.jdbc.unsupported; -import io.shardingsphere.core.common.base.AbstractShardingJDBCDatabaseAndTableTest; -import io.shardingsphere.core.jdbc.core.connection.ShardingConnection; -import io.shardingsphere.core.jdbc.util.JDBCTestSQL; +import io.shardingsphere.shardingjdbc.common.base.AbstractShardingJDBCDatabaseAndTableTest; +import io.shardingsphere.shardingjdbc.jdbc.core.connection.ShardingConnection; +import io.shardingsphere.shardingjdbc.jdbc.util.JDBCTestSQL; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/util/JDBCTestSQL.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/util/JDBCTestSQL.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/util/JDBCTestSQL.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/util/JDBCTestSQL.java index d6c8714972b0c..4d421ea9736a8 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/jdbc/util/JDBCTestSQL.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/jdbc/util/JDBCTestSQL.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.jdbc.util; +package io.shardingsphere.shardingjdbc.jdbc.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/AllTransactionTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/AllTransactionTests.java similarity index 94% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/AllTransactionTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/AllTransactionTests.java index 1ce5974cc8faf..a606a480fc7ff 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/AllTransactionTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/AllTransactionTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.transaction; +package io.shardingsphere.shardingjdbc.transaction; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/TransactionTypeHolderTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolderTest.java similarity index 92% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/TransactionTypeHolderTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolderTest.java index 0fd197454108b..0a96f6088f6b1 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/transaction/TransactionTypeHolderTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/transaction/TransactionTypeHolderTest.java @@ -15,9 +15,10 @@ *

*/ -package io.shardingsphere.core.transaction; +package io.shardingsphere.shardingjdbc.transaction; import io.shardingsphere.core.constant.transaction.TransactionType; +import io.shardingsphere.shardingjdbc.transaction.TransactionTypeHolder; import org.junit.Before; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/AllUtilTests.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/AllUtilTests.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/util/AllUtilTests.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/AllUtilTests.java index 1f993cd4af06a..9a967ebe2e096 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/AllUtilTests.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/AllUtilTests.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.util; +package io.shardingsphere.shardingjdbc.util; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/DataSourceUtilTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/DataSourceUtilTest.java similarity index 98% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/util/DataSourceUtilTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/DataSourceUtilTest.java index 723484272bb94..2729e3e209e80 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/DataSourceUtilTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/DataSourceUtilTest.java @@ -15,8 +15,9 @@ *

*/ -package io.shardingsphere.core.util; +package io.shardingsphere.shardingjdbc.util; +import io.shardingsphere.shardingjdbc.util.DataSourceUtil; import org.apache.commons.dbcp2.BasicDataSource; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/EventBusInstanceTest.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/EventBusInstanceTest.java similarity index 95% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/util/EventBusInstanceTest.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/EventBusInstanceTest.java index dcabcfcd5c8a9..11f9e1f5530e6 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/EventBusInstanceTest.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/EventBusInstanceTest.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.util; +package io.shardingsphere.shardingjdbc.util; import io.shardingsphere.core.event.ShardingEventBusInstance; import org.junit.Test; diff --git a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/SQLPlaceholderUtil.java b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/SQLPlaceholderUtil.java similarity index 96% rename from sharding-jdbc/src/test/java/io/shardingsphere/core/util/SQLPlaceholderUtil.java rename to sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/SQLPlaceholderUtil.java index af468e72a8a45..aa4b4955b3e01 100644 --- a/sharding-jdbc/src/test/java/io/shardingsphere/core/util/SQLPlaceholderUtil.java +++ b/sharding-jdbc/src/test/java/io/shardingsphere/shardingjdbc/util/SQLPlaceholderUtil.java @@ -15,7 +15,7 @@ *

*/ -package io.shardingsphere.core.util; +package io.shardingsphere.shardingjdbc.util; import io.shardingsphere.core.parsing.lexer.token.Symbol; import lombok.AccessLevel; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java index 92b619a595207..452b5efec29a6 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/jdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java @@ -19,10 +19,10 @@ import com.google.common.base.Preconditions; import io.shardingsphere.core.exception.ShardingException; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; -import io.shardingsphere.core.util.DataSourceUtil; +import io.shardingsphere.shardingjdbc.util.DataSourceUtil; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; import io.shardingsphere.jdbc.orchestration.config.OrchestrationType; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 1026852d4f07b..ad59676ae8cf0 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -5,14 +5,14 @@ "type": "io.shardingsphere.jdbc.orchestration.spring.boot.OrchestrationSpringBootConfiguration" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "name": "sharding.jdbc.config.orchestration.etcd", - "type": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration" + "type": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "name": "sharding.jdbc.config.orchestration.zookeeper", - "type": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration" + "type": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration" }, { "sourceType": "io.shardingsphere.core.yaml.sharding.YamlShardingStrategyConfiguration", @@ -74,90 +74,90 @@ { "name": "sharding.jdbc.datasource", "type": "java.util.Map>", - "sourceType": "io.shardingsphere.core.util.DataSourceUtil" + "sourceType": "io.shardingsphere.shardingjdbc.util.DataSourceUtil" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "defaultValue": 3, "name": "sharding.jdbc.config.orchestration.etcd.max-retries", "description": "Maximal retries when calling a etcd method.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "defaultValue": 200, "name": "sharding.jdbc.config.orchestration.etcd.retry-interval-milliseconds", "description": "Maximal retries when calling a etcd method.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "name": "sharding.jdbc.config.orchestration.etcd.server-lists", "description": "Etcd server list.\n \n

Include ip address and port, multiple servers split by comma. Etc: {@code http:\/\/host1:2379,http:\/\/host2:2379}<\/p>.", "type": "java.lang.String" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "defaultValue": 60, "name": "sharding.jdbc.config.orchestration.etcd.time-to-live-seconds", "description": "Time to live seconds of ephemeral keys.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.etcd.EtcdConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration", "defaultValue": 500, "name": "sharding.jdbc.config.orchestration.etcd.timeout-milliseconds", "description": "Timeout when calling a etcd method in milliseconds.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "defaultValue": 1000, "name": "sharding.jdbc.config.orchestration.zookeeper.base-sleep-time-milliseconds", "description": "Base sleep time milliseconds.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "defaultValue": 0, "name": "sharding.jdbc.config.orchestration.zookeeper.connection-timeout-milliseconds", "description": "Connection timeout milliseconds.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "name": "sharding.jdbc.config.orchestration.zookeeper.digest", "description": "Digest for zookeeper.\n \n

Default is not need digest<\/p>.", "type": "java.lang.String" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "defaultValue": 3, "name": "sharding.jdbc.config.orchestration.zookeeper.max-retries", "description": "Max retries.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "defaultValue": 3000, "name": "sharding.jdbc.config.orchestration.zookeeper.max-sleep-time-milliseconds", "description": "Max sleep time milliseconds.", "type": "java.lang.Integer" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "name": "sharding.jdbc.config.orchestration.zookeeper.namespace", "description": "Namespace of zookeeper.", "type": "java.lang.String" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "name": "sharding.jdbc.config.orchestration.zookeeper.server-lists", "description": "Zookeeper server list.\n \n

Include ip address and port, multiple servers split by comma. Etc: {@code host1:2181,host2:2181}<\/p>.", "type": "java.lang.String" }, { - "sourceType": "io.shardingsphere.jdbc.orchestration.reg.zookeeper.ZookeeperConfiguration", + "sourceType": "io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration", "defaultValue": 0, "name": "sharding.jdbc.config.orchestration.zookeeper.session-timeout-milliseconds", "description": "Session timeout milliseconds.", diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java index 63544e7d8d150..5418abbf51d34 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootMasterSlaveTest.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.spring.boot.type; import io.shardingsphere.core.api.ConfigMapContext; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import io.shardingsphere.jdbc.spring.boot.util.EmbedTestingServer; import org.apache.commons.dbcp2.BasicDataSource; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java index 91d4db212b1ec..8a7f53a2bb338 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/test/java/io/shardingsphere/jdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java @@ -20,8 +20,8 @@ import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.core.ShardingContext; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; import io.shardingsphere.jdbc.spring.boot.util.EmbedTestingServer; import org.apache.commons.dbcp2.BasicDataSource; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java index 3da83b6a8e4f1..f97ee4de07372 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringMasterSlaveDataSource.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.spring.datasource; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java index e5e20c6ec45b6..bc86fb0ad8090 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingsphere/jdbc/orchestration/spring/datasource/OrchestrationSpringShardingDataSource.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.spring.datasource; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java index 5adc9ca7e6d82..97b6698ab3982 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationMasterSlaveNamespaceTest.java @@ -23,7 +23,7 @@ import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.core.rule.MasterSlaveRule; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringMasterSlaveDataSource; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java index befe81e268dac..a0de2bc476caf 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingMasterSlaveNamespaceTest.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.orchestration.spring; import io.shardingsphere.core.api.algorithm.masterslave.RoundRobinMasterSlaveLoadBalanceAlgorithm; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.jdbc.orchestration.spring.datasource.OrchestrationSpringShardingDataSource; import io.shardingsphere.jdbc.orchestration.spring.fixture.IncrementKeyGenerator; diff --git a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java index 77e8c78214a09..555a5254aaf8f 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java +++ b/sharding-orchestration/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/test/java/io/shardingsphere/jdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java @@ -22,7 +22,7 @@ import io.shardingsphere.core.api.config.strategy.StandardShardingStrategyConfiguration; import io.shardingsphere.core.constant.properties.ShardingProperties; import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.BindingTableRule; import io.shardingsphere.core.rule.DataNode; import io.shardingsphere.core.rule.ShardingRule; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java index 45b48530ae40e..91d2c93edf94d 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.orchestration.api; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import lombok.AccessLevel; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java index 0c1b0df411079..9b448f4f96003 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java @@ -18,7 +18,7 @@ package io.shardingsphere.jdbc.orchestration.api; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java index c677d3d22161f..4d0c183bc2db1 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationMasterSlaveDataSourceFactory.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.api.yaml; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationMasterSlaveDataSource; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java index 35660ba4bad43..01242702ea685 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/api/yaml/YamlOrchestrationShardingDataSourceFactory.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.api.yaml; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration; import io.shardingsphere.jdbc.orchestration.internal.datasource.OrchestrationShardingDataSource; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java index c885ea8431d92..e6d04a78289da 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/connection/CircuitBreakerConnection.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.internal.circuit.connection; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationConnection; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationConnection; import io.shardingsphere.jdbc.orchestration.internal.circuit.metadata.CircuitBreakerDatabaseMetaData; import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerPreparedStatement; import io.shardingsphere.jdbc.orchestration.internal.circuit.statement.CircuitBreakerStatement; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java index 6f58399839dab..84a6007524e3c 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/datasource/CircuitBreakerDataSource.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.internal.circuit.datasource; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationDataSource; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationDataSource; import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection; import java.io.PrintWriter; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java index d815533233fb9..1c0c68e52d205 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/resultset/CircuitBreakerResultSet.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.internal.circuit.resultset; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationResultSet; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationResultSet; import java.io.InputStream; import java.io.Reader; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java index dcf52fee6a5e7..f37cbf47e6568 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerPreparedStatement.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.internal.circuit.statement; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement; import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection; import io.shardingsphere.jdbc.orchestration.internal.circuit.resultset.CircuitBreakerResultSet; import lombok.Getter; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java index aeff2fa8d4d59..428a749d7dcc4 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/circuit/statement/CircuitBreakerStatement.java @@ -17,7 +17,7 @@ package io.shardingsphere.jdbc.orchestration.internal.circuit.statement; -import io.shardingsphere.core.jdbc.unsupported.AbstractUnsupportedOperationStatement; +import io.shardingsphere.shardingjdbc.jdbc.unsupported.AbstractUnsupportedOperationStatement; import io.shardingsphere.jdbc.orchestration.internal.circuit.connection.CircuitBreakerConnection; import lombok.Getter; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java index 6a472aaacdd2e..fd70553d30cfe 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/AbstractOrchestrationDataSource.java @@ -19,7 +19,7 @@ import com.google.common.eventbus.Subscribe; import io.shardingsphere.core.event.ShardingEventBusInstance; -import io.shardingsphere.core.jdbc.adapter.AbstractDataSourceAdapter; +import io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractDataSourceAdapter; import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade; import io.shardingsphere.jdbc.orchestration.internal.event.state.CircuitStateEventBusEvent; import lombok.AccessLevel; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java index 6d032aa5c1ef5..f62e605417da5 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java @@ -21,7 +21,7 @@ import com.google.common.eventbus.Subscribe; import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.core.rule.MasterSlaveRule; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade; diff --git a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java index 5befd2a5757f3..d66299545fe66 100644 --- a/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java +++ b/sharding-orchestration/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java @@ -21,7 +21,7 @@ import com.google.common.eventbus.Subscribe; import io.shardingsphere.core.api.ConfigMapContext; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.ShardingDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.jdbc.orchestration.config.OrchestrationConfiguration; import io.shardingsphere.jdbc.orchestration.internal.OrchestrationFacade; diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java index 08a036ec3fe96..b385673545c3c 100644 --- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java +++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration; import io.shardingsphere.core.api.config.ShardingRuleConfiguration; -import io.shardingsphere.core.jdbc.core.datasource.MasterSlaveDataSource; +import io.shardingsphere.shardingjdbc.jdbc.core.datasource.MasterSlaveDataSource; import io.shardingsphere.core.rule.DataSourceParameter; import io.shardingsphere.core.yaml.YamlRuleConfiguration; import io.shardingsphere.core.yaml.other.YamlServerConfiguration;