You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/09/06 23:32:55 UTC
[shardingsphere] branch master updated: Refactor : rename the container manager as composer (#20816)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 886faf8d82d Refactor : rename the container manager as composer (#20816)
886faf8d82d is described below
commit 886faf8d82df6ce29a883e2476b4ad5462df93fa
Author: 孙念君 Nianjun Sun <su...@sphere-ex.com>
AuthorDate: Wed Sep 7 07:32:36 2022 +0800
Refactor : rename the container manager as composer (#20816)
---
.../data/pipeline/cases/base/BaseITCase.java | 26 ++++++++---------
...edContainer.java => BaseContainerComposer.java} | 4 +--
...Container.java => DockerContainerComposer.java} | 4 +--
...Container.java => NativeContainerComposer.java} | 4 +--
.../pipeline/framework/watcher/ScalingWatcher.java | 18 ++++++------
...mposedContainer.java => ContainerComposer.java} | 2 +-
...egistry.java => ContainerComposerRegistry.java} | 34 +++++++++++-----------
...ontainer.java => ClusterContainerComposer.java} | 6 ++--
...ainer.java => StandaloneContainerComposer.java} | 6 ++--
.../test/integration/engine/BaseITCase.java | 20 ++++++-------
10 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index cded9b3f17f..9657400c34e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -28,9 +28,9 @@ import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.integration.data.pipeline.cases.command.ExtraSQLCommand;
import org.apache.shardingsphere.integration.data.pipeline.env.IntegrationTestEnvironment;
import org.apache.shardingsphere.integration.data.pipeline.env.enums.ITEnvTypeEnum;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseComposedContainer;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerComposedContainer;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeComposedContainer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseContainerComposer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerContainerComposer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeContainerComposer;
import org.apache.shardingsphere.integration.data.pipeline.framework.param.ScalingParameterized;
import org.apache.shardingsphere.integration.data.pipeline.framework.watcher.ScalingWatcher;
import org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
@@ -87,7 +87,7 @@ public abstract class BaseITCase {
@Getter(AccessLevel.NONE)
public ScalingWatcher scalingWatcher;
- private final BaseComposedContainer composedContainer;
+ private final BaseContainerComposer containerComposer;
private final ExtraSQLCommand extraSQLCommand;
@@ -107,13 +107,13 @@ public abstract class BaseITCase {
public BaseITCase(final ScalingParameterized parameterized) {
databaseType = parameterized.getDatabaseType();
if (ENV.getItEnvType() == ITEnvTypeEnum.DOCKER) {
- composedContainer = new DockerComposedContainer(parameterized.getDatabaseType(), parameterized.getDockerImageName());
+ containerComposer = new DockerContainerComposer(parameterized.getDatabaseType(), parameterized.getDockerImageName());
} else {
- composedContainer = new NativeComposedContainer(parameterized.getDatabaseType());
+ containerComposer = new NativeContainerComposer(parameterized.getDatabaseType());
}
- composedContainer.start();
+ containerComposer.start();
if (ENV.getItEnvType() == ITEnvTypeEnum.DOCKER) {
- DockerStorageContainer storageContainer = ((DockerComposedContainer) composedContainer).getStorageContainer();
+ DockerStorageContainer storageContainer = ((DockerContainerComposer) containerComposer).getStorageContainer();
username = storageContainer.getUsername();
password = storageContainer.getPassword();
} else {
@@ -125,12 +125,12 @@ public abstract class BaseITCase {
cleanUpDataSource();
}
extraSQLCommand = JAXB.unmarshal(Objects.requireNonNull(BaseITCase.class.getClassLoader().getResource(parameterized.getScenario())), ExtraSQLCommand.class);
- scalingWatcher = new ScalingWatcher(composedContainer);
+ scalingWatcher = new ScalingWatcher(containerComposer);
}
private void cleanUpDataSource() {
for (String each : Arrays.asList(DS_0, DS_2, DS_3, DS_4)) {
- composedContainer.cleanUpDatabase(each);
+ containerComposer.cleanUpDatabase(each);
}
}
@@ -139,7 +139,7 @@ public abstract class BaseITCase {
if (DatabaseTypeUtil.isPostgreSQL(databaseType) || DatabaseTypeUtil.isOpenGauss(databaseType)) {
defaultDatabaseName = "postgres";
}
- String jdbcUrl = composedContainer.getProxyJdbcUrl(defaultDatabaseName);
+ String jdbcUrl = containerComposer.getProxyJdbcUrl(defaultDatabaseName);
try (Connection connection = DriverManager.getConnection(jdbcUrl, ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)) {
if (ENV.getItEnvType() == ITEnvTypeEnum.NATIVE) {
try {
@@ -153,7 +153,7 @@ public abstract class BaseITCase {
throw new IllegalStateException(ex);
}
sourceDataSource = getDataSource(getActualJdbcUrlTemplate(DS_0, false), username, password);
- proxyDataSource = getDataSource(composedContainer.getProxyJdbcUrl(PROXY_DATABASE), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
+ proxyDataSource = getDataSource(containerComposer.getProxyJdbcUrl(PROXY_DATABASE), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
}
private DataSource getDataSource(final String jdbcUrl, final String username, final String password) {
@@ -173,7 +173,7 @@ public abstract class BaseITCase {
protected String getActualJdbcUrlTemplate(final String databaseName, final boolean isInContainer) {
if (ITEnvTypeEnum.DOCKER == ENV.getItEnvType()) {
- DockerStorageContainer storageContainer = ((DockerComposedContainer) composedContainer).getStorageContainer();
+ DockerStorageContainer storageContainer = ((DockerContainerComposer) containerComposer).getStorageContainer();
if (isInContainer) {
return DataSourceEnvironment.getURL(getDatabaseType(), getDatabaseType().getType().toLowerCase() + ".host", storageContainer.getExposedPort(), databaseName);
} else {
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseContainerComposer.java
similarity index 94%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseContainerComposer.java
index d267cbdd0d5..f9c1f0045a7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/BaseContainerComposer.java
@@ -22,11 +22,11 @@ import org.apache.shardingsphere.test.integration.env.container.atomic.ITContain
import org.testcontainers.lifecycle.Startable;
@Getter
-public abstract class BaseComposedContainer implements Startable {
+public abstract class BaseContainerComposer implements Startable {
private final ITContainers containers;
- public BaseComposedContainer() {
+ public BaseContainerComposer() {
containers = new ITContainers("");
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
similarity index 96%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 79cc4b7bc39..310d7f807a7 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.test.integration.env.runtime.DataSourceEnvironm
/**
* Composed container, include governance container and database container.
*/
-public final class DockerComposedContainer extends BaseComposedContainer {
+public final class DockerContainerComposer extends BaseContainerComposer {
private final DatabaseType databaseType;
@@ -45,7 +45,7 @@ public final class DockerComposedContainer extends BaseComposedContainer {
@Getter
private final GovernanceContainer governanceContainer;
- public DockerComposedContainer(final DatabaseType databaseType, final String dockerImageName) {
+ public DockerContainerComposer(final DatabaseType databaseType, final String dockerImageName) {
this.databaseType = databaseType;
governanceContainer = getContainers().registerContainer(new ZookeeperContainer());
storageContainer = getContainers().registerContainer((DockerStorageContainer) StorageContainerFactory.newInstance(databaseType, dockerImageName,
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeContainerComposer.java
similarity index 97%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeContainerComposer.java
index c3bdb5f38c5..18763e911ee 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/NativeContainerComposer.java
@@ -34,7 +34,7 @@ import java.util.Properties;
/**
* Native composed container, you need start ShardingSphere-Proxy at firstly.
*/
-public final class NativeComposedContainer extends BaseComposedContainer {
+public final class NativeContainerComposer extends BaseContainerComposer {
private static final IntegrationTestEnvironment ENV = IntegrationTestEnvironment.getInstance();
@@ -42,7 +42,7 @@ public final class NativeComposedContainer extends BaseComposedContainer {
private final DatabaseType databaseType;
- public NativeComposedContainer(final DatabaseType databaseType) {
+ public NativeContainerComposer(final DatabaseType databaseType) {
this.databaseType = databaseType;
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
index cdfb42db14e..63050fda31b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/watcher/ScalingWatcher.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.integration.data.pipeline.framework.watcher;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseComposedContainer;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerComposedContainer;
-import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeComposedContainer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.BaseContainerComposer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.DockerContainerComposer;
+import org.apache.shardingsphere.integration.data.pipeline.framework.container.compose.NativeContainerComposer;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.CuratorZookeeperRepository;
@@ -38,11 +38,11 @@ import java.util.Properties;
@Slf4j
public class ScalingWatcher extends TestWatcher {
- private final BaseComposedContainer composedContainer;
+ private final BaseContainerComposer containerComposer;
@Override
protected void failed(final Throwable e, final Description description) {
- if (composedContainer instanceof NativeComposedContainer) {
+ if (containerComposer instanceof NativeContainerComposer) {
super.failed(e, description);
return;
}
@@ -50,11 +50,11 @@ public class ScalingWatcher extends TestWatcher {
}
private void outputZookeeperData() {
- DockerComposedContainer dockerComposedContainer = (DockerComposedContainer) composedContainer;
- DatabaseType databaseType = dockerComposedContainer.getStorageContainer().getDatabaseType();
+ DockerContainerComposer dockerContainerComposer = (DockerContainerComposer) containerComposer;
+ DatabaseType databaseType = dockerContainerComposer.getStorageContainer().getDatabaseType();
String namespace = "it_db_" + databaseType.getType().toLowerCase();
ClusterPersistRepositoryConfiguration config = new ClusterPersistRepositoryConfiguration("ZooKeeper", namespace,
- dockerComposedContainer.getGovernanceContainer().getServerLists(), new Properties());
+ dockerContainerComposer.getGovernanceContainer().getServerLists(), new Properties());
ClusterPersistRepository zookeeperRepository = new CuratorZookeeperRepository();
zookeeperRepository.init(config);
List<String> childrenKeys = zookeeperRepository.getChildrenKeys("/");
@@ -80,6 +80,6 @@ public class ScalingWatcher extends TestWatcher {
@Override
protected void finished(final Description description) {
- composedContainer.close();
+ containerComposer.close();
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposer.java
similarity index 96%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposer.java
index e9140cc285d..685b76f9029 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposer.java
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* Composed container.
*/
-public interface ComposedContainer extends Startable {
+public interface ContainerComposer extends Startable {
/**
* Get target data source.
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainerRegistry.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
similarity index 73%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainerRegistry.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
index b9d4293e6cc..42251d04d63 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ComposedContainerRegistry.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/ContainerComposerRegistry.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.test.integration.container.compose;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.integration.container.compose.mode.ClusterComposedContainer;
-import org.apache.shardingsphere.test.integration.container.compose.mode.StandaloneComposedContainer;
+import org.apache.shardingsphere.test.integration.container.compose.mode.ClusterContainerComposer;
+import org.apache.shardingsphere.test.integration.container.compose.mode.StandaloneContainerComposer;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import javax.sql.DataSource;
@@ -29,9 +29,9 @@ import java.util.Map;
/**
* Composed container registry.
*/
-public final class ComposedContainerRegistry implements AutoCloseable {
+public final class ContainerComposerRegistry implements AutoCloseable {
- private final Map<String, ComposedContainer> composedContainers = new HashMap<>();
+ private final Map<String, ContainerComposer> containerComposers = new HashMap<>();
/**
* Get composed container.
@@ -39,21 +39,21 @@ public final class ComposedContainerRegistry implements AutoCloseable {
* @param parameterizedArray parameterized array
* @return composed container
*/
- public ComposedContainer getComposedContainer(final ParameterizedArray parameterizedArray) {
+ public ContainerComposer getContainerComposer(final ParameterizedArray parameterizedArray) {
String key = parameterizedArray.getKey();
- if (composedContainers.containsKey(key)) {
- return composedContainers.get(key);
+ if (containerComposers.containsKey(key)) {
+ return containerComposers.get(key);
}
- synchronized (composedContainers) {
- if (!composedContainers.containsKey(key)) {
- composedContainers.put(key, createComposedContainer(parameterizedArray));
+ synchronized (containerComposers) {
+ if (!containerComposers.containsKey(key)) {
+ containerComposers.put(key, createContainerComposer(parameterizedArray));
}
- return composedContainers.get(key);
+ return containerComposers.get(key);
}
}
- private ComposedContainer createComposedContainer(final ParameterizedArray parameterizedArray) {
- return isClusterMode(parameterizedArray) ? new ClusterComposedContainer(parameterizedArray) : new StandaloneComposedContainer(parameterizedArray);
+ private ContainerComposer createContainerComposer(final ParameterizedArray parameterizedArray) {
+ return isClusterMode(parameterizedArray) ? new ClusterContainerComposer(parameterizedArray) : new StandaloneContainerComposer(parameterizedArray);
}
private boolean isClusterMode(final ParameterizedArray parameterizedArray) {
@@ -63,12 +63,12 @@ public final class ComposedContainerRegistry implements AutoCloseable {
@Override
public void close() {
- for (ComposedContainer each : composedContainers.values()) {
+ for (ContainerComposer each : containerComposers.values()) {
closeTargetDataSource(each.getTargetDataSource());
closeActualDataSourceMap(each.getActualDataSourceMap());
closeContainer(each);
}
- composedContainers.clear();
+ containerComposers.clear();
}
@SneakyThrows
@@ -87,7 +87,7 @@ public final class ComposedContainerRegistry implements AutoCloseable {
}
}
- private void closeContainer(final ComposedContainer composedContainer) {
- composedContainer.close();
+ private void closeContainer(final ContainerComposer containerComposer) {
+ containerComposer.close();
}
}
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
similarity index 96%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
index c198309ebf7..97aa28e223e 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.container.compose.mode;
-import org.apache.shardingsphere.test.integration.container.compose.ComposedContainer;
+import org.apache.shardingsphere.test.integration.container.compose.ContainerComposer;
import org.apache.shardingsphere.test.integration.container.config.ProxyClusterContainerConfigurationFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
import org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
@@ -37,7 +37,7 @@ import java.util.Map;
/**
* Cluster composed container.
*/
-public final class ClusterComposedContainer implements ComposedContainer {
+public final class ClusterContainerComposer implements ContainerComposer {
private final ITContainers containers;
@@ -47,7 +47,7 @@ public final class ClusterComposedContainer implements ComposedContainer {
private final AdapterContainer adapterContainer;
- public ClusterComposedContainer(final ParameterizedArray parameterizedArray) {
+ public ClusterContainerComposer(final ParameterizedArray parameterizedArray) {
String scenario = parameterizedArray.getScenario();
containers = new ITContainers(scenario);
// TODO support other types of governance
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
similarity index 95%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
index 0a223fa380e..50c40faeaf1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneComposedContainer.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/StandaloneContainerComposer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.integration.container.compose.mode;
-import org.apache.shardingsphere.test.integration.container.compose.ComposedContainer;
+import org.apache.shardingsphere.test.integration.container.compose.ContainerComposer;
import org.apache.shardingsphere.test.integration.container.config.ProxyStandaloneContainerConfigurationFactory;
import org.apache.shardingsphere.test.integration.env.container.atomic.DockerITContainer;
import org.apache.shardingsphere.test.integration.env.container.atomic.ITContainers;
@@ -34,7 +34,7 @@ import java.util.Map;
/**
* Standalone composed container.
*/
-public final class StandaloneComposedContainer implements ComposedContainer {
+public final class StandaloneContainerComposer implements ContainerComposer {
private final ITContainers containers;
@@ -42,7 +42,7 @@ public final class StandaloneComposedContainer implements ComposedContainer {
private final AdapterContainer adapterContainer;
- public StandaloneComposedContainer(final ParameterizedArray parameterizedArray) {
+ public StandaloneContainerComposer(final ParameterizedArray parameterizedArray) {
String scenario = parameterizedArray.getScenario();
containers = new ITContainers(scenario);
// TODO add more version of databases
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
index 43a0f66a845..f72b82f03e3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/BaseITCase.java
@@ -21,8 +21,8 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.test.integration.cases.assertion.IntegrationTestCase;
-import org.apache.shardingsphere.test.integration.container.compose.ComposedContainer;
-import org.apache.shardingsphere.test.integration.container.compose.ComposedContainerRegistry;
+import org.apache.shardingsphere.test.integration.container.compose.ContainerComposer;
+import org.apache.shardingsphere.test.integration.container.compose.ContainerComposerRegistry;
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import org.apache.shardingsphere.test.integration.framework.runner.ShardingSphereIntegrationTestParameterized;
import org.junit.AfterClass;
@@ -39,7 +39,7 @@ public abstract class BaseITCase {
public static final String NOT_VERIFY_FLAG = "NOT_VERIFY";
- private static final ComposedContainerRegistry COMPOSED_CONTAINER_REGISTRY = new ComposedContainerRegistry();
+ private static final ContainerComposerRegistry CONTAINER_COMPOSER_REGISTRY = new ContainerComposerRegistry();
private static final int TOTAL_SUITES_COUNT = TotalSuitesCountCalculator.calculate();
@@ -56,7 +56,7 @@ public abstract class BaseITCase {
private final IntegrationTestCase itCase;
@Getter(AccessLevel.NONE)
- private final ComposedContainer composedContainer;
+ private final ContainerComposer containerComposer;
private Map<String, DataSource> actualDataSourceMap;
@@ -70,21 +70,21 @@ public abstract class BaseITCase {
databaseType = parameterizedArray.getDatabaseType();
itKey = parameterizedArray.getKey();
itCase = parameterizedArray.getTestCaseContext().getTestCase();
- composedContainer = COMPOSED_CONTAINER_REGISTRY.getComposedContainer(parameterizedArray);
+ containerComposer = CONTAINER_COMPOSER_REGISTRY.getContainerComposer(parameterizedArray);
}
@Before
public void setUp() {
- composedContainer.start();
- actualDataSourceMap = composedContainer.getActualDataSourceMap();
- targetDataSource = composedContainer.getTargetDataSource();
- expectedDataSourceMap = composedContainer.getExpectedDataSourceMap();
+ containerComposer.start();
+ actualDataSourceMap = containerComposer.getActualDataSourceMap();
+ targetDataSource = containerComposer.getTargetDataSource();
+ expectedDataSourceMap = containerComposer.getExpectedDataSourceMap();
}
@AfterClass
public static void closeContainers() {
if (COMPLETED_SUITES_COUNT.incrementAndGet() == TOTAL_SUITES_COUNT) {
- COMPOSED_CONTAINER_REGISTRY.close();
+ CONTAINER_COMPOSER_REGISTRY.close();
}
}
}