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 96121cd5057 Rename E2EContainers (#36659)
96121cd5057 is described below
commit 96121cd5057a06264c6eab909978147fe16275d7
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Sep 21 23:36:31 2025 +0800
Rename E2EContainers (#36659)
---
.../ShardingSphereJdbcAgentContainer.java | 4 ++--
.../plugin/AgentPluginContainerFactory.java | 4 ++--
.../plugin/AgentPluginHTTPEndpointProvider.java | 4 ++--
.../agent/engine/env/AgentE2ETestEnvironment.java | 16 ++++++-------
.../metrics/container/PrometheusContainer.java | 4 ++--
.../container/PrometheusContainerFactory.java | 4 ++--
.../agent/jaeger/container/JaegerContainer.java | 4 ++--
.../jaeger/container/JaegerContainerFactory.java | 4 ++--
.../agent/zipkin/container/ZipkinContainer.java | 4 ++--
.../zipkin/container/ZipkinContainerFactory.java | 4 ++--
...omboITContainer.java => ComboE2EContainer.java} | 6 ++---
...kerITContainer.java => DockerE2EContainer.java} | 8 +++----
.../{ITContainer.java => E2EContainer.java} | 4 ++--
.../{ITContainers.java => E2EContainers.java} | 26 +++++++++++-----------
...dITContainer.java => EmbeddedE2EContainer.java} | 4 ++--
.../env/container/adapter/AdapterContainer.java | 4 ++--
.../impl/ShardingSphereJdbcEmbeddedContainer.java | 4 ++--
.../impl/ShardingSphereProxyDockerContainer.java | 4 ++--
.../impl/ShardingSphereProxyEmbeddedContainer.java | 4 ++--
.../container/governance/GovernanceContainer.java | 4 ++--
.../env/container/storage/StorageContainer.java | 4 ++--
.../storage/type/DockerStorageContainer.java | 4 ++--
.../compose/PipelineBaseContainerComposer.java | 6 ++---
.../ClusterShowProcessListContainerComposer.java | 14 ++++++------
.../compose/TransactionBaseContainerComposer.java | 6 ++---
.../TransactionDockerContainerComposer.java | 6 ++---
.../compose/mode/ClusterContainerComposer.java | 12 +++++-----
.../compose/mode/StandaloneContainerComposer.java | 12 +++++-----
28 files changed, 92 insertions(+), 92 deletions(-)
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
index 79e4f448823..d0ae7ad74ae 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.agent.engine.container;
import com.google.common.base.Strings;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -30,7 +30,7 @@ import java.util.function.Consumer;
/**
* ShardingSphere jdbc container.
*/
-public final class ShardingSphereJdbcAgentContainer extends DockerITContainer {
+public final class ShardingSphereJdbcAgentContainer extends DockerE2EContainer
{
private static final String CONFIG_PATH_IN_CONTAINER =
"/opt/shardingsphere-jdbc-app/";
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginContainerFactory.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginContainerFactory.java
index 69ebec1ce39..c6b7a63a2b0 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginContainerFactory.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginContainerFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.agent.engine.container.plugin;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
/**
* Agent plugin container factory.
@@ -32,5 +32,5 @@ public interface AgentPluginContainerFactory extends TypedSPI
{
*
* @return created container
*/
- DockerITContainer create();
+ DockerE2EContainer create();
}
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginHTTPEndpointProvider.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginHTTPEndpointProvider.java
index a365e45cc95..7d0b9718ced 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginHTTPEndpointProvider.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/plugin/AgentPluginHTTPEndpointProvider.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.engine.container.plugin;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
/**
* Agent plugin HTTP endpoint provider.
@@ -31,7 +31,7 @@ public final class AgentPluginHTTPEndpointProvider {
* @param defaultExposePort default expose port
* @return HTTP URL
*/
- public String getHURL(final DockerITContainer container, final int
defaultExposePort) {
+ public String getHURL(final DockerE2EContainer container, final int
defaultExposePort) {
return String.format("http://%s:%s";, container.getHost(),
container.getMappedPort(defaultExposePort));
}
}
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index f925b9d56e8..c46b631fa0f 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -31,8 +31,8 @@ import
org.apache.shardingsphere.test.e2e.agent.engine.container.plugin.AgentPlu
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestImageConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.fixture.proxy.ProxyRequestExecutor;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyDockerContainer;
@@ -73,7 +73,7 @@ public final class AgentE2ETestEnvironment {
@Getter
private final Collection<String> containerLogs = new LinkedList<>();
- private ITContainers containers;
+ private E2EContainers containers;
@Getter
private String agentPluginURL;
@@ -99,7 +99,7 @@ public final class AgentE2ETestEnvironment {
return;
}
StorageContainerOption storageContainerOption =
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType);
- Optional<DockerITContainer> agentPluginContainer =
TypedSPILoader.findService(AgentPluginContainerFactory.class,
testConfig.getPluginType()).map(AgentPluginContainerFactory::create);
+ Optional<DockerE2EContainer> agentPluginContainer =
TypedSPILoader.findService(AgentPluginContainerFactory.class,
testConfig.getPluginType()).map(AgentPluginContainerFactory::create);
if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
createProxyEnvironment(storageContainerOption,
agentPluginContainer.orElse(null));
} else if
(AdapterType.JDBC.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
@@ -114,8 +114,8 @@ public final class AgentE2ETestEnvironment {
initialized = true;
}
- private void createProxyEnvironment(final StorageContainerOption
storageContainerOption, final DockerITContainer agentPluginContainer) {
- containers = new ITContainers(null);
+ private void createProxyEnvironment(final StorageContainerOption
storageContainerOption, final DockerE2EContainer agentPluginContainer) {
+ containers = new E2EContainers(null);
ShardingSphereProxyDockerContainer proxyContainer = new
ShardingSphereProxyDockerContainer(databaseType,
getAdaptorContainerConfiguration());
proxyContainer.withLogConsumer(testConfig.isLogEnabled() ?
this::collectLogs : null);
StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(), storageContainerOption,
null);
@@ -147,8 +147,8 @@ public final class AgentE2ETestEnvironment {
return new AdaptorContainerConfiguration("sharding_db",
Collections.emptyList(), mountedResources, imageConfig.getProxyImage(), "");
}
- private void createJDBCEnvironment(final StorageContainerOption
storageContainerOption, final DockerITContainer agentPluginContainer) {
- containers = new ITContainers(null);
+ private void createJDBCEnvironment(final StorageContainerOption
storageContainerOption, final DockerE2EContainer agentPluginContainer) {
+ containers = new E2EContainers(null);
StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(), storageContainerOption,
null);
ShardingSphereJdbcAgentContainer jdbcAgentContainer = new
ShardingSphereJdbcAgentContainer(
imageConfig.getJdbcProjectImage(), testConfig.getPluginType(),
testConfig.isLogEnabled() ? this::collectLogs : null);
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
index e7714714e71..c959819bc7b 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
@@ -18,14 +18,14 @@
package org.apache.shardingsphere.test.e2e.agent.metrics.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
/**
* Prometheus container.
*/
-public final class PrometheusContainer extends DockerITContainer {
+public final class PrometheusContainer extends DockerE2EContainer {
public PrometheusContainer(final String image) {
super("prometheus", image);
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
index 62ea3e30a19..9c3eb11b51c 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.agent.metrics.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.container.plugin.AgentPluginContainerFactory;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
/**
* Prometheus container factory.
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
public final class PrometheusContainerFactory implements
AgentPluginContainerFactory {
@Override
- public DockerITContainer create() {
+ public DockerE2EContainer create() {
return new
PrometheusContainer(AgentE2ETestConfiguration.getInstance().getPluginImageName());
}
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
index 0202d68a719..7389ee8a022 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
import java.util.Collections;
@@ -27,7 +27,7 @@ import java.util.Map;
/**
* Jaeger container.
*/
-public final class JaegerContainer extends DockerITContainer {
+public final class JaegerContainer extends DockerE2EContainer {
public JaegerContainer(final String image) {
super("jaeger", image);
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
index 215ddf3a181..f7a819d00cb 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.agent.jaeger.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.container.plugin.AgentPluginContainerFactory;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
/**
* Jaeger container factory.
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
public final class JaegerContainerFactory implements
AgentPluginContainerFactory {
@Override
- public DockerITContainer create() {
+ public DockerE2EContainer create() {
return new
JaegerContainer(AgentE2ETestConfiguration.getInstance().getPluginImageName());
}
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
index 63c734597b4..1826a86dc3f 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-public final class ZipkinContainer extends DockerITContainer {
+public final class ZipkinContainer extends DockerE2EContainer {
public ZipkinContainer(final String image) {
super("zipkin", image);
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
index 588fcf8c9fa..9a5ffe7e8fe 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.agent.zipkin.container;
import
org.apache.shardingsphere.test.e2e.agent.engine.container.plugin.AgentPluginContainerFactory;
import
org.apache.shardingsphere.test.e2e.agent.engine.env.props.AgentE2ETestConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
/**
* Zipkin container factory.
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
public final class ZipkinContainerFactory implements
AgentPluginContainerFactory {
@Override
- public DockerITContainer create() {
+ public DockerE2EContainer create() {
return new
ZipkinContainer(AgentE2ETestConfiguration.getInstance().getPluginImageName());
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboE2EContainer.java
similarity index 88%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboE2EContainer.java
index 5e5c6d23e7f..2a37c78b4f2 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboE2EContainer.java
@@ -20,14 +20,14 @@ package org.apache.shardingsphere.test.e2e.env.container;
import java.util.Collection;
/**
- * Combo IT container.
+ * Combo E2E container.
*/
-public interface ComboITContainer extends ITContainer {
+public interface ComboE2EContainer extends E2EContainer {
/**
* Get containers.
*
* @return containers
*/
- Collection<ITContainer> getContainers();
+ Collection<E2EContainer> getContainers();
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerE2EContainer.java
similarity index 87%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerE2EContainer.java
index 599dd1f5107..b788f66cc69 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerE2EContainer.java
@@ -33,16 +33,16 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * Docker IT container.
+ * Docker E2E container.
*/
@Getter
@Setter
@Slf4j
-public abstract class DockerITContainer extends
GenericContainer<DockerITContainer> implements ITContainer {
+public abstract class DockerE2EContainer extends
GenericContainer<DockerE2EContainer> implements E2EContainer {
private String name;
- protected DockerITContainer(final String name, final String
containerImage) {
+ protected DockerE2EContainer(final String name, final String
containerImage) {
super(new RemoteDockerImage(DockerImageName.parse(containerImage)));
this.name = name;
}
@@ -59,7 +59,7 @@ public abstract class DockerITContainer extends
GenericContainer<DockerITContain
}
private void startDependencies() {
- Collection<DockerITContainer> dependencies =
getDependencies().stream().filter(DockerITContainer.class::isInstance).map(DockerITContainer.class::cast).collect(Collectors.toList());
+ Collection<DockerE2EContainer> dependencies =
getDependencies().stream().filter(DockerE2EContainer.class::isInstance).map(DockerE2EContainer.class::cast).collect(Collectors.toList());
dependencies.stream().filter(each ->
!each.isCreated()).forEach(GenericContainer::start);
dependencies.stream()
.filter(each -> {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainer.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainer.java
index 6b51a2fba5b..6ff612779be 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainer.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.test.e2e.env.container;
import org.testcontainers.lifecycle.Startable;
/**
- * IT container.
+ * E2E container.
*/
-public interface ITContainer extends Startable {
+public interface E2EContainer extends Startable {
@Override
default void stop() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainers.java
similarity index 82%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainers.java
index b855f3950eb..5d124af5b52 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/E2EContainers.java
@@ -38,20 +38,20 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
- * IT containers.
+ * E2E containers.
*/
@RequiredArgsConstructor
@Slf4j
-public final class ITContainers implements Startable {
+public final class E2EContainers implements Startable {
private final String scenario;
@Getter
private final Network network = Network.newNetwork();
- private final Collection<EmbeddedITContainer> embeddedContainers = new
LinkedList<>();
+ private final Collection<EmbeddedE2EContainer> embeddedContainers = new
LinkedList<>();
- private final Collection<DockerITContainer> dockerContainers = new
LinkedList<>();
+ private final Collection<DockerE2EContainer> dockerContainers = new
LinkedList<>();
private volatile boolean started;
@@ -62,16 +62,16 @@ public final class ITContainers implements Startable {
* @param <T> type of container
* @return registered container
*/
- public <T extends ITContainer> T registerContainer(final T container) {
- if (container instanceof ComboITContainer) {
- ((ComboITContainer)
container).getContainers().forEach(this::registerContainer);
- } else if (container instanceof EmbeddedITContainer) {
- embeddedContainers.add((EmbeddedITContainer) container);
+ public <T extends E2EContainer> T registerContainer(final T container) {
+ if (container instanceof ComboE2EContainer) {
+ ((ComboE2EContainer)
container).getContainers().forEach(this::registerContainer);
+ } else if (container instanceof EmbeddedE2EContainer) {
+ embeddedContainers.add((EmbeddedE2EContainer) container);
} else if (container instanceof NativeStorageContainer) {
String networkAlias = getNetworkAlias(container);
((NativeStorageContainer)
container).setNetworkAliases(Collections.singletonList(networkAlias));
} else {
- DockerITContainer dockerContainer = (DockerITContainer) container;
+ DockerE2EContainer dockerContainer = (DockerE2EContainer)
container;
dockerContainer.setNetwork(network);
String networkAlias = getNetworkAlias(container);
dockerContainer.setNetworkAliases(Collections.singletonList(networkAlias));
@@ -82,7 +82,7 @@ public final class ITContainers implements Startable {
return container;
}
- private <T extends ITContainer> String getNetworkAlias(final T container) {
+ private <T extends E2EContainer> String getNetworkAlias(final T container)
{
return container instanceof GovernanceContainer ||
Strings.isNullOrEmpty(scenario)
? String.join(".", container.getAbbreviation(), "host")
: String.join(".", container.getAbbreviation(), scenario,
"host");
@@ -93,7 +93,7 @@ public final class ITContainers implements Startable {
if (!started) {
synchronized (this) {
if (!started) {
- embeddedContainers.forEach(EmbeddedITContainer::start);
+ embeddedContainers.forEach(EmbeddedE2EContainer::start);
dockerContainers.stream().filter(each ->
!each.isCreated()).forEach(this::start);
waitUntilReady();
started = true;
@@ -102,7 +102,7 @@ public final class ITContainers implements Startable {
}
}
- private void start(final DockerITContainer dockerITContainer) {
+ private void start(final DockerE2EContainer dockerITContainer) {
log.info("Starting container {}...", dockerITContainer.getName());
dockerITContainer.start();
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedE2EContainer.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedE2EContainer.java
index d09cedebed3..0ce6f1e2d86 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedE2EContainer.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.env.container;
/**
- * Embedded IT container.
+ * Embedded E2E container.
*/
-public interface EmbeddedITContainer extends ITContainer {
+public interface EmbeddedE2EContainer extends E2EContainer {
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
index 03ce658cd25..b55086c53d9 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.test.e2e.env.container.adapter;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainer;
import javax.sql.DataSource;
/**
* Adapter container.
*/
-public interface AdapterContainer extends ITContainer {
+public interface AdapterContainer extends E2EContainer {
/**
* Get target data source.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
index 7113c8d121e..f247973c450 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import com.zaxxer.hikari.HikariDataSource;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.e2e.env.container.EmbeddedITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.EmbeddedE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicReference;
* ShardingSphere JDBC embedded container.
*/
@RequiredArgsConstructor
-public final class ShardingSphereJdbcEmbeddedContainer implements
EmbeddedITContainer, AdapterContainer {
+public final class ShardingSphereJdbcEmbeddedContainer implements
EmbeddedE2EContainer, AdapterContainer {
private final StorageContainer storageContainer;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyDockerContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyDockerContainer.java
index de57170b22b..35d2f1113c1 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyDockerContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyDockerContainer.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import com.google.common.base.Strings;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicReference;
/**
* ShardingSphere proxy docker container.
*/
-public final class ShardingSphereProxyDockerContainer extends
DockerITContainer implements AdapterContainer {
+public final class ShardingSphereProxyDockerContainer extends
DockerE2EContainer implements AdapterContainer {
private final AdaptorContainerConfiguration config;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
index 45107d5e4fd..4ad433f1692 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.frontend.ShardingSphereProxy;
import org.apache.shardingsphere.proxy.frontend.ssl.ProxySSLContext;
import org.apache.shardingsphere.proxy.initializer.BootstrapInitializer;
-import org.apache.shardingsphere.test.e2e.env.container.EmbeddedITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.EmbeddedE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
@@ -72,7 +72,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
@Slf4j
// TODO Reset static properties when closing the class., like
PipelineAPIFactory#GOVERNANCE_FACADE_MAP
-public final class ShardingSphereProxyEmbeddedContainer implements
EmbeddedITContainer, AdapterContainer {
+public final class ShardingSphereProxyEmbeddedContainer implements
EmbeddedE2EContainer, AdapterContainer {
private static final String OS_MAC_TMP_DIR = "/tmp";
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
index 4643cc84996..c2538eee153 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.test.e2e.env.container.governance;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.option.GovernanceContainerOption;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
* Governance container.
*/
-public final class GovernanceContainer extends DockerITContainer {
+public final class GovernanceContainer extends DockerE2EContainer {
private final GovernanceContainerOption option;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
index 8e266d8862d..dbd4d31842d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.env.container.storage;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainer;
import javax.sql.DataSource;
import java.util.Map;
@@ -25,7 +25,7 @@ import java.util.Map;
/**
* Storage container.
*/
-public interface StorageContainer extends ITContainer {
+public interface StorageContainer extends E2EContainer {
/**
* Get actual data source map.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
index 6d788e7164e..8ce5e9f783d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
@@ -23,7 +23,7 @@ import com.google.common.base.Strings;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.mount.MountConfigurationResourceGenerator;
@@ -53,7 +53,7 @@ import java.util.stream.Collectors;
/**
* Docker storage container.
*/
-public final class DockerStorageContainer extends DockerITContainer implements
StorageContainer {
+public final class DockerStorageContainer extends DockerE2EContainer
implements StorageContainer {
private final StorageContainerOption option;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineBaseContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineBaseContainerComposer.java
index 88d23a1fba5..2bbdbb9ebdd 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineBaseContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/PipelineBaseContainerComposer.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.test.e2e.operation.pipeline.framework.container.compose;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import org.testcontainers.lifecycle.Startable;
/**
@@ -27,10 +27,10 @@ import org.testcontainers.lifecycle.Startable;
@Getter
public abstract class PipelineBaseContainerComposer implements Startable {
- private final ITContainers containers;
+ private final E2EContainers containers;
protected PipelineBaseContainerComposer() {
- containers = new ITContainers("");
+ containers = new E2EContainers("");
}
/**
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 64be9efdc02..7437ea18ce0 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.operation.showprocesslist.container.c
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
@@ -46,7 +46,7 @@ import java.util.Map;
*/
public final class ClusterShowProcessListContainerComposer implements
AutoCloseable {
- private final ITContainers containers;
+ private final E2EContainers containers;
private final GovernanceContainer governanceContainer;
@@ -55,7 +55,7 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
private final AdapterContainer proxyContainer;
public ClusterShowProcessListContainerComposer(final
ShowProcessListTestParameter testParam) {
- containers = new ITContainers(testParam.getScenario());
+ containers = new E2EContainers(testParam.getScenario());
governanceContainer = isClusterMode(testParam.getRunMode())
? containers.registerContainer(new
GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class,
"ZooKeeper")))
: null;
@@ -67,11 +67,11 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
String envType =
ShowProcessListEnvironment.getInstance().getItEnvType().name();
jdbcContainer = AdapterContainerFactory.newInstance(AdapterType.JDBC,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
proxyContainer =
AdapterContainerFactory.newInstance(AdapterType.PROXY,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
- if (proxyContainer instanceof DockerITContainer) {
+ if (proxyContainer instanceof DockerE2EContainer) {
if (isClusterMode(testParam.getRunMode())) {
- ((DockerITContainer)
proxyContainer).dependsOn(governanceContainer);
+ ((DockerE2EContainer)
proxyContainer).dependsOn(governanceContainer);
}
- ((DockerITContainer) proxyContainer).dependsOn(storageContainer);
+ ((DockerE2EContainer) proxyContainer).dependsOn(storageContainer);
}
containers.registerContainer(proxyContainer);
containers.registerContainer(jdbcContainer);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionBaseContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionBaseContainerComposer.java
index 084cd59568e..f9bccce9ca4 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionBaseContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionBaseContainerComposer.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.test.e2e.operation.transaction.framework.container.compose;
import lombok.Getter;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import org.testcontainers.lifecycle.Startable;
/**
@@ -27,10 +27,10 @@ import org.testcontainers.lifecycle.Startable;
@Getter
public abstract class TransactionBaseContainerComposer implements Startable {
- private final ITContainers containers;
+ private final E2EContainers containers;
protected TransactionBaseContainerComposer(final String scenario) {
- containers = new ITContainers(scenario);
+ containers = new E2EContainers(scenario);
}
@Override
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
index f663a17a818..19bb9fd5457 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
@@ -72,8 +72,8 @@ public final class TransactionDockerContainerComposer extends
TransactionBaseCon
jdbcContainer = null;
AdaptorContainerConfiguration containerConfig =
TransactionProxyContainerConfigurationFactory.newInstance(testParam.getScenario(),
databaseType, testParam.getPortBindings());
proxyContainer =
AdapterContainerFactory.newInstance(AdapterType.PROXY, databaseType,
testParam.getScenario(), containerConfig, storageContainer, envType.name());
- if (proxyContainer instanceof DockerITContainer) {
- ((DockerITContainer)
proxyContainer).dependsOn(governanceContainer, storageContainer);
+ if (proxyContainer instanceof DockerE2EContainer) {
+ ((DockerE2EContainer)
proxyContainer).dependsOn(governanceContainer, storageContainer);
}
if (proxyContainer instanceof
ShardingSphereProxyEmbeddedContainer) {
((ShardingSphereProxyEmbeddedContainer)
proxyContainer).dependsOn(governanceContainer, storageContainer);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index 0107f3f271c..c9f8d5cf87b 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
@@ -46,7 +46,7 @@ import java.util.Map;
*/
public final class ClusterContainerComposer implements ContainerComposer {
- private final ITContainers containers;
+ private final E2EContainers containers;
private final GovernanceContainer governanceContainer;
@@ -55,7 +55,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
private final AdapterContainer adapterContainer;
public ClusterContainerComposer(final String scenario, final DatabaseType
databaseType, final AdapterType adapterType) {
- containers = new ITContainers(scenario);
+ containers = new E2EContainers(scenario);
// TODO support other types of governance
governanceContainer = containers.registerContainer(new
GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class,
"ZooKeeper")));
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
@@ -65,8 +65,8 @@ public final class ClusterContainerComposer implements
ContainerComposer {
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterType, databaseType, scenario,
containerConfig, storageContainer, envType.name());
- if (adapterContainer instanceof DockerITContainer) {
- ((DockerITContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
+ if (adapterContainer instanceof DockerE2EContainer) {
+ ((DockerE2EContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
}
if (adapterContainer instanceof ShardingSphereProxyEmbeddedContainer) {
((ShardingSphereProxyEmbeddedContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index 9800edfdbc8..cd63be21844 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
+import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
@@ -42,14 +42,14 @@ import java.util.Map;
*/
public final class StandaloneContainerComposer implements ContainerComposer {
- private final ITContainers containers;
+ private final E2EContainers containers;
private final StorageContainer storageContainer;
private final AdapterContainer adapterContainer;
public StandaloneContainerComposer(final String scenario, final
DatabaseType databaseType, final AdapterType adapterType) {
- containers = new ITContainers(scenario);
+ containers = new E2EContainers(scenario);
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType),
@@ -57,8 +57,8 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterType, databaseType, scenario,
containerConfig, storageContainer, envType.name());
- if (adapterContainer instanceof DockerITContainer) {
- ((DockerITContainer) adapterContainer).dependsOn(storageContainer);
+ if (adapterContainer instanceof DockerE2EContainer) {
+ ((DockerE2EContainer)
adapterContainer).dependsOn(storageContainer);
}
this.adapterContainer = containers.registerContainer(adapterContainer);
}
