This is an automated email from the ASF dual-hosted git repository.
panjuan 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 f000d89 Refactor package of gov jdbc (#11929)
f000d89 is described below
commit f000d89395f10f0fd3fae2645f04c3fde04259cc
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 21 11:13:36 2021 +0800
Refactor package of gov jdbc (#11929)
---
.../driver}/state/DriverStateContextTest.java | 13 +------
.../state => circuit}/CircuitBreakDriverState.java | 4 +-
.../connection/CircuitBreakerConnection.java | 8 ++--
.../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 +-
.../{internal/state => lock}/LockDriverState.java | 2 +-
....apache.shardingsphere.driver.state.DriverState | 4 +-
.../CircuitBreakDriverStateTest.java | 4 +-
.../connection/CircuitBreakerConnectionTest.java | 8 ++--
.../datasource/CircuitBreakerDataSourceTest.java | 4 +-
.../CircuitBreakerDatabaseMetaDataTest.java | 2 +-
.../GovernanceShardingSphereDataSourceTest.java | 43 ----------------------
16 files changed, 29 insertions(+), 83 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/DriverStateContextTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
similarity index 75%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/DriverStateContextTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
index bdabdca..7ba3e16 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/DriverStateContextTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/state/DriverStateContextTest.java
@@ -15,16 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.state;
+package org.apache.shardingsphere.driver.state;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
import
org.apache.shardingsphere.driver.jdbc.core.connection.ShardingSphereConnection;
-import org.apache.shardingsphere.driver.state.DriverStateContext;
import org.apache.shardingsphere.infra.context.manager.ContextManager;
import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.infra.persist.DistMetaDataPersistService;
-import org.apache.shardingsphere.infra.state.StateEvent;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Before;
import org.junit.Test;
@@ -60,12 +57,4 @@ public final class DriverStateContextTest {
DefaultSchema.LOGIC_NAME, Collections.singletonMap("ds",
mock(DataSource.class, RETURNS_DEEP_STUBS)), contextManager,
TransactionType.LOCAL);
assertThat(actual, instanceOf(ShardingSphereConnection.class));
}
-
- @Test
- public void assertGetConnectionWithCircuitBreakState() {
- contextManager.getMetaDataContexts().getStateContext().switchState(new
StateEvent("CIRCUIT_BREAK", true));
- Connection actual = DriverStateContext.getConnection(
- DefaultSchema.LOGIC_NAME, Collections.singletonMap("ds",
mock(DataSource.class, RETURNS_DEEP_STUBS)), contextManager,
TransactionType.LOCAL);
- assertThat(actual, instanceOf(CircuitBreakerConnection.class));
- }
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverState.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
similarity index 89%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverState.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
index be810b4..65ccd46 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverState.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverState.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.state;
+package org.apache.shardingsphere.driver.governance.circuit;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.datasource.CircuitBreakerDataSource;
+import
org.apache.shardingsphere.driver.governance.circuit.datasource.CircuitBreakerDataSource;
import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.infra.context.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/internal/circuit/connection/CircuitBreakerConnection.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
similarity index 91%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
index a4767a0..891be2e 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnection.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnection.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.driver.governance.internal.circuit.connection;
+package org.apache.shardingsphere.driver.governance.circuit.connection;
import java.sql.Array;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.statement.CircuitBreakerPreparedStatement;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.statement.CircuitBreakerStatement;
+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.jdbc.unsupported.AbstractUnsupportedOperationConnection;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSource.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSource.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
index 7aad6ac..b1d8696 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSource.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSource.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.driver.governance.internal.circuit.datasource;
+package org.apache.shardingsphere.driver.governance.circuit.datasource;
+import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
import
org.apache.shardingsphere.driver.jdbc.unsupported.AbstractUnsupportedOperationDataSource;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
import java.io.PrintWriter;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
index 86cc664..8571bdc 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/metadata/CircuitBreakerDatabaseMetaData.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.metadata;
+package org.apache.shardingsphere.driver.governance.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/internal/circuit/resultset/CircuitBreakerResultSet.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/resultset/CircuitBreakerResultSet.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
index 75f8f3f..750b0ce 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/resultset/CircuitBreakerResultSet.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.resultset;
+package org.apache.shardingsphere.driver.governance.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/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
similarity index 97%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
index 40e9458..fac5e98 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/resultset/CircuitBreakerResultSetMetaData.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/resultset/CircuitBreakerResultSetMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.resultset;
+package org.apache.shardingsphere.driver.governance.circuit.resultset;
import java.sql.ResultSetMetaData;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerPreparedStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
similarity index 96%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerPreparedStatement.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
index 025be8b..46e1d2b 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerPreparedStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerPreparedStatement.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.statement;
+package org.apache.shardingsphere.driver.governance.circuit.statement;
import lombok.Getter;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.resultset.CircuitBreakerResultSet;
+import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.governance.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/internal/circuit/statement/CircuitBreakerStatement.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
similarity index 95%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
index 18a3620..108cd9f 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/circuit/statement/CircuitBreakerStatement.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/circuit/statement/CircuitBreakerStatement.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.statement;
+package org.apache.shardingsphere.driver.governance.circuit.statement;
import lombok.Getter;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.governance.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/internal/state/LockDriverState.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
similarity index 95%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/state/LockDriverState.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
index ddbb39b..94d8a69 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/internal/state/LockDriverState.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/java/org/apache/shardingsphere/driver/governance/lock/LockDriverState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.state;
+package org.apache.shardingsphere.driver.governance.lock;
import org.apache.shardingsphere.driver.state.DriverState;
import org.apache.shardingsphere.infra.context.manager.ContextManager;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
index dfd9095..89049ff 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/main/resources/META-INF/services/org.apache.shardingsphere.driver.state.DriverState
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.driver.governance.internal.state.CircuitBreakDriverState
-org.apache.shardingsphere.driver.governance.internal.state.LockDriverState
+org.apache.shardingsphere.driver.governance.circuit.CircuitBreakDriverState
+org.apache.shardingsphere.driver.governance.lock.LockDriverState
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverStateTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverStateTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
index 6403c36..6d9d790 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/state/CircuitBreakDriverStateTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/CircuitBreakDriverStateTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.state;
+package org.apache.shardingsphere.driver.governance.circuit;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.governance.circuit.connection.CircuitBreakerConnection;
import org.apache.shardingsphere.infra.context.manager.ContextManager;
import org.apache.shardingsphere.infra.database.DefaultSchema;
import org.apache.shardingsphere.transaction.core.TransactionType;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnectionTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
similarity index 91%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnectionTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
index 2c093c4..5cd9cd4 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/connection/CircuitBreakerConnectionTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/connection/CircuitBreakerConnectionTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.driver.governance.internal.circuit.connection;
+package org.apache.shardingsphere.driver.governance.circuit.connection;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.metadata.CircuitBreakerDatabaseMetaData;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.statement.CircuitBreakerPreparedStatement;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.statement.CircuitBreakerStatement;
+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.junit.Test;
import java.sql.Connection;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
similarity index 90%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
index ec1b5b0..e4c63c5 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/datasource/CircuitBreakerDataSourceTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/datasource/CircuitBreakerDataSourceTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.driver.governance.internal.circuit.datasource;
+package org.apache.shardingsphere.driver.governance.circuit.datasource;
-import
org.apache.shardingsphere.driver.governance.internal.circuit.connection.CircuitBreakerConnection;
+import
org.apache.shardingsphere.driver.governance.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/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
similarity index 99%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
rename to
shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
index e877929..1e441d3 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/circuit/metadata/CircuitBreakerDatabaseMetaDataTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.driver.governance.internal.circuit.metadata;
+package org.apache.shardingsphere.driver.governance.circuit.metadata;
import org.junit.Test;
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
deleted file mode 100644
index fe51775..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/java/org/apache/shardingsphere/driver/governance/internal/datasource/GovernanceShardingSphereDataSourceTest.java
+++ /dev/null
@@ -1,43 +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.
- */
-
-package org.apache.shardingsphere.driver.governance.internal.datasource;
-
-import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
-import
org.apache.shardingsphere.governance.repository.api.config.RegistryCenterConfiguration;
-import org.apache.shardingsphere.infra.database.DefaultSchema;
-import org.apache.shardingsphere.infra.mode.config.ModeConfiguration;
-import org.junit.Test;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
-
-public final class GovernanceShardingSphereDataSourceTest {
-
- @Test
- public void assertInitializeGovernanceShardingSphereDataSource() throws
SQLException {
- assertThat(new ShardingSphereDataSource(DefaultSchema.LOGIC_NAME,
createModeConfiguration()).getConnection(), instanceOf(Connection.class));
- }
-
- private static ModeConfiguration createModeConfiguration() {
- return new ModeConfiguration("Cluster", new
RegistryCenterConfiguration("GOV_TEST", "test_name", "localhost:3181", new
Properties()), true);
- }
-}
