(shardingsphere) branch master updated: Minor refactor in ContainerComposerRegistry (#39624)

[hucong]

This is an automated email from the ASF dual-hosted git repository.

iamhucong 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 e9078852501 Minor refactor in ContainerComposerRegistry (#39624)
e9078852501 is described below

commit e9078852501775a8bd1ac082ad5e01d83308539f
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Fri Aug 28 16:11:34 2026 +0800

    Minor refactor in ContainerComposerRegistry (#39624)
---
 .../e2e/sql/env/container/compose/ContainerComposerRegistry.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index 15c28e3f07a..65c10e5639d 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -93,7 +93,8 @@ public final class ContainerComposerRegistry implements 
AutoCloseable {
                 closeTargetDataSource(each);
             }
             for (ContainerComposer each : containerComposers.values()) {
-                closeActualDataSourceMap(each.getActualDataSourceMap());
+                closeDataSourceMap(each.getActualDataSourceMap());
+                closeDataSourceMap(each.getExpectedDataSourceMap());
                 closeContainer(each);
             }
             targetDataSources.clear();
@@ -108,9 +109,9 @@ public final class ContainerComposerRegistry implements 
AutoCloseable {
     }
     
     @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");
+    private void closeDataSourceMap(final Map<String, DataSource> 
dataSourceMap) {
+        for (DataSource each : dataSourceMap.values()) {
+            Preconditions.checkState(each instanceof AutoCloseable, "data 
source is not implement AutoCloseable");
             ((AutoCloseable) each).close();
         }
     }