This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 437cea1f327 Refactor : refactor the container management in
transaction IT (#20813)
437cea1f327 is described below
commit 437cea1f3273d88dbdc638f9616779f04ae68efa
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Tue Sep 6 11:53:35 2022 +0800
Refactor : refactor the container management in transaction IT (#20813)
* Refactor : format a method
* Refactor : nename the container management
* Refactor : refactor the container management in transaction IT
---
.../transaction/engine/base/BaseITCase.java | 48 +++++++++++-----------
.../transaction/engine/base/JdbcDataSource.java | 12 +++---
.../transaction/engine/base/ProxyDataSource.java | 12 +++---
.../engine/mysql/MySQLJdbcTransactionIT.java | 2 +-
.../engine/mysql/MySQLProxyTransactionIT.java | 2 +-
.../opengauss/OpenGaussJdbcTransactionIT.java | 2 +-
.../opengauss/OpenGaussProxyTransactionIT.java | 2 +-
.../postgresql/PostgreSQLJdbcTransactionIT.java | 2 +-
.../postgresql/PostgreSQLProxyTransactionIT.java | 2 +-
...edContainer.java => BaseContainerComposer.java} | 4 +-
...Container.java => DockerContainerComposer.java} | 4 +-
...Container.java => NativeContainerComposer.java} | 4 +-
12 files changed, 48 insertions(+), 48 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
index df68e9654b4..885232a7139 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
@@ -36,9 +36,9 @@ import
org.apache.shardingsphere.integration.transaction.engine.entity.JdbcInfoE
import
org.apache.shardingsphere.integration.transaction.env.IntegrationTestEnvironment;
import
org.apache.shardingsphere.integration.transaction.env.enums.TransactionITEnvTypeEnum;
import
org.apache.shardingsphere.integration.transaction.env.enums.TransactionTestCaseRegistry;
-import
org.apache.shardingsphere.integration.transaction.framework.container.compose.BaseComposedContainer;
-import
org.apache.shardingsphere.integration.transaction.framework.container.compose.DockerComposedContainer;
-import
org.apache.shardingsphere.integration.transaction.framework.container.compose.NativeComposedContainer;
+import
org.apache.shardingsphere.integration.transaction.framework.container.compose.BaseContainerComposer;
+import
org.apache.shardingsphere.integration.transaction.framework.container.compose.DockerContainerComposer;
+import
org.apache.shardingsphere.integration.transaction.framework.container.compose.NativeContainerComposer;
import
org.apache.shardingsphere.integration.transaction.framework.param.TransactionParameterized;
import
org.apache.shardingsphere.integration.transaction.util.TestCaseClassScanner;
import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.DockerStorageContainer;
@@ -95,7 +95,7 @@ public abstract class BaseITCase {
private static final List<Class<? extends BaseTransactionTestCase>>
TEST_CASES;
- private final BaseComposedContainer composedContainer;
+ private final BaseContainerComposer containerComposer;
private final CommonSQLCommand commonSQLCommand;
@@ -115,7 +115,7 @@ public abstract class BaseITCase {
public BaseITCase(final TransactionParameterized parameterized) {
databaseType = parameterized.getDatabaseType();
adapter = parameterized.getAdapter();
- composedContainer = createAndStartComposedContainer(parameterized);
+ containerComposer = createAndStartContainerComposer(parameterized);
commonSQLCommand = getSqlCommand();
initActualDataSources();
if (isProxyAdapter(parameterized)) {
@@ -126,13 +126,13 @@ public abstract class BaseITCase {
}
private void createJdbcDataSource() {
- if (composedContainer instanceof DockerComposedContainer) {
- DockerComposedContainer dockerComposedContainer =
(DockerComposedContainer) composedContainer;
- DockerStorageContainer databaseContainer =
dockerComposedContainer.getStorageContainer();
+ if (containerComposer instanceof DockerContainerComposer) {
+ DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
+ DockerStorageContainer databaseContainer =
dockerContainerComposer.getStorageContainer();
Map<String, DataSource> actualDataSourceMap =
databaseContainer.getActualDataSourceMap();
actualDataSourceMap.put("ds_0",
createDataSource(databaseContainer, DS_0));
actualDataSourceMap.put("ds_1",
createDataSource(databaseContainer, DS_1));
- dataSource = new JdbcDataSource(dockerComposedContainer);
+ dataSource = new JdbcDataSource(dockerContainerComposer);
}
}
@@ -285,15 +285,15 @@ public abstract class BaseITCase {
return
JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource("env/common/command.xml")),
CommonSQLCommand.class);
}
- private BaseComposedContainer createAndStartComposedContainer(final
TransactionParameterized parameterized) {
- final BaseComposedContainer composedContainer;
+ private BaseContainerComposer createAndStartContainerComposer(final
TransactionParameterized parameterized) {
+ final BaseContainerComposer containerComposer;
if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
- composedContainer = new DockerComposedContainer(parameterized);
+ containerComposer = new DockerContainerComposer(parameterized);
} else {
- composedContainer = new
NativeComposedContainer(parameterized.getDatabaseType());
+ containerComposer = new
NativeContainerComposer(parameterized.getDatabaseType());
}
- composedContainer.start();
- return composedContainer;
+ containerComposer.start();
+ return containerComposer;
}
@SneakyThrows(SQLException.class)
@@ -307,8 +307,8 @@ public abstract class BaseITCase {
private String getJdbcUrl(final JdbcInfoEntity jdbcInfo) {
String jdbcUrl;
if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
- DockerComposedContainer dockerComposedContainer =
(DockerComposedContainer) composedContainer;
- DockerStorageContainer databaseContainer =
dockerComposedContainer.getStorageContainer();
+ DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
+ DockerStorageContainer databaseContainer =
dockerContainerComposer.getStorageContainer();
jdbcUrl = databaseContainer.getJdbcUrl("");
} else {
jdbcUrl = DataSourceEnvironment.getURL(databaseType, "localhost",
jdbcInfo.getPort());
@@ -319,8 +319,8 @@ public abstract class BaseITCase {
private JdbcInfoEntity getJdbcInfoEntity() {
JdbcInfoEntity jdbcInfo;
if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
- DockerComposedContainer dockerComposedContainer =
(DockerComposedContainer) composedContainer;
- DockerStorageContainer databaseContainer =
dockerComposedContainer.getStorageContainer();
+ DockerContainerComposer dockerContainerComposer =
(DockerContainerComposer) containerComposer;
+ DockerStorageContainer databaseContainer =
dockerContainerComposer.getStorageContainer();
jdbcInfo = new JdbcInfoEntity(databaseContainer.getUsername(),
databaseContainer.getPassword(), databaseContainer.getExposedPort());
} else {
jdbcInfo = ENV.getActualDatabaseJdbcInfo(getDatabaseType());
@@ -371,7 +371,7 @@ public abstract class BaseITCase {
if (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) {
defaultDatabaseName = "postgres";
}
- String jdbcUrl =
composedContainer.getProxyJdbcUrl(defaultDatabaseName);
+ String jdbcUrl =
containerComposer.getProxyJdbcUrl(defaultDatabaseName);
if (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) {
jdbcUrl = JDBC_URL_APPENDER.appendQueryProperties(jdbcUrl,
getPostgreSQLQueryProperties());
}
@@ -379,7 +379,7 @@ public abstract class BaseITCase {
}
protected AutoDataSource getProxyDataSource(final String databaseName) {
- return new ProxyDataSource(composedContainer, databaseName,
ENV.getProxyUserName(), ENV.getProxyPassword());
+ return new ProxyDataSource(containerComposer, databaseName,
ENV.getProxyUserName(), ENV.getProxyPassword());
}
protected boolean waitShardingAlgorithmEffect(final int maxWaitTimes) {
@@ -400,14 +400,14 @@ public abstract class BaseITCase {
@SneakyThrows
protected void addResources() {
if (DatabaseTypeUtil.isMySQL(databaseType)) {
- try (Connection connection =
DriverManager.getConnection(getComposedContainer().getProxyJdbcUrl(""),
ENV.getProxyUserName(), ENV.getProxyPassword())) {
+ try (Connection connection =
DriverManager.getConnection(getContainerComposer().getProxyJdbcUrl(""),
ENV.getProxyUserName(), ENV.getProxyPassword())) {
executeWithLog(connection, "USE sharding_db");
addResources(connection);
}
} else {
Properties queryProps = getPostgreSQLQueryProperties();
try (
- Connection connection =
DriverManager.getConnection(JDBC_URL_APPENDER.appendQueryProperties(getComposedContainer().getProxyJdbcUrl("sharding_db"),
queryProps),
+ Connection connection =
DriverManager.getConnection(JDBC_URL_APPENDER.appendQueryProperties(getContainerComposer().getProxyJdbcUrl("sharding_db"),
queryProps),
ENV.getProxyUserName(), ENV.getProxyPassword())) {
addResources(connection);
}
@@ -470,7 +470,7 @@ public abstract class BaseITCase {
private String getActualJdbcUrlTemplate(final String databaseName) {
if (ENV.getItEnvType() == TransactionITEnvTypeEnum.DOCKER) {
- final DockerStorageContainer databaseContainer =
((DockerComposedContainer) composedContainer).getStorageContainer();
+ final DockerStorageContainer databaseContainer =
((DockerContainerComposer) containerComposer).getStorageContainer();
return DataSourceEnvironment.getURL(getDatabaseType(),
getDatabaseType().getType().toLowerCase() + ".host",
databaseContainer.getExposedPort(), databaseName);
} else {
return DataSourceEnvironment.getURL(getDatabaseType(),
"127.0.0.1", ENV.getActualDataSourceDefaultPort(databaseType), databaseName);
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/JdbcDataSource.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/JdbcDataSource.java
index 2281e31cea5..7500a192f90 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/JdbcDataSource.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/JdbcDataSource.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.integration.transaction.engine.base;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.integration.transaction.framework.container.compose.DockerComposedContainer;
+import
org.apache.shardingsphere.integration.transaction.framework.container.compose.DockerContainerComposer;
import java.sql.Connection;
import java.sql.SQLException;
@@ -29,10 +29,10 @@ import java.sql.SQLException;
@Slf4j
public final class JdbcDataSource extends AutoDataSource {
- private final DockerComposedContainer composedContainer;
+ private final DockerContainerComposer containerComposer;
- public JdbcDataSource(final DockerComposedContainer composedContainer) {
- this.composedContainer = composedContainer;
+ public JdbcDataSource(final DockerContainerComposer containerComposer) {
+ this.containerComposer = containerComposer;
}
@Override
@@ -46,7 +46,7 @@ public final class JdbcDataSource extends AutoDataSource {
@Override
public Connection getConnection(final String username, final String
password) throws SQLException {
- Connection result =
composedContainer.getJdbcContainer().getTargetDataSource().getConnection();
+ Connection result =
containerComposer.getJdbcContainer().getTargetDataSource().getConnection();
synchronized (this) {
getConnectionCache().add(result);
}
@@ -54,6 +54,6 @@ public final class JdbcDataSource extends AutoDataSource {
}
private Connection createConnection() throws SQLException {
- return
composedContainer.getJdbcContainer().getTargetDataSource().getConnection();
+ return
containerComposer.getJdbcContainer().getTargetDataSource().getConnection();
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/ProxyDataSource.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/ProxyDataSource.java
index 5514d74c992..a7e097124fa 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/ProxyDataSource.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/ProxyDataSource.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.integration.transaction.engine.base;
-import
org.apache.shardingsphere.integration.transaction.framework.container.compose.BaseComposedContainer;
+import
org.apache.shardingsphere.integration.transaction.framework.container.compose.BaseContainerComposer;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -28,7 +28,7 @@ import java.sql.SQLException;
*/
public final class ProxyDataSource extends AutoDataSource {
- private final BaseComposedContainer composedContainer;
+ private final BaseContainerComposer containerComposer;
private final String databaseName;
@@ -36,8 +36,8 @@ public final class ProxyDataSource extends AutoDataSource {
private final String password;
- public ProxyDataSource(final BaseComposedContainer composedContainer,
final String databaseName, final String userName, final String password) {
- this.composedContainer = composedContainer;
+ public ProxyDataSource(final BaseContainerComposer containerComposer,
final String databaseName, final String userName, final String password) {
+ this.containerComposer = containerComposer;
this.databaseName = databaseName;
this.userName = userName;
this.password = password;
@@ -54,7 +54,7 @@ public final class ProxyDataSource extends AutoDataSource {
@Override
public Connection getConnection(final String username, final String
password) throws SQLException {
- String jdbcUrl = composedContainer.getProxyJdbcUrl(databaseName);
+ String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseName);
Connection result = DriverManager.getConnection(jdbcUrl, username,
password);
synchronized (this) {
getConnectionCache().add(result);
@@ -63,7 +63,7 @@ public final class ProxyDataSource extends AutoDataSource {
}
private Connection createConnection() throws SQLException {
- String jdbcUrl = composedContainer.getProxyJdbcUrl(databaseName);
+ String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseName);
return DriverManager.getConnection(jdbcUrl, userName, password);
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLJdbcTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLJdbcTransactionIT.java
index 502dfc56a69..f105a49929f 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLJdbcTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLJdbcTransactionIT.java
@@ -54,7 +54,7 @@ public final class MySQLJdbcTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLProxyTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLProxyTransactionIT.java
index 5d78a9f32b3..219cbfbea4d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLProxyTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/mysql/MySQLProxyTransactionIT.java
@@ -70,7 +70,7 @@ public final class MySQLProxyTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
index 88ca6a1cc1e..3630d02ae68 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussJdbcTransactionIT.java
@@ -54,7 +54,7 @@ public final class OpenGaussJdbcTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
index df6f1ffb705..0019711f95c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/opengauss/OpenGaussProxyTransactionIT.java
@@ -70,7 +70,7 @@ public final class OpenGaussProxyTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLJdbcTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLJdbcTransactionIT.java
index 6356ddfc720..f6a3e32c076 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLJdbcTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLJdbcTransactionIT.java
@@ -54,7 +54,7 @@ public final class PostgreSQLJdbcTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLProxyTransactionIT.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLProxyTransactionIT.java
index 43bb20d20af..3089d116681 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLProxyTransactionIT.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/postgresql/PostgreSQLProxyTransactionIT.java
@@ -70,7 +70,7 @@ public final class PostgreSQLProxyTransactionIT extends
BaseTransactionITCase {
@SneakyThrows(SQLException.class)
public void after() {
getDataSource().close();
- getComposedContainer().close();
+ getContainerComposer().close();
}
@Test
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseContainerComposer.java
similarity index 93%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseComposedContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseContainerComposer.java
index ed6d6ec2134..03642a4d3c2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/BaseContainerComposer.java
@@ -21,12 +21,12 @@ import lombok.Getter;
import
org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
import org.testcontainers.lifecycle.Startable;
-public abstract class BaseComposedContainer implements Startable {
+public abstract class BaseContainerComposer implements Startable {
@Getter
private final ITContainers containers;
- public BaseComposedContainer() {
+ public BaseContainerComposer() {
this.containers = new ITContainers("");
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerComposedContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
index a8a2386a606..b69075a3126 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/DockerContainerComposer.java
@@ -41,7 +41,7 @@ import java.util.Objects;
*/
@Slf4j
@Getter
-public final class DockerComposedContainer extends BaseComposedContainer {
+public final class DockerContainerComposer extends BaseContainerComposer {
private final DatabaseType databaseType;
@@ -53,7 +53,7 @@ public final class DockerComposedContainer extends
BaseComposedContainer {
private final DockerStorageContainer storageContainer;
- public DockerComposedContainer(final TransactionParameterized
parameterized) {
+ public DockerContainerComposer(final TransactionParameterized
parameterized) {
this.databaseType = parameterized.getDatabaseType();
governanceContainer = getContainers().registerContainer(new
ZookeeperContainer());
storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType,
parameterized.getDockerImageName(), "",
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeContainerComposer.java
similarity index 91%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeComposedContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeContainerComposer.java
index 702892d50e2..20b6653789a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/compose/NativeContainerComposer.java
@@ -23,11 +23,11 @@ import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironm
/**
* Native composed container, you need start ShardingSphere-Proxy at firstly.
*/
-public final class NativeComposedContainer extends BaseComposedContainer {
+public final class NativeContainerComposer extends BaseContainerComposer {
private final DatabaseType databaseType;
- public NativeComposedContainer(final DatabaseType databaseType) {
+ public NativeContainerComposer(final DatabaseType databaseType) {
this.databaseType = databaseType;
}
