Refactor DockerStorageContainer and remove useless impl

Author: terrymanu

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/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;
@@ -51,6 +52,9 @@ public class DockerStorageContainer extends DockerITContainer implements Storage
 
     private final StorageContainerConfiguration storageContainerConfig;
 
+    @Getter
+    private final int majorVersion;
+    
     @Getter
     private final Map<String, DataSource> actualDataSourceMap = new LinkedHashMap<>();
 
@@ -61,14 +65,15 @@ public DockerStorageContainer(final DatabaseType databaseType, final String cont
         super(databaseType.getType().toLowerCase(), Strings.isNullOrEmpty(containerImage) ? storageContainerConfig.getConfigurationOption().getDefaultImageName() : containerImage);
         this.databaseType = databaseType;
         this.storageContainerConfig = storageContainerConfig;
+        majorVersion = new DockerImageVersion(containerImage).getMajorVersion();
     }
 
     @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 +98,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 +135,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);
     }
 
     /**