Refactor DockerStorageContainer and remove useless impl (#36565)

* Refactor DockerStorageContainer and remove useless impl

* Refactor DockerStorageContainer and remove useless impl

* Refactor DockerStorageContainer and remove useless impl

Author: terrymanu

test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java

@@ -40,7 +40,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOptionFactory;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.MySQLContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
 import org.awaitility.Awaitility;
 import org.testcontainers.containers.output.OutputFrame;
 
@@ -99,9 +99,9 @@ public void init() {
         }
         Optional<DockerITContainer> agentPluginContainer = TypedSPILoader.findService(AgentPluginContainerFactory.class, testConfig.getPluginType()).map(AgentPluginContainerFactory::create);
         if (AdapterType.PROXY.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
-            createProxyEnvironment(agentPluginContainer);
+            createProxyEnvironment(agentPluginContainer.orElse(null));
         } else if (AdapterType.JDBC.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
-            createJDBCEnvironment(agentPluginContainer);
+            createJDBCEnvironment(agentPluginContainer.orElse(null));
         }
         log.info("Waiting to collect data ...");
         long collectDataWaitSeconds = testConfig.getCollectDataWaitSeconds();
@@ -112,20 +112,21 @@ public void init() {
         initialized = true;
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private void createProxyEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
+    private void createProxyEnvironment(final DockerITContainer agentPluginContainer) {
         containers = new ITContainers();
         ShardingSphereProxyClusterContainer proxyContainer = new ShardingSphereProxyClusterContainer(databaseType, getAdaptorContainerConfiguration());
         proxyContainer.withLogConsumer(testConfig.isLogEnabled() ? this::collectLogs : null);
-        MySQLContainer storageContainer = new MySQLContainer(
+        DockerStorageContainer storageContainer = new DockerStorageContainer(databaseType,
                 imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null));
         proxyContainer.dependsOn(storageContainer);
         containers.registerContainer(storageContainer);
         GovernanceContainer governanceContainer = GovernanceContainerFactory.newInstance("ZooKeeper");
         proxyContainer.dependsOn(governanceContainer);
         containers.registerContainer(governanceContainer);
-        agentPluginContainer.ifPresent(proxyContainer::dependsOn);
-        agentPluginContainer.ifPresent(optional -> containers.registerContainer(optional));
+        if (null != agentPluginContainer) {
+            proxyContainer.dependsOn(agentPluginContainer);
+            containers.registerContainer(agentPluginContainer);
+        }
         containers.registerContainer(proxyContainer);
         containers.start();
         try {
@@ -145,16 +146,17 @@ private AdaptorContainerConfiguration getAdaptorContainerConfiguration() {
         return new AdaptorContainerConfiguration("sharding_db", Collections.emptyList(), mountedResources, imageConfig.getProxyImage(), "");
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private void createJDBCEnvironment(final Optional<DockerITContainer> agentPluginContainer) {
+    private void createJDBCEnvironment(final DockerITContainer agentPluginContainer) {
         containers = new ITContainers();
-        MySQLContainer storageContainer = new MySQLContainer(imageConfig.getMysqlImage(),
-                StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null));
+        DockerStorageContainer storageContainer = new DockerStorageContainer(databaseType,
+                imageConfig.getMysqlImage(), StorageContainerConfigurationFactory.newInstance(StorageContainerConfigurationOptionFactory.newInstance(databaseType), databaseType, null));
         ShardingSphereJdbcAgentContainer jdbcAgentContainer = new ShardingSphereJdbcAgentContainer(
                 imageConfig.getJdbcProjectImage(), testConfig.getPluginType(), testConfig.isLogEnabled() ? this::collectLogs : null);
         jdbcAgentContainer.dependsOn(storageContainer);
-        agentPluginContainer.ifPresent(jdbcAgentContainer::dependsOn);
-        agentPluginContainer.ifPresent(optional -> containers.registerContainer(optional));
+        if (null != agentPluginContainer) {
+            jdbcAgentContainer.dependsOn(agentPluginContainer);
+            containers.registerContainer(agentPluginContainer);
+        }
         containers.registerContainer(storageContainer);
         containers.registerContainer(jdbcAgentContainer);
         containers.start();
@@ -167,7 +169,7 @@ private void collectLogs(final OutputFrame outputFrame) {
     }
 
     /**
-     * Destroy environment.
+     * Destroy the environment.
      */
     public void destroy() {
         if (!AgentE2ETestConfiguration.getInstance().containsTestParameter()) {

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java

@@ -20,7 +20,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
 import org.testcontainers.containers.BindMode;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.DockerHealthcheckWaitStrategy;
@@ -43,12 +42,9 @@ public abstract class DockerITContainer extends GenericContainer<DockerITContain
 
     private String name;
 
-    private final int majorVersion;
-    
     protected DockerITContainer(final String name, final String containerImage) {
         super(new RemoteDockerImage(DockerImageName.parse(containerImage)));
         this.name = name;
-        majorVersion = new DockerImageVersion(containerImage).getMajorVersion();
     }
 
     protected final void mapResources(final Map<String, String> resources) {

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java

@@ -21,12 +21,9 @@
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.embedded.impl.H2Container;
+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.docker.impl.MariaDBContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.MySQLContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.OpenGaussContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.PostgreSQLContainer;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.embedded.impl.H2Container;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 
 /**
@@ -59,17 +56,14 @@ public static StorageContainer newInstance(final DatabaseType databaseType, fina
     public static StorageContainer newInstance(final DatabaseType databaseType, final String storageContainerImage, final StorageContainerConfiguration storageContainerConfig) {
         switch (databaseType.getType()) {
             case "MySQL":
-                return new MySQLContainer(storageContainerImage, storageContainerConfig);
             case "PostgreSQL":
-                return new PostgreSQLContainer(storageContainerImage, storageContainerConfig);
             case "openGauss":
-                return new OpenGaussContainer(storageContainerImage, storageContainerConfig);
-            case "H2":
-                return new H2Container(storageContainerConfig);
+            case "MariaDB":
+                return new DockerStorageContainer(databaseType, storageContainerImage, storageContainerConfig);
             case "Hive":
                 return new HiveContainer(storageContainerImage, storageContainerConfig);
-            case "MariaDB":
-                return new MariaDBContainer(storageContainerImage, storageContainerConfig);
+            case "H2":
+                return new H2Container(storageContainerConfig);
             default:
                 throw new RuntimeException(String.format("Database `%s` is unknown.", databaseType.getType()));
         }

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java

@@ -26,6 +26,7 @@
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount.MountConfigurationResourceGenerator;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.mount.MountSQLResourceGenerator;
+import org.apache.shardingsphere.test.e2e.env.container.atomic.util.DockerImageVersion;
 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.DataSourceEnvironment;
@@ -45,30 +46,38 @@
 /**
  * Docker storage container.
  */
-public abstract class DockerStorageContainer extends DockerITContainer implements StorageContainer {
+public class DockerStorageContainer extends DockerITContainer implements StorageContainer {
 
     private final DatabaseType databaseType;
 
     private final StorageContainerConfiguration storageContainerConfig;
 
+    @Getter
+    private final int majorVersion;
+    
     @Getter
     private final Map<String, DataSource> actualDataSourceMap = new LinkedHashMap<>();
 
     @Getter
     private final Map<String, DataSource> expectedDataSourceMap = new LinkedHashMap<>();
 
-    protected DockerStorageContainer(final DatabaseType databaseType, final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(databaseType.getType().toLowerCase(), Strings.isNullOrEmpty(containerImage) ? storageContainerConfig.getConfigurationOption().getDefaultImageName() : containerImage);
+    public DockerStorageContainer(final DatabaseType databaseType, final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
+        super(databaseType.getType().toLowerCase(), getContainerImage(containerImage, storageContainerConfig));
         this.databaseType = databaseType;
         this.storageContainerConfig = storageContainerConfig;
+        majorVersion = new DockerImageVersion(getContainerImage(containerImage, storageContainerConfig)).getMajorVersion();
+    }
+    
+    private static String getContainerImage(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
+        return Strings.isNullOrEmpty(containerImage) ? storageContainerConfig.getConfigurationOption().getDefaultImageName() : containerImage;
     }
 
     @Override
     protected final void configure() {
         setCommands();
         addEnvironments();
-        mapResources(new MountConfigurationResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(getMajorVersion(), storageContainerConfig.getScenario()));
-        mapResources(new MountSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(getMajorVersion(), storageContainerConfig.getScenario()));
+        mapResources(new MountConfigurationResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
+        mapResources(new MountSQLResourceGenerator(storageContainerConfig.getConfigurationOption(), databaseType).generate(majorVersion, storageContainerConfig.getScenario()));
         setPrivilegedMode();
         withExposedPorts(getExposedPort());
         withStartupTimeout(Duration.of(storageContainerConfig.getConfigurationOption().getStartupTimeoutSeconds(), ChronoUnit.SECONDS));
@@ -93,7 +102,7 @@ private void setPrivilegedMode() {
     }
 
     private String getURL() {
-        return storageContainerConfig.getConfigurationOption().getDefaultDatabaseName(getMajorVersion())
+        return storageContainerConfig.getConfigurationOption().getDefaultDatabaseName(majorVersion)
                 .map(optional -> DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort(), optional))
                 .orElseGet(() -> DataSourceEnvironment.getURL(databaseType, "localhost", getFirstMappedPort()));
     }
@@ -130,7 +139,7 @@ public final DataSource createAccessDataSource(final String dataSourceName) {
      */
     public final String getJdbcUrl(final String dataSourceName) {
         return DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(),
-                Strings.isNullOrEmpty(dataSourceName) ? storageContainerConfig.getConfigurationOption().getDefaultDatabaseName(getMajorVersion()).orElse("") : dataSourceName);
+                Strings.isNullOrEmpty(dataSourceName) ? storageContainerConfig.getConfigurationOption().getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName);
     }
 
     /**