This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a43c91c Merge shardingsphere-jdbc-governance and
shardingsphere-jdbc-core (#12036)
a43c91c is described below
commit a43c91cdc1db0b6d8ad4599d37b9f8774508b00f
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Aug 26 21:56:45 2021 +0800
Merge shardingsphere-jdbc-governance and shardingsphere-jdbc-core (#12036)
* Merge shardingsphere-jdbc-governance and shardingsphere-jdbc-core
* Add shardingsphere-integration-driver-test
* Fix compile error
* Fix compile error
* Fix compile error
* Fix compile error
---
examples/pom.xml | 5 -----
.../governance-raw-jdbc-example/pom.xml | 4 ----
.../shardingsphere-jdbc-distribution/pom.xml | 5 -----
shardingsphere-jdbc/pom.xml | 1 -
.../state}/circuit/CircuitBreakDriverState.java | 4 ++--
.../circuit/connection/CircuitBreakerConnection.java | 8 ++++----
.../circuit/datasource/CircuitBreakerDataSource.java | 4 ++--
.../metadata/CircuitBreakerDatabaseMetaData.java | 2 +-
.../circuit/resultset/CircuitBreakerResultSet.java | 2 +-
.../resultset/CircuitBreakerResultSetMetaData.java | 2 +-
.../statement/CircuitBreakerPreparedStatement.java | 6 +++---
.../circuit/statement/CircuitBreakerStatement.java | 4 ++--
.../driver/state}/lock/LockDriverState.java | 2 +-
.../driver/state/{ => ok}/OKDriverState.java | 3 ++-
...org.apache.shardingsphere.driver.state.DriverState | 4 +++-
.../state}/circuit/CircuitBreakDriverStateTest.java | 6 +++---
.../connection/CircuitBreakerConnectionTest.java | 8 ++++----
.../datasource/CircuitBreakerDataSourceTest.java | 4 ++--
.../metadata/CircuitBreakerDatabaseMetaDataTest.java | 2 +-
.../driver/state/{ => ok}/OKDriverStateTest.java | 4 ++--
...ache.shardingsphere.sharding.spi.ShardingAlgorithm | 19 -------------------
.../shardingsphere-jdbc-core-spring-namespace/pom.xml | 15 +++++++++++++++
.../shardingsphere-jdbc-governance-spring/pom.xml | 6 ------
.../pom.xml | 5 +++++
shardingsphere-test/pom.xml | 1 +
.../shardingsphere-integration-driver-test}/pom.xml | 4 ++--
.../driver}/AbstractYamlDataSourceTest.java | 2 +-
.../driver}/fixture/TestClusterPersistRepository.java | 2 +-
.../driver}/fixture/TestRuleConfiguration.java | 2 +-
.../driver}/fixture/TestRuleConfigurationChecker.java | 2 +-
.../algorithm}/DecrementKeyGenerateAlgorithm.java | 2 +-
.../algorithm}/IncrementKeyGenerateAlgorithm.java | 2 +-
.../driver/fixture/algorithm}/MultiAlgorithm.java | 2 +-
.../driver/fixture/algorithm}/StandardAlgorithm.java | 2 +-
...mlShardingWithReadwriteSplittingIntegrateTest.java | 8 ++++----
.../YamlReadwriteSplittingIntegrateTest.java | 10 +++++-----
.../driver/sharding/YamlShardingIntegrateTest.java | 8 ++++----
...sphere.infra.rule.checker.RuleConfigurationChecker | 2 +-
...e.mode.repository.cluster.ClusterPersistRepository | 2 +-
...e.shardingsphere.sharding.spi.KeyGenerateAlgorithm | 4 ++--
...ache.shardingsphere.sharding.spi.ShardingAlgorithm | 6 +++---
.../src/test/resources/logback-test.xml | 0
...nfigWithReadwriteSplittingDataSourceWithProps.yaml | 0
...gWithReadwriteSplittingDataSourceWithoutProps.yaml | 0
.../sharding/configWithDataSourceWithProps.yaml | 0
.../sharding/configWithDataSourceWithoutProps.yaml | 0
.../sharding/configWithoutDataSourceWithProps.yaml | 0
.../sharding/configWithoutDataSourceWithoutProps.yaml | 0
.../configWithDataSourceWithProps.yaml | 0
.../configWithDataSourceWithoutProps.yaml | 0
.../configWithDataSourceWithoutRules.yaml | 0
.../configWithoutDataSourceWithProps.yaml | 0
.../configWithoutDataSourceWithoutProps.yaml | 0
.../yaml/schema/readwrite_splitting/read_ds_0.sql | 0
.../yaml/schema/readwrite_splitting/read_ds_1.sql | 0
.../yaml/schema/readwrite_splitting/write_ds.sql | 0
.../src/test/resources/yaml/schema/sharding/db0.sql | 0
.../src/test/resources/yaml/schema/sharding/db1.sql | 0
.../schema/sharding_readwrite_splitting/read_ds_0.sql | 0
.../schema/sharding_readwrite_splitting/read_ds_1.sql | 0
.../sharding_readwrite_splitting/write_ds_0.sql | 0
.../sharding_readwrite_splitting/write_ds_1.sql | 0
.../src/test/resources/yaml/unit/sharding.yaml | 0
.../shardingsphere-integration-test-fixture/pom.xml | 7 +------
64 files changed, 86 insertions(+), 107 deletions(-)
diff --git a/examples/pom.xml b/examples/pom.xml
index e91d73f..8f0b899 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -95,11 +95,6 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
- <version>${shardingsphere.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-transaction-core</artifactId>
<version>${shardingsphere.version}</version>
</dependency>
diff --git
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/pom.xml
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/pom.xml
index e8bad7c..d304158 100644
---
a/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/pom.xml
+++
b/examples/shardingsphere-jdbc-example/governance-example/governance-raw-jdbc-example/pom.xml
@@ -41,10 +41,6 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-cluster-mode-repository-zookeeper-curator</artifactId>
</dependency>
</dependencies>
diff --git
a/shardingsphere-distribution/shardingsphere-jdbc-distribution/pom.xml
b/shardingsphere-distribution/shardingsphere-jdbc-distribution/pom.xml
index 50de571..591e7f9 100644
--- a/shardingsphere-distribution/shardingsphere-jdbc-distribution/pom.xml
+++ b/shardingsphere-distribution/shardingsphere-jdbc-distribution/pom.xml
@@ -33,11 +33,6 @@
<artifactId>shardingsphere-jdbc-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/shardingsphere-jdbc/pom.xml b/shardingsphere-jdbc/pom.xml
index 4bb5ebb..5ff7512 100644
--- a/shardingsphere-jdbc/pom.xml
+++ b/shardingsphere-jdbc/pom.xml
@@ -29,7 +29,6 @@
<modules>
<module>shardingsphere-jdbc-core</module>
- <module>shardingsphere-jdbc-governance</module>
<module>shardingsphere-jdbc-spring</module>
</modules>
</project>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
index ea586c1..d477262 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverState.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit;
+package org.apache.shardingsphere.driver.state.circuit;
-import
org.apache.shardingsphere.driver.governance.circuit.datasource.CircuitBreakerDataSource;
+import
org.apache.shardingsphere.driver.state.circuit.datasource.CircuitBreakerDataSource;
import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.core.TransactionType;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnection.java
similarity index 92%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnection.java
index 891be2e..a79dd81 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnection.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.connection;
+package org.apache.shardingsphere.driver.state.circuit.connection;
import java.sql.Array;
-import
org.apache.shardingsphere.driver.governance.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import
org.apache.shardingsphere.driver.governance.circuit.statement.CircuitBreakerPreparedStatement;
-import
org.apache.shardingsphere.driver.governance.circuit.statement.CircuitBreakerStatement;
+import
org.apache.shardingsphere.driver.state.circuit.metadata.CircuitBreakerDatabaseMetaData;
+import
org.apache.shardingsphere.driver.state.circuit.statement.CircuitBreakerPreparedStatement;
+import
org.apache.shardingsphere.driver.state.circuit.statement.CircuitBreakerStatement;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationConnection;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSource.java
similarity index 91%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSource.java
index b1d8696..6ade171 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSource.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.datasource;
+package org.apache.shardingsphere.driver.state.circuit.datasource;
-import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationDataSource;
import java.io.PrintWriter;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
index 8571bdc..4d92573 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.metadata;
+package org.apache.shardingsphere.driver.state.circuit.metadata;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSet.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSet.java
index 750b0ce..cf8c163 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.resultset;
+package org.apache.shardingsphere.driver.state.circuit.resultset;
import java.sql.Array;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationResultSet;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
similarity index 97%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
index fac5e98..ad409d7 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/resultset/CircuitBreakerResultSetMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.resultset;
+package org.apache.shardingsphere.driver.state.circuit.resultset;
import java.sql.ResultSetMetaData;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerPreparedStatement.java
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerPreparedStatement.java
index 46e1d2b..11ef419 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerPreparedStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.statement;
+package org.apache.shardingsphere.driver.state.circuit.statement;
import lombok.Getter;
-import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
-import
org.apache.shardingsphere.driver.governance.circuit.resultset.CircuitBreakerResultSet;
+import
org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.state.circuit.resultset.CircuitBreakerResultSet;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationPreparedStatement;
import
org.apache.shardingsphere.infra.executor.sql.federate.execute.FederateExecutor;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
index 108cd9f..2f5359c 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/circuit/statement/CircuitBreakerStatement.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.statement;
+package org.apache.shardingsphere.driver.state.circuit.statement;
import lombok.Getter;
-import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationStatement;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
index 9205f73..bff0b7c 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/lock/LockDriverState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.lock;
+package org.apache.shardingsphere.driver.state.lock;
import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.mode.manager.ContextManager;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/OKDriverState.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
similarity index 93%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/OKDriverState.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
index 88db29d..52cfcf7 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/OKDriverState.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/state/ok/OKDriverState.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.state;
+package org.apache.shardingsphere.driver.state.ok;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
+import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.apache.shardingsphere.transaction.core.TransactionTypeHolder;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
index afb72a2..1650419 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
@@ -15,4 +15,6 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.state.OKDriverState
+org.apache.shardingsphere.driver.state.ok.OKDriverState
+org.apache.shardingsphere.driver.state.circuit.CircuitBreakDriverState
+org.apache.shardingsphere.driver.state.lock.LockDriverState
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
similarity index 91%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
index c686b10..7c240dad 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/CircuitBreakDriverStateTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit;
+package org.apache.shardingsphere.driver.state.circuit;
-import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
-import org.apache.shardingsphere.mode.manager.ContextManager;
+import
org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
import org.apache.shardingsphere.infra.database.DefaultSchema;
+import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Test;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnectionTest.java
similarity index 92%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnectionTest.java
index 5cd9cd4..f35c77d 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/connection/CircuitBreakerConnectionTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.connection;
+package org.apache.shardingsphere.driver.state.circuit.connection;
-import
org.apache.shardingsphere.driver.governance.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import
org.apache.shardingsphere.driver.governance.circuit.statement.CircuitBreakerPreparedStatement;
-import
org.apache.shardingsphere.driver.governance.circuit.statement.CircuitBreakerStatement;
+import
org.apache.shardingsphere.driver.state.circuit.metadata.CircuitBreakerDatabaseMetaData;
+import
org.apache.shardingsphere.driver.state.circuit.statement.CircuitBreakerPreparedStatement;
+import
org.apache.shardingsphere.driver.state.circuit.statement.CircuitBreakerStatement;
import org.junit.Test;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSourceTest.java
similarity index 91%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSourceTest.java
index e4c63c5..c083081 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/datasource/CircuitBreakerDataSourceTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.datasource;
+package org.apache.shardingsphere.driver.state.circuit.datasource;
-import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.state.circuit.connection.CircuitBreakerConnection;
import org.junit.Test;
import static org.junit.Assert.assertNull;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
index 1e441d3..0943cb6 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.circuit.metadata;
+package org.apache.shardingsphere.driver.state.circuit.metadata;
import org.junit.Test;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/OKDriverStateTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
similarity index 97%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/OKDriverStateTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
index 0fae50b..3e33950 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/OKDriverStateTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/ok/OKDriverStateTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.state;
+package org.apache.shardingsphere.driver.state.ok;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.infra.database.DefaultSchema;
+import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Test;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
deleted file mode 100644
index 952e3b6..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.shardingsphere.driver.governance.api.yaml.fixture.MultiAlgorithm
-org.apache.shardingsphere.driver.governance.api.yaml.fixture.StandardAlgorithm
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/pom.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/pom.xml
index 84e72bb..c7eee51 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/pom.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/pom.xml
@@ -29,6 +29,11 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-memory-mode-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-standalone-mode-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -39,6 +44,16 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-cluster-mode-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-jdbc-transaction-spring</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/pom.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/pom.xml
index 9443a38..fe5ee76 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/pom.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/pom.xml
@@ -34,12 +34,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
</dependency>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/pom.xml
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/pom.xml
index 0bec059..19c7c68 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/pom.xml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/pom.xml
@@ -33,6 +33,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-cluster-mode-repository-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/shardingsphere-test/pom.xml b/shardingsphere-test/pom.xml
index 056e1af..2a73ecb 100644
--- a/shardingsphere-test/pom.xml
+++ b/shardingsphere-test/pom.xml
@@ -32,6 +32,7 @@
<modules>
<module>shardingsphere-test-common</module>
<module>shardingsphere-integration-test</module>
+ <module>shardingsphere-integration-driver-test</module>
<module>shardingsphere-integration-agent-test</module>
<module>shardingsphere-integration-scaling-test</module>
<module>shardingsphere-rewrite-test</module>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml
b/shardingsphere-test/shardingsphere-integration-driver-test/pom.xml
similarity index 95%
rename from shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml
rename to shardingsphere-test/shardingsphere-integration-driver-test/pom.xml
index bec1ab1..9f4acb9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-governance/pom.xml
+++ b/shardingsphere-test/shardingsphere-integration-driver-test/pom.xml
@@ -20,10 +20,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc</artifactId>
+ <artifactId>shardingsphere-test</artifactId>
<version>5.0.0-RC1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
+ <artifactId>shardingsphere-integration-driver-test</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/AbstractYamlDataSourceTest.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/AbstractYamlDataSourceTest.java
similarity index 98%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/AbstractYamlDataSourceTest.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/AbstractYamlDataSourceTest.java
index f6dfad9..821d7ac 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/AbstractYamlDataSourceTest.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/AbstractYamlDataSourceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml;
+package org.apache.shardingsphere.driver;
import org.apache.commons.dbcp2.BasicDataSource;
import org.h2.tools.RunScript;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestClusterPersistRepository.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
similarity index 97%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestClusterPersistRepository.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
index b294432..8bb8de8 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestClusterPersistRepository.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.fixture;
+package org.apache.shardingsphere.driver.fixture;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfiguration.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfiguration.java
similarity index 94%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfiguration.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfiguration.java
index 83dca0b..4dce05e 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfiguration.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.fixture;
+package org.apache.shardingsphere.driver.fixture;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.infra.config.function.EnhancedRuleConfiguration;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfigurationChecker.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
similarity index 95%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfigurationChecker.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
index 8285979..1393441 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/fixture/TestRuleConfigurationChecker.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestRuleConfigurationChecker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.fixture;
+package org.apache.shardingsphere.driver.fixture;
import org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java
similarity index 94%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java
index a618cdd..a8e02f6 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/DecrementKeyGenerateAlgorithm.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/DecrementKeyGenerateAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
+package org.apache.shardingsphere.driver.fixture.algorithm;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java
similarity index 95%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java
index ce6d6ff..c8868fb 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/IncrementKeyGenerateAlgorithm.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/IncrementKeyGenerateAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
+package org.apache.shardingsphere.driver.fixture.algorithm;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/MultiAlgorithm.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/MultiAlgorithm.java
similarity index 95%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/MultiAlgorithm.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/MultiAlgorithm.java
index f9b4517..fc0cf77 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/MultiAlgorithm.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/MultiAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
+package org.apache.shardingsphere.driver.fixture.algorithm;
import lombok.Getter;
import lombok.Setter;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java
index 2e94bd1..94a41fe 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/fixture/StandardAlgorithm.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/algorithm/StandardAlgorithm.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.fixture;
+package org.apache.shardingsphere.driver.fixture.algorithm;
import
org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
import
org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithReadwriteSplittingIntegrateTest.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java
similarity index 89%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithReadwriteSplittingIntegrateTest.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java
index bb24e76..fd183bf 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingWithReadwriteSplittingIntegrateTest.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/mix/YamlShardingWithReadwriteSplittingIntegrateTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.sharding;
+package org.apache.shardingsphere.driver.mix;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
-import
org.apache.shardingsphere.driver.governance.api.yaml.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.driver.AbstractYamlDataSourceTest;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +40,7 @@ import java.util.Map.Entry;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class YamlGovernanceShardingWithReadwriteSplittingIntegrateTest
extends AbstractYamlDataSourceTest {
+public final class YamlShardingWithReadwriteSplittingIntegrateTest extends
AbstractYamlDataSourceTest {
private final String filePath;
@@ -58,7 +58,7 @@ public final class
YamlGovernanceShardingWithReadwriteSplittingIntegrateTest ext
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new
File(YamlGovernanceShardingWithReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
+ File yamlFile = new
File(YamlShardingWithReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource =
YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/readwrite/YamlGovernanceReadwriteSplittingIntegrateTest.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java
similarity index 88%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/readwrite/YamlGovernanceReadwriteSplittingIntegrateTest.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java
index 01282b1..288bba1 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/readwrite/YamlGovernanceReadwriteSplittingIntegrateTest.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/readwrite/YamlReadwriteSplittingIntegrateTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.readwrite;
+package org.apache.shardingsphere.driver.readwrite;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
-import
org.apache.shardingsphere.driver.governance.api.yaml.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.driver.AbstractYamlDataSourceTest;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ import java.util.Collection;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public final class YamlGovernanceReadwriteSplittingIntegrateTest extends
AbstractYamlDataSourceTest {
+public final class YamlReadwriteSplittingIntegrateTest extends
AbstractYamlDataSourceTest {
private final String filePath;
@@ -55,7 +55,7 @@ public final class
YamlGovernanceReadwriteSplittingIntegrateTest extends Abstrac
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new
File(YamlGovernanceReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
+ File yamlFile = new
File(YamlReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource =
YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
@@ -74,7 +74,7 @@ public final class
YamlGovernanceReadwriteSplittingIntegrateTest extends Abstrac
@Test
public void assertWithDataSourceByYamlBytes() throws Exception {
- File yamlFile = new
File(YamlGovernanceReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
+ File yamlFile = new
File(YamlReadwriteSplittingIntegrateTest.class.getResource(filePath).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource =
YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingIntegrateTest.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/sharding/YamlShardingIntegrateTest.java
similarity index 89%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingIntegrateTest.java
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/sharding/YamlShardingIntegrateTest.java
index ff52d98..fe854ce 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/api/yaml/sharding/YamlGovernanceShardingIntegrateTest.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/sharding/YamlShardingIntegrateTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.api.yaml.sharding;
+package org.apache.shardingsphere.driver.sharding;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
-import
org.apache.shardingsphere.driver.governance.api.yaml.AbstractYamlDataSourceTest;
+import org.apache.shardingsphere.driver.AbstractYamlDataSourceTest;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ import java.util.Collection;
@RunWith(Parameterized.class)
@RequiredArgsConstructor
-public class YamlGovernanceShardingIntegrateTest extends
AbstractYamlDataSourceTest {
+public class YamlShardingIntegrateTest extends AbstractYamlDataSourceTest {
private final String filePath;
@@ -55,7 +55,7 @@ public class YamlGovernanceShardingIntegrateTest extends
AbstractYamlDataSourceT
@Test
public void assertWithDataSource() throws Exception {
- File yamlFile = new
File(YamlGovernanceShardingIntegrateTest.class.getResource(filePath).toURI());
+ File yamlFile = new
File(YamlShardingIntegrateTest.class.getResource(filePath).toURI());
DataSource dataSource;
if (hasDataSource) {
dataSource =
YamlShardingSphereDataSourceFactory.createDataSource(yamlFile);
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
index aa189db..b0713f2 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.rule.checker.RuleConfigurationChecker
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.governance.fixture.TestRuleConfigurationChecker
+org.apache.shardingsphere.driver.fixture.TestRuleConfigurationChecker
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
index 76ed061..a82d71f 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.governance.fixture.TestClusterPersistRepository
+org.apache.shardingsphere.driver.fixture.TestClusterPersistRepository
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
similarity index 83%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
index 96c04f1..3063038 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm
@@ -17,5 +17,5 @@
org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateAlgorithm
org.apache.shardingsphere.sharding.algorithm.keygen.UUIDKeyGenerateAlgorithm
-org.apache.shardingsphere.driver.governance.api.yaml.fixture.IncrementKeyGenerateAlgorithm
-org.apache.shardingsphere.driver.governance.api.yaml.fixture.DecrementKeyGenerateAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.IncrementKeyGenerateAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.DecrementKeyGenerateAlgorithm
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
similarity index 84%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
index 89049ff..5edd0ae 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/META-INF/services/org.apache.shardingsphere.sharding.spi.ShardingAlgorithm
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-org.apache.shardingsphere.driver.governance.circuit.CircuitBreakDriverState
-org.apache.shardingsphere.driver.governance.lock.LockDriverState
+
+org.apache.shardingsphere.driver.fixture.algorithm.MultiAlgorithm
+org.apache.shardingsphere.driver.fixture.algorithm.StandardAlgorithm
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/logback-test.xml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/logback-test.xml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/logback-test.xml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/logback-test.xml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/readwrite_splitting/configWithReadwriteSplittingDataSourceWithoutProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithDataSourceWithoutRules.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/integrate/sharding_readwrite_splitting/configWithoutDataSourceWithoutProps.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/read_ds_0.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/read_ds_0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/read_ds_0.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/read_ds_0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/read_ds_1.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/read_ds_1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/read_ds_1.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/read_ds_1.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/write_ds.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/write_ds.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/readwrite_splitting/write_ds.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/readwrite_splitting/write_ds.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding/db0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db0.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding/db0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding/db1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding/db1.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding/db1.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_0.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_0.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_1.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_1.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/read_ds_1.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_0.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_0.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_1.sql
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_1.sql
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/schema/sharding_readwrite_splitting/write_ds_1.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/sharding.yaml
rename to
shardingsphere-test/shardingsphere-integration-driver-test/src/test/resources/yaml/unit/sharding.yaml
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
index 8341695..31202d9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-fixture/pom.xml
@@ -53,12 +53,7 @@
<artifactId>shardingsphere-jdbc-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-jdbc-governance</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
