This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 8d459a8e547 Refactor : rename the container management (#20785)
8d459a8e547 is described below
commit 8d459a8e54714ccbbeaa706f48ac04dbf040dd07
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Mon Sep 5 13:32:38 2022 +0800
Refactor : rename the container management (#20785)
---
.../test/integration/ha/cases/base/BaseITCase.java | 16 ++++++++--------
...ComposedContainer.java => BaseContainerComposer.java} | 4 ++--
...mposedContainer.java => DockerContainerComposer.java} | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
index 6f2a5c60926..20a2cce64ef 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/cases/base/BaseITCase.java
@@ -30,8 +30,8 @@ import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.D
import
org.apache.shardingsphere.test.integration.env.container.atomic.util.DatabaseTypeUtil;
import
org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.integration.ha.env.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.integration.ha.framework.container.compose.BaseComposedContainer;
-import
org.apache.shardingsphere.test.integration.ha.framework.container.compose.DockerComposedContainer;
+import
org.apache.shardingsphere.test.integration.ha.framework.container.compose.BaseContainerComposer;
+import
org.apache.shardingsphere.test.integration.ha.framework.container.compose.DockerContainerComposer;
import
org.apache.shardingsphere.test.integration.ha.framework.parameter.HAParameterized;
import javax.sql.DataSource;
@@ -51,7 +51,7 @@ public abstract class BaseITCase {
protected static final String DEFAULT_SCHEMA = "ha_test";
- private final BaseComposedContainer composedContainer;
+ private final BaseContainerComposer containerComposer;
private final DatabaseType databaseType;
@@ -61,21 +61,21 @@ public abstract class BaseITCase {
public BaseITCase(final HAParameterized haParameterized) {
databaseType = haParameterized.getDatabaseType();
- composedContainer = new
DockerComposedContainer(haParameterized.getScenario(),
haParameterized.getDatabaseType(), haParameterized.getDockerImageName());
- composedContainer.start();
+ containerComposer = new
DockerContainerComposer(haParameterized.getScenario(),
haParameterized.getDatabaseType(), haParameterized.getDockerImageName());
+ containerComposer.start();
initStorageDataSources();
initProxyDataSource();
}
private void initProxyDataSource() {
String databaseName = (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) ? "postgres" : "";
- ShardingSphereProxyClusterContainer proxyContainer =
((DockerComposedContainer) composedContainer).getProxyContainer();
+ ShardingSphereProxyClusterContainer proxyContainer =
((DockerContainerComposer) containerComposer).getProxyContainer();
this.proxyDataSource =
getDataSource(DataSourceEnvironment.getURL(databaseType,
proxyContainer.getHost(), proxyContainer.getFirstMappedPort(),
- composedContainer.getProxyJdbcUrl(databaseName)),
ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
+ containerComposer.getProxyJdbcUrl(databaseName)),
ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
}
private void initStorageDataSources() {
- List<DockerStorageContainer> storageContainers =
((DockerComposedContainer) composedContainer).getStorageContainers();
+ List<DockerStorageContainer> storageContainers =
((DockerContainerComposer) containerComposer).getStorageContainers();
this.storageDataSources = storageContainers.stream()
.map(storageContainer ->
DataSourceEnvironment.getURL(getDatabaseType(),
storageContainer.getNetworkAliases().get(0), storageContainer.getPort(),
DEFAULT_SCHEMA))
.map(jdbcUrl -> getDataSource(jdbcUrl,
StorageContainerConstants.USERNAME, StorageContainerConstants.PASSWORD))
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseContainerComposer.java
similarity index 93%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseComposedContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseContainerComposer.java
index f3e19d6ecfb..417fb38f509 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/BaseContainerComposer.java
@@ -24,14 +24,14 @@ import org.testcontainers.lifecycle.Startable;
/**
* Abstract composed container.
*/
-public abstract class BaseComposedContainer implements Startable {
+public abstract class BaseContainerComposer implements Startable {
@Getter
private final ITContainers containers;
private final String scenario;
- public BaseComposedContainer(final String scenario) {
+ public BaseContainerComposer(final String scenario) {
this.scenario = scenario;
this.containers = new ITContainers(scenario);
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
similarity index 97%
rename from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerComposedContainer.java
rename to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
index d28600cfaa5..4993c83d15c 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/compose/DockerContainerComposer.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Getter
-public final class DockerComposedContainer extends BaseComposedContainer {
+public final class DockerContainerComposer extends BaseContainerComposer {
private final DatabaseType databaseType;
@@ -55,7 +55,7 @@ public final class DockerComposedContainer extends
BaseComposedContainer {
@Getter
private final GovernanceContainer governanceContainer;
- public DockerComposedContainer(final String scenario, final DatabaseType
databaseType, final String dockerImageName) {
+ public DockerContainerComposer(final String scenario, final DatabaseType
databaseType, final String dockerImageName) {
super("");
this.databaseType = databaseType;
this.storageContainers = new LinkedList<>();
