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 87a27666361 Move package of
org.apache.shardingsphere.test.e2e.env.container (#36620)
87a27666361 is described below
commit 87a27666361579da1ab990693dd5b8156599763a
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Sep 18 22:22:39 2025 +0800
Move package of org.apache.shardingsphere.test.e2e.env.container (#36620)
---
.../ShardingSphereJdbcAgentContainer.java | 2 +-
.../plugin/AgentPluginContainerFactory.java | 2 +-
.../plugin/AgentPluginHTTPEndpointProvider.java | 2 +-
.../agent/engine/env/AgentE2ETestEnvironment.java | 22 ++++++++--------
.../metrics/container/PrometheusContainer.java | 2 +-
.../container/PrometheusContainerFactory.java | 2 +-
.../agent/jaeger/container/JaegerContainer.java | 2 +-
.../jaeger/container/JaegerContainerFactory.java | 2 +-
.../agent/zipkin/container/ZipkinContainer.java | 2 +-
.../zipkin/container/ZipkinContainerFactory.java | 2 +-
.../container/{atomic => }/ComboITContainer.java | 2 +-
.../container/{atomic => }/DockerITContainer.java | 2 +-
.../{atomic => }/EmbeddedITContainer.java | 2 +-
.../env/container/{atomic => }/ITContainer.java | 2 +-
.../env/container/{atomic => }/ITContainers.java | 6 ++---
.../{atomic => }/adapter/AdapterContainer.java | 4 +--
.../adapter/AdapterContainerFactory.java | 20 +++++++--------
.../config/AdaptorContainerConfiguration.java | 2 +-
.../{atomic => }/adapter/enums/AdapterMode.java | 2 +-
.../{atomic => }/adapter/enums/AdapterType.java | 2 +-
.../impl/ShardingSphereJdbcEmbeddedContainer.java | 8 +++---
.../ShardingSphereMultiProxyClusterContainer.java | 12 ++++-----
.../impl/ShardingSphereProxyClusterContainer.java | 16 ++++++------
.../impl/ShardingSphereProxyEmbeddedContainer.java | 20 +++++++--------
.../ShardingSphereProxyStandaloneContainer.java | 16 ++++++------
.../constants/ProxyContainerConstants.java | 2 +-
.../constants/StorageContainerConstants.java | 2 +-
.../governance/GovernanceContainer.java | 4 +--
.../governance/GovernanceContainerFactory.java | 4 +--
.../governance/impl/ZookeeperContainer.java | 4 +--
.../{atomic => }/storage/StorageContainer.java | 4 +--
.../mount/MountConfigurationResourceGenerator.java | 4 +--
.../storage/mount/MountSQLResourceGenerator.java | 4 +--
.../StorageContainerConfigurationOption.java | 2 +-
.../HiveStorageContainerConfigurationOption.java | 4 +--
...MariaDBStorageContainerConfigurationOption.java | 6 ++---
.../MySQLStorageContainerConfigurationOption.java | 6 ++---
...enGaussStorageContainerConfigurationOption.java | 6 ++---
...tgreSQLStorageContainerConfigurationOption.java | 6 ++---
.../storage/type/DockerStorageContainer.java | 29 +++++++++++-----------
.../storage/type/NativeStorageContainer.java | 14 +++++------
.../{atomic => }/util/AdapterContainerUtils.java | 4 +--
.../{atomic => }/util/ContainerUtils.java | 2 +-
.../{atomic => }/util/DockerImageVersion.java | 2 +-
.../JdbcConnectCheckingWaitStrategy.java} | 6 ++---
.../{atomic => }/util/SQLScriptUtils.java | 2 +-
.../{atomic => }/util/StorageContainerUtils.java | 2 +-
.../test/e2e/env/runtime/E2ETestEnvironment.java | 2 +-
...age.option.StorageContainerConfigurationOption} | 10 ++++----
.../pipeline/cases/PipelineContainerComposer.java | 8 +++---
.../e2e/operation/pipeline/cases/cdc/CDCE2EIT.java | 2 +-
.../createtable/CreateTableSQLGeneratorIT.java | 4 +--
.../pipeline/env/PipelineE2EEnvironment.java | 4 +--
.../compose/PipelineBaseContainerComposer.java | 2 +-
.../docker/PipelineDockerContainerComposer.java | 14 +++++------
...PipelineProxyContainerConfigurationFactory.java | 6 ++---
.../ClusterShowProcessListContainerComposer.java | 28 ++++++++++-----------
.../engine/base/TransactionBaseE2EIT.java | 4 +--
.../engine/base/TransactionContainerComposer.java | 2 +-
.../transaction/env/TransactionE2EEnvironment.java | 10 ++++----
.../env/enums/TransactionTestCaseRegistry.java | 2 +-
.../compose/TransactionBaseContainerComposer.java | 2 +-
.../TransactionDockerContainerComposer.java | 28 ++++++++++-----------
...nsactionProxyContainerConfigurationFactory.java | 6 ++---
.../test/e2e/sql/env/SQLE2EEnvironmentEngine.java | 6 ++---
.../compose/ContainerComposerRegistry.java | 4 +--
.../compose/mode/ClusterContainerComposer.java | 28 ++++++++++-----------
.../compose/mode/StandaloneContainerComposer.java | 22 ++++++++--------
.../SQLE2EProxyContainerConfigurationFactory.java | 6 ++---
.../array/ClusterTestParameterArrayGenerator.java | 2 +-
.../param/array/E2ETestParameterFactory.java | 2 +-
.../JdbcStandaloneTestParameterGenerator.java | 4 +--
.../ProxyStandaloneTestParameterGenerator.java | 2 +-
.../shardingsphere/test/e2e/sql/it/SQLE2EIT.java | 4 +--
74 files changed, 245 insertions(+), 244 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 3788e2d9959..79e4f448823 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
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 e6e6b34e9a4..69ebec1ce39 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Agent plugin container factory.
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 a5bbda4221b..a365e45cc95 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Agent plugin HTTP endpoint provider.
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 659422e05c9..4f084ae1cf6 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,17 +31,17 @@ 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.atomic.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
+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.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyClusterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import org.awaitility.Awaitility;
import org.testcontainers.containers.output.OutputFrame;
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 6c10b80c8fb..e7714714e71 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,7 +18,7 @@
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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
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 6f93c727870..62ea3e30a19 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Prometheus container factory.
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 8678cdaf7f8..0202d68a719 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
import java.util.Collections;
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 13c5eab81e1..215ddf3a181 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Jaeger container factory.
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 d7dec988447..63c734597b4 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,7 +18,7 @@
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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
public final class ZipkinContainer extends DockerITContainer {
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 d66d62a6d2c..588fcf8c9fa 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.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Zipkin container factory.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ComboITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ComboITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
index 1ca5ed6be98..5e5c6d23e7f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ComboITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ComboITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic;
+package org.apache.shardingsphere.test.e2e.env.container;
import java.util.Collection;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
similarity index 98%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
index 41a48a7b4fe..599dd1f5107 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/DockerITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic;
+package org.apache.shardingsphere.test.e2e.env.container;
import lombok.Getter;
import lombok.Setter;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/EmbeddedITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/EmbeddedITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
index a577c82412b..d09cedebed3 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/EmbeddedITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/EmbeddedITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic;
+package org.apache.shardingsphere.test.e2e.env.container;
/**
* Embedded IT container.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
index 4d0f6d93336..6b51a2fba5b 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic;
+package org.apache.shardingsphere.test.e2e.env.container;
import org.testcontainers.lifecycle.Startable;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
similarity index 95%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
index b2433d2902a..b855f3950eb 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/ITContainers.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic;
+package org.apache.shardingsphere.test.e2e.env.container;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.awaitility.Awaitility;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Network;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
similarity index 88%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
index 6001a578058..03ce658cd25 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter;
+package org.apache.shardingsphere.test.e2e.env.container.adapter;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.ITContainer;
import javax.sql.DataSource;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
similarity index 74%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
index 6ea10a6bedf..aba86e9fd0d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter;
+package org.apache.shardingsphere.test.e2e.env.container.adapter;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereMultiProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyStandaloneContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereMultiProxyClusterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyClusterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyStandaloneContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/config/AdaptorContainerConfiguration.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/config/AdaptorContainerConfiguration.java
index c1b5e1330e5..c0290862aa0 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/config/AdaptorContainerConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterMode.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterMode.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
index 16ddac9a907..36f71a549a4 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterMode.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterMode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterType.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterType.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
index c2a5514caa6..9bd3b15ae01 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/enums/AdapterType.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
index 28fd66c0e7d..4ec0475d8ee 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereJdbcEmbeddedContainer.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import com.zaxxer.hikari.HikariDataSource;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.EmbeddedITContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import javax.sql.DataSource;
import java.io.File;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
index b068302a248..f93b85d4622 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereMultiProxyClusterContainer.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.ComboITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
+import org.apache.shardingsphere.test.e2e.env.container.ComboITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.ITContainer;
+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;
import org.testcontainers.lifecycle.Startable;
import javax.sql.DataSource;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java
similarity index 83%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java
index 400224c6fed..537fd64a790 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import com.google.common.base.Strings;
import lombok.Setter;
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.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+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;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import javax.sql.DataSource;
@@ -67,7 +67,7 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
addEnv("TZ", "UTC");
mapResources(config.getMountedResources());
DataSourceEnvironment dataSourceEnvironment =
DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
- setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(
+ setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() ->
DriverManager.getConnection(
dataSourceEnvironment.getURL(getHost(), getMappedPort(3307),
config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD)));
withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
similarity index 91%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
index 90140a9528a..be132746c6a 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
import lombok.Setter;
import lombok.SneakyThrows;
@@ -31,14 +31,14 @@ 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.atomic.EmbeddedITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
+import org.apache.shardingsphere.test.e2e.env.container.EmbeddedITContainer;
+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;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import org.testcontainers.containers.GenericContainer;
@@ -129,7 +129,7 @@ public final class ShardingSphereProxyEmbeddedContainer
implements AdapterContai
public void start() {
startDependencies();
startInternalProxy();
- new JdbcConnectionWaitStrategy(() ->
getTargetDataSource(null).getConnection()).waitUntilReady(null);
+ new JdbcConnectCheckingWaitStrategy(() ->
getTargetDataSource(null).getConnection()).waitUntilReady(null);
}
@SneakyThrows
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyStandaloneContainer.java
similarity index 80%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index 235b25772b7..87f8cbd1193 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl;
+package org.apache.shardingsphere.test.e2e.env.container.adapter.impl;
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.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+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;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import javax.sql.DataSource;
@@ -52,7 +52,7 @@ public final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
protected void configure() {
withExposedPorts(3307, 3308);
mapResources(config.getMountedResources());
- setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(
+ setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() ->
DriverManager.getConnection(
DatabaseTypedSPILoader.getService(DataSourceEnvironment.class,
databaseType).getURL(getHost(), getMappedPort(3307),
config.getProxyDataSourceName()), "proxy", "Proxy@123")));
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/ProxyContainerConstants.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/ProxyContainerConstants.java
similarity index 95%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/ProxyContainerConstants.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/ProxyContainerConstants.java
index f46e1dc4c2f..fcf7ce47281 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/ProxyContainerConstants.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/ProxyContainerConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.constants;
+package org.apache.shardingsphere.test.e2e.env.container.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/StorageContainerConstants.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/StorageContainerConstants.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/StorageContainerConstants.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/StorageContainerConstants.java
index 845064faace..25f0b637902 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/constants/StorageContainerConstants.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/StorageContainerConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.constants;
+package org.apache.shardingsphere.test.e2e.env.container.constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
similarity index 88%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
index bc0842e1dec..920f18755ed 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.governance;
+package org.apache.shardingsphere.test.e2e.env.container.governance;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
/**
* Governance container.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainerFactory.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainerFactory.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainerFactory.java
index 0c103eeaf7a..07027efcc40 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/GovernanceContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/GovernanceContainerFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.governance;
+package org.apache.shardingsphere.test.e2e.env.container.governance;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.impl.ZookeeperContainer;
/**
* Governance container factory.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/impl/ZookeeperContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/impl/ZookeeperContainer.java
similarity index 89%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/impl/ZookeeperContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/impl/ZookeeperContainer.java
index 6477f646e88..07077fe03a7 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/governance/impl/ZookeeperContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/governance/impl/ZookeeperContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl;
+package org.apache.shardingsphere.test.e2e.env.container.governance.impl;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
/**
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
index e6a71950001..8e266d8862d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/StorageContainer.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage;
+package org.apache.shardingsphere.test.e2e.env.container.storage;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainer;
+import org.apache.shardingsphere.test.e2e.env.container.ITContainer;
import javax.sql.DataSource;
import java.util.Map;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountConfigurationResourceGenerator.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountConfigurationResourceGenerator.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
index a00c8ed25c1..f134aa98e74 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountConfigurationResourceGenerator.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.mount;
+package org.apache.shardingsphere.test.e2e.env.container.storage.mount;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import java.io.File;
import java.util.Collection;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountSQLResourceGenerator.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
similarity index 96%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountSQLResourceGenerator.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
index 8f814396660..85351bf99e7 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/mount/MountSQLResourceGenerator.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.mount;
+package org.apache.shardingsphere.test.e2e.env.container.storage.mount;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/StorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
similarity index 97%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/StorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
index 2a5dfe8d97e..36afee3f59d 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/StorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option;
+package org.apache.shardingsphere.test.e2e.env.container.storage.option;
import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/HiveStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/HiveStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
index b31d009c59b..56f0c284289 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/HiveStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import java.util.Collection;
import java.util.Collections;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
similarity index 89%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
index 22d5cce503a..dad42a31661 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import org.apache.shardingsphere.test.e2e.env.container.util.ContainerUtils;
import java.util.Collection;
import java.util.Collections;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
similarity index 90%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
index f0d383af298..a7ab80c0032 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import org.apache.shardingsphere.test.e2e.env.container.util.ContainerUtils;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
similarity index 89%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
index 5098fcaba6f..596e486d4e1 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
similarity index 89%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
index ca95cc4921a..c7142782922 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect;
+package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import java.util.Collection;
import java.util.Collections;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
similarity index 84%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/DockerStorageContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
index 2e88c10df34..5d1f9c26917 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type;
+package org.apache.shardingsphere.test.e2e.env.container.storage.type;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.google.common.base.Preconditions;
@@ -24,16 +24,16 @@ import lombok.Getter;
import lombok.SneakyThrows;
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.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.mount.MountConfigurationResourceGenerator;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.mount.MountSQLResourceGenerator;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+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;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.mount.MountSQLResourceGenerator;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.util.DockerImageVersion;
+import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
@@ -92,10 +92,11 @@ public final class DockerStorageContainer extends
DockerITContainer implements S
setPrivilegedMode();
withExposedPorts(getExposedPort());
if (option.isSupportDockerEntrypoint()) {
- setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(getURL(),
StorageContainerConstants.CHECK_READY_USER,
StorageContainerConstants.CHECK_READY_PASSWORD)));
+ setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() ->
DriverManager.getConnection(
+ getURL(), StorageContainerConstants.CHECK_READY_USER,
StorageContainerConstants.CHECK_READY_PASSWORD)));
} else {
- setWaitStrategy(new JdbcConnectionWaitStrategy(() ->
DriverManager.getConnection(getURL(),
-
option.getDefaultUserWhenUnsupportedDockerEntrypoint().orElse(""),
option.getDefaultPasswordWhenUnsupportedDockerEntrypoint().orElse(""))));
+ setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() ->
DriverManager.getConnection(
+ getURL(),
option.getDefaultUserWhenUnsupportedDockerEntrypoint().orElse(""),
option.getDefaultPasswordWhenUnsupportedDockerEntrypoint().orElse(""))));
}
withStartupTimeout(Duration.ofSeconds(option.getStartupTimeoutSeconds()));
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/NativeStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
similarity index 88%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/NativeStorageContainer.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
index e11fde29bf4..ccfbc160b76 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/NativeStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type;
+package org.apache.shardingsphere.test.e2e.env.container.storage.type;
import lombok.Getter;
import lombok.Setter;
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.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.mount.MountSQLResourceGenerator;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
+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.MountSQLResourceGenerator;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
similarity index 88%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
index d8b4cf7f3e8..a0fc14a5856 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/AdapterContainerUtils.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
/**
* Adapter container utility class.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/ContainerUtils.java
similarity index 95%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/ContainerUtils.java
index 7143c302804..b7b0f095cb4 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/ContainerUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DockerImageVersion.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/DockerImageVersion.java
similarity index 96%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DockerImageVersion.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/DockerImageVersion.java
index 77db44020c8..c1cc2439738 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DockerImageVersion.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/DockerImageVersion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import org.apache.commons.lang3.StringUtils;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/JdbcConnectCheckingWaitStrategy.java
similarity index 89%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/JdbcConnectCheckingWaitStrategy.java
index 24ce35443f4..597932ba002 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/JdbcConnectCheckingWaitStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.wait;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -27,11 +27,11 @@ import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
/**
- * Wait strategy implemented via JDBC connection checking.
+ * JDBC connect checking wait strategy.
*/
@RequiredArgsConstructor
@Slf4j
-public final class JdbcConnectionWaitStrategy extends AbstractWaitStrategy {
+public final class JdbcConnectCheckingWaitStrategy extends
AbstractWaitStrategy {
private final Callable<Connection> connectionSupplier;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/SQLScriptUtils.java
similarity index 98%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/SQLScriptUtils.java
index e24d6d0a0fc..b4e8be10d6c 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/SQLScriptUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/SQLScriptUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/StorageContainerUtils.java
similarity index 96%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/StorageContainerUtils.java
index 43f196d17fa..7ca8aa67927 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/util/StorageContainerUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.env.container.atomic.util;
+package org.apache.shardingsphere.test.e2e.env.container.util;
import com.zaxxer.hikari.HikariDataSource;
import lombok.AccessLevel;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index fe4f63a7c3e..27a767b13d3 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime;
import com.google.common.base.Splitter;
import lombok.Getter;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
diff --git
a/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption
b/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
similarity index 56%
rename from
test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption
rename to
test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
index 60f3f235669..0be4040e157 100644
---
a/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption
+++
b/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
@@ -15,8 +15,8 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.MySQLStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.MariaDBStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.OpenGaussStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.HiveStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MariaDBStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.HiveStorageContainerConfigurationOption
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
index ba91b049f29..e383abe5525 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -41,10 +41,10 @@ import
org.apache.shardingsphere.infra.util.props.PropertiesBuilder.Property;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
import
org.apache.shardingsphere.single.yaml.config.YamlSingleRuleConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.command.ExtraSQLCommand;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.PipelineE2EEnvironment;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
index 72c02e9bf76..6cba6fc7ca8 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
@@ -43,7 +43,7 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegist
import
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.cases.PipelineContainerComposer;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.cases.task.E2EIncrementalTask;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.framework.helper.PipelineCaseHelper;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 36c4d820143..5236fc8b549 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -21,8 +21,8 @@ import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.dialect.DialectPi
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.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionEntity;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionsRootEntity;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorOutputEntity;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index 68feee054de..403f7606c70 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -22,8 +22,8 @@ import lombok.Getter;
import lombok.SneakyThrows;
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.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineProxyTypeEnum;
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 b60e8182f54..88d23a1fba5 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.atomic.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
import org.testcontainers.lifecycle.Startable;
/**
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
index defc5459078..61fd2b3a59b 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
@@ -21,13 +21,13 @@ import lombok.Getter;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.exception.ShardingSpherePreconditions;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyClusterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.impl.ZookeeperContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.PipelineE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineProxyTypeEnum;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
index e00a35cdd2e..4653407b003 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/config/proxy/PipelineProxyContainerConfigurationFactory.java
@@ -22,9 +22,9 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.database.connector.opengauss.type.OpenGaussDatabaseType;
import
org.apache.shardingsphere.database.connector.postgresql.type.PostgreSQLDatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.util.AdapterContainerUtils;
import java.util.HashMap;
import java.util.LinkedList;
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 33b99c6e2b5..5e784508c69 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
@@ -19,20 +19,20 @@ 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.test.e2e.env.container.atomic.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+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.adapter.AdapterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.env.ShowProcessListEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.parameter.ShowProcessListTestParameter;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
index 28ad38ba836..1a4f7b32314 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -24,8 +24,8 @@ 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.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.operation.transaction.cases.base.BaseTransactionTestCase.TransactionTestCaseParameter;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
index d8f62b4f0a1..4d590efac53 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.operation.transaction.engine.base;
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.framework.container.compose.TransactionBaseContainerComposer;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
index c49bed5125e..94ed791a536 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
@@ -21,11 +21,11 @@ import com.google.common.base.Strings;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.MySQLStorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.OpenGaussStorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionTestCaseRegistry;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
index 7012aa4dc4d..0d07770f176 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.base.TransactionBaseE2EIT;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.constants.TransactionTestConstants;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.database.mysql.MySQLJdbcTransactionE2ETT;
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 11fa9887ff7..084cd59568e 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.atomic.ITContainers;
+import org.apache.shardingsphere.test.e2e.env.container.ITContainers;
import org.testcontainers.lifecycle.Startable;
/**
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 7d440017804..a1bee207485 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
@@ -22,20 +22,20 @@ import lombok.Getter;
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.test.e2e.env.container.atomic.DockerITContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.DockerITContainer;
+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;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.impl.ZookeeperContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.framework.container.config.TransactionProxyContainerConfigurationFactory;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/config/TransactionProxyContainerConfigurationFactory.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/config/TransactionProxyContainerConfigurationFactory.java
index f251a81561f..b785a6d7d4d 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/config/TransactionProxyContainerConfigurationFactory.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/config/TransactionProxyContainerConfigurationFactory.java
@@ -20,9 +20,9 @@ package
org.apache.shardingsphere.test.e2e.operation.transaction.framework.conta
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.util.AdapterContainerUtils;
import java.util.HashMap;
import java.util.List;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
index a37897fe6e1..370f4129098 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
@@ -21,9 +21,9 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.DefaultDatabase;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposerRegistry;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index 45e55a19d52..eb6da386db1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.test.e2e.sql.env.container.compose;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.ClusterContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.StandaloneContainerComposer;
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 bd3d86679de..035dc1221a2 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
@@ -19,20 +19,20 @@ 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.atomic.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyEmbeddedContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
+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.adapter.AdapterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
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 3cb6f473e94..5cad89fa0dd 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,17 +19,17 @@ 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.atomic.DockerITContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
+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.adapter.AdapterContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 920f025725a..bed4272b1cc 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -21,9 +21,9 @@ import com.google.common.base.Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.e2e.env.container.util.AdapterContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import java.net.URL;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
index d12efc9aa11..ac6b0773fd7 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
index 281dcd440e0..34977719288 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/E2ETestParameterFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 561f2d67e27..0e8c6e9e56d 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index 86eb9bf46be..981c6a79876 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
index fbb5395bc8c..55d7d0df29c 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.test.e2e.sql.it;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterMode;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import
org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT.SQLE2EITEnvironmentExtension;
