(shardingsphere) branch master updated: Optimize PostgreSQLContainer code (#35328)

[zhangliang]

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 3b96a1ec176 Optimize PostgreSQLContainer code (#35328)
3b96a1ec176 is described below

commit 3b96a1ec176fc393a52c104a6c9dc38004fa3618
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon May 5 14:54:54 2025 +0800

    Optimize PostgreSQLContainer code (#35328)
    
    - Remove unused import of PostgreSQLDatabaseType
    - Replace instanceOf checks with equality comparison to getDatabaseType()
    - Simplify code in getDatabaseNames() and getExpectedDatabaseNames() methods
---
 .../e2e/env/container/atomic/storage/impl/PostgreSQLContainer.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/PostgreSQLContainer.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/PostgreSQLContainer.java
index 67e97673edc..5561624c075 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/PostgreSQLContainer.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/PostgreSQLContainer.java
@@ -19,7 +19,6 @@ package 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl;
 
 import com.google.common.base.Strings;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
@@ -55,14 +54,12 @@ public final class PostgreSQLContainer extends 
DockerStorageContainer {
     
     @Override
     protected Collection<String> getDatabaseNames() {
-        return storageContainerConfig.getDatabaseTypes().entrySet().stream()
-                .filter(entry -> entry.getValue() instanceof 
PostgreSQLDatabaseType).map(Map.Entry::getKey).collect(Collectors.toList());
+        return 
storageContainerConfig.getDatabaseTypes().entrySet().stream().filter(entry -> 
entry.getValue() == 
getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList());
     }
     
     @Override
     protected Collection<String> getExpectedDatabaseNames() {
-        return 
storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream()
-                .filter(entry -> entry.getValue() instanceof 
PostgreSQLDatabaseType).map(Map.Entry::getKey).collect(Collectors.toList());
+        return 
storageContainerConfig.getExpectedDatabaseTypes().entrySet().stream().filter(entry
 -> entry.getValue() == 
getDatabaseType()).map(Map.Entry::getKey).collect(Collectors.toList());
     }
     
     @Override