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 357b50bc33a Refactor StorageContainerConfiguration (#36531)
357b50bc33a is described below
commit 357b50bc33a437c265a42c7f307ee23eded25435
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Sep 11 19:43:15 2025 +0800
Refactor StorageContainerConfiguration (#36531)
---
.../e2e/agent/engine/env/AgentE2ETestEnvironment.java | 13 ++++++-------
.../storage/config/StorageContainerConfiguration.java | 15 +++++----------
.../atomic/storage/type/docker/impl/HiveContainer.java | 4 ++--
.../atomic/storage/type/docker/impl/MariaDBContainer.java | 4 ++--
.../atomic/storage/type/docker/impl/MySQLContainer.java | 4 ++--
.../storage/type/docker/impl/OpenGaussContainer.java | 4 ++--
.../storage/type/docker/impl/PostgreSQLContainer.java | 4 ++--
7 files changed, 21 insertions(+), 27 deletions(-)
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 918893726a0..f4ecc2c2ec7 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -132,13 +132,12 @@ public final class AgentE2ETestEnvironment {
}
private static StorageContainerConfiguration
getStorageContainerConfiguration() {
- Map<String, String> containerEnvironments = new HashMap<>(3, 1F);
- containerEnvironments.put("LANG", "C.UTF-8");
- containerEnvironments.put("MYSQL_RANDOM_ROOT_PASSWORD", "yes");
- Map<String, String> mountedResources = new HashMap<>();
- mountedResources.put("/env/mysql/init.sql",
"/docker-entrypoint-initdb.d/init.sql");
- return new StorageContainerConfiguration("--sql_mode=
--default-authentication-plugin=mysql_native_password", containerEnvironments,
- mountedResources, Collections.emptyMap(),
Collections.emptyMap());
+ Map<String, String> environments = new HashMap<>(2, 1F);
+ environments.put("LANG", "C.UTF-8");
+ environments.put("MYSQL_RANDOM_ROOT_PASSWORD", "yes");
+ Map<String, String> mountedResources =
Collections.singletonMap("/env/mysql/init.sql",
"/docker-entrypoint-initdb.d/init.sql");
+ return new StorageContainerConfiguration(
+ "--sql_mode=
--default-authentication-plugin=mysql_native_password", environments,
mountedResources, Collections.emptyMap(), Collections.emptyMap());
}
private AdaptorContainerConfiguration getAdaptorContainerConfiguration() {
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 0b250bff2ea..2841452db40 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
@@ -28,13 +28,13 @@ import java.util.Map;
*/
@RequiredArgsConstructor
@Getter
-public class StorageContainerConfiguration {
+public final class StorageContainerConfiguration {
private final String scenario;
- private final String containerCommand;
+ private final String command;
- private final Map<String, String> containerEnvironments;
+ private final Map<String, String> environments;
private final Map<String, String> mountedResources;
@@ -42,13 +42,8 @@ public class StorageContainerConfiguration {
private final Map<String, DatabaseType> expectedDatabaseTypes;
- public StorageContainerConfiguration(final String containerCommand, final
Map<String, String> containerEnvironments, final Map<String, String>
mountedResources,
+ public StorageContainerConfiguration(final String command, final
Map<String, String> environments, final Map<String, String> mountedResources,
final Map<String, DatabaseType>
databaseTypes, final Map<String, DatabaseType> expectedDatabaseTypes) {
- scenario = null;
- this.containerCommand = containerCommand;
- this.containerEnvironments = containerEnvironments;
- this.mountedResources = mountedResources;
- this.databaseTypes = databaseTypes;
- this.expectedDatabaseTypes = expectedDatabaseTypes;
+ this(null, command, environments, mountedResources, databaseTypes,
expectedDatabaseTypes);
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
index 6fe64cd347f..4a82410b8b4 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/HiveContainer.java
@@ -52,8 +52,8 @@ public final class HiveContainer extends
DockerStorageContainer {
@Override
protected void configure() {
- setCommands(storageContainerConfig.getContainerCommand());
- addEnvs(storageContainerConfig.getContainerEnvironments());
+ setCommands(storageContainerConfig.getCommand());
+ addEnvs(storageContainerConfig.getEnvironments());
mapResources(storageContainerConfig.getMountedResources());
withExposedPorts(getExposedPort());
super.configure();
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
index 84cfea7a831..589011566a9 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MariaDBContainer.java
@@ -44,8 +44,8 @@ public final class MariaDBContainer extends
DockerStorageContainer {
@Override
protected void configure() {
- setCommands(storageContainerConfig.getContainerCommand());
- addEnvs(storageContainerConfig.getContainerEnvironments());
+ setCommands(storageContainerConfig.getCommand());
+ addEnvs(storageContainerConfig.getEnvironments());
mapResources(storageContainerConfig.getMountedResources());
super.configure();
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
index 7a76a71ed51..ffc9562c3d9 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/MySQLContainer.java
@@ -46,8 +46,8 @@ public final class MySQLContainer extends
DockerStorageContainer {
@Override
protected void configure() {
- setCommands(storageContainerConfig.getContainerCommand());
- addEnvs(storageContainerConfig.getContainerEnvironments());
+ setCommands(storageContainerConfig.getCommand());
+ addEnvs(storageContainerConfig.getEnvironments());
mapResources(storageContainerConfig.getMountedResources());
super.configure();
withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
index 93d2ebb90b3..6c2ce6333f2 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/OpenGaussContainer.java
@@ -48,8 +48,8 @@ public final class OpenGaussContainer extends
DockerStorageContainer {
@Override
protected void configure() {
- setCommands(storageContainerConfig.getContainerCommand());
- addEnvs(storageContainerConfig.getContainerEnvironments());
+ setCommands(storageContainerConfig.getCommand());
+ addEnvs(storageContainerConfig.getEnvironments());
mapResources(storageContainerConfig.getMountedResources());
withPrivilegedMode(true);
super.configure();
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
index 20b37a085cd..2cb807b67e5 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/impl/PostgreSQLContainer.java
@@ -44,8 +44,8 @@ public final class PostgreSQLContainer extends
DockerStorageContainer {
@Override
protected void configure() {
- setCommands(storageContainerConfig.getContainerCommand());
- addEnvs(storageContainerConfig.getContainerEnvironments());
+ setCommands(storageContainerConfig.getCommand());
+ addEnvs(storageContainerConfig.getEnvironments());
mapResources(storageContainerConfig.getMountedResources());
super.configure();
}
