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
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;