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 5963ae40a33 Refactor StorageContainerConfiguration (#36542)
5963ae40a33 is described below
commit 5963ae40a33ad9b8f65faef6c40880f773e9d51e
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 12 19:30:08 2025 +0800
Refactor StorageContainerConfiguration (#36542)
---
.../atomic/storage/config/StorageContainerConfiguration.java | 5 ++---
.../storage/config/StorageContainerConfigurationFactory.java | 7 +++----
.../atomic/storage/type/docker/DockerStorageContainer.java | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
index c6b38120a2d..dc99f070f52 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfiguration.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.option.StorageContainerConfigurationOption;
import java.util.Map;
@@ -32,9 +33,7 @@ public final class StorageContainerConfiguration {
private final String scenario;
- private final String command;
-
- private final Map<String, String> environments;
+ private final StorageContainerConfigurationOption configurationOption;
private final Map<String, String> mountedConfigurationResources;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
index abdff3f4c21..32c271c6aed 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/StorageContainerConfigurationFactory.java
@@ -59,8 +59,7 @@ public final class StorageContainerConfigurationFactory {
public static StorageContainerConfiguration newInstance(final
StorageContainerConfigurationOption option, final DatabaseType databaseType,
final int majorVersion) {
Map<String, String> toBeMountedConfigurationFiles =
getToBeMountedConfigurationFiles(databaseType, option, majorVersion, "");
Map<String, String> toBeMountedSQLFiles =
getToBeMountedSQLFiles(databaseType, option, majorVersion, "");
- return new StorageContainerConfiguration(
- null, option.getCommand(), option.getEnvironments(),
toBeMountedConfigurationFiles, toBeMountedSQLFiles, Collections.emptyMap(),
Collections.emptyMap());
+ return new StorageContainerConfiguration(null, option,
toBeMountedConfigurationFiles, toBeMountedSQLFiles, Collections.emptyMap(),
Collections.emptyMap());
}
/**
@@ -76,8 +75,8 @@ public final class StorageContainerConfigurationFactory {
Map<String, String> toBeMountedSQLFiles =
getToBeMountedSQLFiles(databaseType, option, 0, scenario);
Map<String, DatabaseType> actualDatabaseTypes =
DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType,
Type.ACTUAL);
Map<String, DatabaseType> expectedDatabaseTypes =
DatabaseEnvironmentManager.getDatabaseTypes(scenario, databaseType,
Type.EXPECTED);
- return new
StorageContainerConfiguration(option.isEmbeddedStorageContainer() ? scenario :
null,
- option.getCommand(), option.getEnvironments(),
toBeMountedConfigurationFiles, toBeMountedSQLFiles, actualDatabaseTypes,
expectedDatabaseTypes);
+ return new StorageContainerConfiguration(
+ option.isEmbeddedStorageContainer() ? scenario : null, option,
toBeMountedConfigurationFiles, toBeMountedSQLFiles, actualDatabaseTypes,
expectedDatabaseTypes);
}
private static Map<String, String> getToBeMountedConfigurationFiles(final
DatabaseType databaseType,
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
index 4dc4711469d..643409b3894 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
@@ -65,8 +65,8 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
@Override
protected void configure() {
- setCommands(storageContainerConfig.getCommand());
- addEnvs(storageContainerConfig.getEnvironments());
+
setCommands(storageContainerConfig.getConfigurationOption().getCommand());
+
addEnvs(storageContainerConfig.getConfigurationOption().getEnvironments());
mapResources(storageContainerConfig.getMountedConfigurationResources());
mapResources(storageContainerConfig.getMountedSQLResources());
withExposedPorts(getExposedPort());
