apache · terrymanu · Sep 18, 2025 · Sep 18, 2025
diff --git a/...v/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java b/...v/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
@@ -23,7 +23,7 @@
 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.natived.NativeStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.NativeStorageContainer;
 import org.awaitility.Awaitility;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.Network;

diff --git a/...here/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java b/...here/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
@@ -36,7 +36,7 @@
 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.natived.NativeStorageContainer;
+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.runtime.E2ETestEnvironment;

diff --git a/.../apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java b/.../apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java
@@ -21,8 +21,7 @@
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.HiveContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.DockerStorageContainer;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 
 /**
@@ -60,9 +59,8 @@ public static StorageContainer newInstance(final DatabaseType databaseType, fina
             case "PostgreSQL":
             case "openGauss":
             case "MariaDB":
-                return new DockerStorageContainer(storageContainerImage, option, scenario);
             case "Hive":
-                return new HiveContainer(storageContainerImage, option, scenario);
+                return new DockerStorageContainer(storageContainerImage, option, scenario);
             default:
                 throw new RuntimeException(String.format("Database `%s` is unknown.", databaseType.getType()));
         }

diff --git a/...e/type/docker/DockerStorageContainer.java → .../storage/type/DockerStorageContainer.java b/...e/type/docker/DockerStorageContainer.java → .../storage/type/DockerStorageContainer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker;
+package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.google.common.base.Preconditions;
@@ -55,7 +55,7 @@
 /**
  * Docker storage container.
  */
-public class DockerStorageContainer extends DockerITContainer implements StorageContainer {
+public final class DockerStorageContainer extends DockerITContainer implements StorageContainer {
 
     private final StorageContainerConfigurationOption option;
 
@@ -82,7 +82,7 @@ private static String getContainerImage(final String containerImage, final Stora
     }
 
     @Override
-    protected final void configure() {
+    protected void configure() {
         setCommands();
         addEnvironments();
         mapResources(new MountConfigurationResourceGenerator(option).generate(majorVersion, scenario));
@@ -126,7 +126,7 @@ private String getURL() {
 
     @SneakyThrows({SQLException.class, InterruptedException.class})
     @Override
-    protected final void containerIsStarted(final InspectContainerResponse containerInfo) {
+    protected void containerIsStarted(final InspectContainerResponse containerInfo) {
         if (option.isSupportDockerEntrypoint()) {
             return;
         }
@@ -164,7 +164,7 @@ private Map<String, DataSource> createAccessDataSources(final Collection<String>
      * @param dataSourceName data source name
      * @return access data source
      */
-    public final DataSource createAccessDataSource(final String dataSourceName) {
+    public DataSource createAccessDataSource(final String dataSourceName) {
         return StorageContainerUtils.generateDataSource(getJdbcUrl(dataSourceName), StorageContainerConstants.OPERATION_USER, StorageContainerConstants.OPERATION_PASSWORD, 20);
     }
 
@@ -174,7 +174,7 @@ public final DataSource createAccessDataSource(final String dataSourceName) {
      * @param dataSourceName datasource name
      * @return JDBC URL
      */
-    public final String getJdbcUrl(final String dataSourceName) {
+    public String getJdbcUrl(final String dataSourceName) {
         DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, option.getType());
         return dataSourceEnvironment.getURL(getHost(), getMappedPort(), Strings.isNullOrEmpty(dataSourceName) ? option.getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName);
     }
@@ -184,7 +184,7 @@ public final String getJdbcUrl(final String dataSourceName) {
      *
      * @return exposed database container port
      */
-    public final int getExposedPort() {
+    public int getExposedPort() {
         return option.getPort();
     }
 
@@ -193,17 +193,17 @@ public final int getExposedPort() {
      *
      * @return mapped database container port
      */
-    public final int getMappedPort() {
+    public int getMappedPort() {
         return getMappedPort(getExposedPort());
     }
 
     @Override
-    public final String getAbbreviation() {
+    public String getAbbreviation() {
         return option.getDatabaseType().toLowerCase();
     }
 
     @Override
-    public final Map<String, String> getLinkReplacements() {
+    public Map<String, String> getLinkReplacements() {
         Map<String, String> result = new HashMap<>();
         for (String each : getNetworkAliases()) {
             for (Integer exposedPort : getExposedPorts()) {

diff --git a/.../type/natived/NativeStorageContainer.java → .../storage/type/NativeStorageContainer.java b/.../type/natived/NativeStorageContainer.java → .../storage/type/NativeStorageContainer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived;
+package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java b/.../shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
diff --git a/...rg/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java b/...rg/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -43,7 +43,7 @@
 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.docker.DockerStorageContainer;
+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.runtime.datasource.DataSourceEnvironment;
 import org.apache.shardingsphere.test.e2e.operation.pipeline.command.ExtraSQLCommand;

diff --git a/...ardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java b/...ardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.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/...peration/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java b/...peration/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
@@ -28,7 +28,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.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/...pache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java b/...pache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -25,7 +25,7 @@
 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.docker.DockerStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.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/...operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java b/...operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
@@ -35,8 +35,8 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived.NativeStorageContainer;
+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.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/...ache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java b/...ache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -32,7 +32,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived.NativeStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.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/...e/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java b/...e/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.natived.NativeStorageContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.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;