You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/01 02:08:27 UTC

(shardingsphere) branch master updated: Refactor StandaloneContainerComposer and ClusterContainerComposer (#36444)

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 4d0fc58654a Refactor StandaloneContainerComposer and ClusterContainerComposer (#36444)
4d0fc58654a is described below

commit 4d0fc58654ac2e98cd27a648de43d1e194e8abf1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Sep 1 10:08:20 2025 +0800

    Refactor StandaloneContainerComposer and ClusterContainerComposer (#36444)
---
 .../e2e/env/container/compose/ContainerComposerRegistry.java     | 4 ++--
 .../e2e/env/container/compose/mode/ClusterContainerComposer.java | 9 +++------
 .../env/container/compose/mode/StandaloneContainerComposer.java  | 9 +++------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
index a7240a211c8..a69d17fdec9 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/ContainerComposerRegistry.java
@@ -81,13 +81,13 @@ public final class ContainerComposerRegistry implements AutoCloseable {
         containerComposers.clear();
     }
     
-    @SneakyThrows
+    @SneakyThrows(Exception.class)
     private void closeTargetDataSource(final DataSource targetDataSource) {
         Preconditions.checkState(targetDataSource instanceof AutoCloseable, "target data source is not implement AutoCloseable");
         ((AutoCloseable) targetDataSource).close();
     }
     
-    @SneakyThrows
+    @SneakyThrows(Exception.class)
     private void closeActualDataSourceMap(final Map<String, DataSource> actualDataSourceMap) {
         for (DataSource each : actualDataSourceMap.values()) {
             Preconditions.checkState(each instanceof AutoCloseable, "actual data source is not implement AutoCloseable");
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
index cb11a9d6096..ae933a45a9b 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/ClusterContainerComposer.java
@@ -35,7 +35,6 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.Nati
 import org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
 import org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
 
 import javax.sql.DataSource;
@@ -59,11 +58,9 @@ public final class ClusterContainerComposer implements ContainerComposer {
         // TODO support other types of governance
         governanceContainer = containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"));
         Type envType = E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
-        if (ClusterEnvironment.Type.DOCKER == envType) {
-            storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationFactory.newInstance(databaseType, scenario)));
-        } else {
-            storageContainer = containers.registerContainer(new NativeStorageContainer(databaseType, scenario));
-        }
+        storageContainer = containers.registerContainer(Type.DOCKER == envType
+                ? StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationFactory.newInstance(databaseType, scenario))
+                : new NativeStorageContainer(databaseType, scenario));
         AdaptorContainerConfiguration containerConfig = SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster", databaseType);
         AdapterContainer adapterContainer = AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario, containerConfig, storageContainer, envType.name());
         if (adapterContainer instanceof DockerITContainer) {
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
index 989575755a7..821ead029f0 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/compose/mode/StandaloneContainerComposer.java
@@ -31,7 +31,6 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.Nati
 import org.apache.shardingsphere.test.e2e.env.container.compose.ContainerComposer;
 import org.apache.shardingsphere.test.e2e.env.container.config.SQLE2EProxyContainerConfigurationFactory;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
-import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment.Type;
 
 import javax.sql.DataSource;
@@ -51,11 +50,9 @@ public final class StandaloneContainerComposer implements ContainerComposer {
     public StandaloneContainerComposer(final String scenario, final DatabaseType databaseType, final AdapterMode adapterMode, final AdapterType adapterType) {
         containers = new ITContainers(scenario);
         Type envType = E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
-        if (ClusterEnvironment.Type.DOCKER == envType) {
-            storageContainer = containers.registerContainer(StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationFactory.newInstance(databaseType, scenario)));
-        } else {
-            storageContainer = containers.registerContainer(new NativeStorageContainer(databaseType, scenario));
-        }
+        storageContainer = containers.registerContainer(Type.DOCKER == envType
+                ? StorageContainerFactory.newInstance(databaseType, StorageContainerConfigurationFactory.newInstance(databaseType, scenario))
+                : new NativeStorageContainer(databaseType, scenario));
         adapterContainer = containers.registerContainer(AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType, scenario,
                 SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone", databaseType), storageContainer, envType.name()));
         if (adapterContainer instanceof DockerITContainer) {