Add StorageContainerConfigurationOption.getDefaultImageName()

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/StorageContainerConfigurationOption.java

@@ -34,6 +34,13 @@ public interface StorageContainerConfigurationOption {
      */
     int getPort();
 
+    /**
+     * Get default container image name.
+     *
+     * @return default container image name
+     */
+    String getDefaultImageName();
+
     /**
      * Get container command.
      *

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/H2StorageContainerConfigurationOption.java

@@ -35,6 +35,11 @@ public int getPort() {
         return 0;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "";
+    }
+
     @Override
     public String getCommand() {
         return "";

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/HiveStorageContainerConfigurationOption.java

@@ -36,6 +36,11 @@ public int getPort() {
         return 10000;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "apache/hive:4.0.1";
+    }
+
     @Override
     public String getCommand() {
         return "bash -c 'start-hive.sh && tail -f /dev/null'";

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MariaDBStorageContainerConfigurationOption.java

@@ -37,6 +37,11 @@ public int getPort() {
         return 3306;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "mariadb:11";
+    }
+
     @Override
     public String getCommand() {
         return "--server-id=" + ContainerUtils.generateMySQLServerId();

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/MySQLStorageContainerConfigurationOption.java

@@ -39,6 +39,11 @@ public int getPort() {
         return 3306;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "mysql:8.0.40";
+    }
+
     @Override
     public String getCommand() {
         return "--server-id=" + ContainerUtils.generateMySQLServerId();

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/OpenGaussStorageContainerConfigurationOption.java

@@ -37,6 +37,11 @@ public int getPort() {
         return 5432;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "opengauss/opengauss:3.1.0";
+    }
+
     @Override
     public String getCommand() {
         return "";

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/option/dialect/PostgreSQLStorageContainerConfigurationOption.java

@@ -37,6 +37,11 @@ public int getPort() {
         return 5432;
     }
 
+    @Override
+    public String getDefaultImageName() {
+        return "postgres:12-alpine";
+    }
+
     @Override
     public String getCommand() {
         return "-c config_file=/etc/postgresql/postgresql.conf";

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

@@ -61,7 +61,7 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
     private final Map<String, DataSource> expectedDataSourceMap = new LinkedHashMap<>();
 
     protected DockerStorageContainer(final DatabaseType databaseType, final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(databaseType.getType().toLowerCase(), containerImage);
+        super(databaseType.getType().toLowerCase(), Strings.isNullOrEmpty(containerImage) ? storageContainerConfig.getConfigurationOption().getDefaultImageName() : containerImage);
         this.databaseType = databaseType;
         this.storageContainerConfig = storageContainerConfig;
         majorVersion = new DockerImageVersion(containerImage).getMajorVersion();

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

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl;
 
-import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -33,7 +32,7 @@
 public final class HiveContainer extends DockerStorageContainer {
 
     public HiveContainer(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "Hive"), Strings.isNullOrEmpty(containerImage) ? "apache/hive:4.0.1" : containerImage, storageContainerConfig);
+        super(TypedSPILoader.getService(DatabaseType.class, "Hive"), containerImage, storageContainerConfig);
     }
 
     @Override

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

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl;
 
-import com.google.common.base.Strings;
 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.config.StorageContainerConfiguration;
@@ -29,6 +28,6 @@
 public final class MariaDBContainer extends DockerStorageContainer {
 
     public MariaDBContainer(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "MariaDB"), Strings.isNullOrEmpty(containerImage) ? "mariadb:11" : containerImage, storageContainerConfig);
+        super(TypedSPILoader.getService(DatabaseType.class, "MariaDB"), containerImage, storageContainerConfig);
     }
 }

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

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl;
 
-import com.google.common.base.Strings;
 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.config.StorageContainerConfiguration;
@@ -29,6 +28,6 @@
 public final class MySQLContainer extends DockerStorageContainer {
 
     public MySQLContainer(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), Strings.isNullOrEmpty(containerImage) ? "mysql:8.0.40" : containerImage, storageContainerConfig);
+        super(TypedSPILoader.getService(DatabaseType.class, "MySQL"), containerImage, storageContainerConfig);
     }
 }

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

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl;
 
-import com.google.common.base.Strings;
 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.config.StorageContainerConfiguration;
@@ -29,6 +28,6 @@
 public final class OpenGaussContainer extends DockerStorageContainer {
 
     public OpenGaussContainer(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "openGauss"), Strings.isNullOrEmpty(containerImage) ? "opengauss/opengauss:3.1.0" : containerImage, storageContainerConfig);
+        super(TypedSPILoader.getService(DatabaseType.class, "openGauss"), containerImage, storageContainerConfig);
     }
 }

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

@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl;
 
-import com.google.common.base.Strings;
 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.config.StorageContainerConfiguration;
@@ -29,6 +28,6 @@
 public final class PostgreSQLContainer extends DockerStorageContainer {
 
     public PostgreSQLContainer(final String containerImage, final StorageContainerConfiguration storageContainerConfig) {
-        super(TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"), Strings.isNullOrEmpty(containerImage) ? "postgres:12-alpine" : containerImage, storageContainerConfig);
+        super(TypedSPILoader.getService(DatabaseType.class, "PostgreSQL"), containerImage, storageContainerConfig);
     }
 }