(shardingsphere) branch master updated: Remove DockerStorageContainer.getUsername and getPassword (#36548)

[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 6d67565aed0 Remove DockerStorageContainer.getUsername and getPassword 
(#36548)
6d67565aed0 is described below

commit 6d67565aed07bb66128478fe1cfc1231ce942161
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Sep 12 22:00:32 2025 +0800

    Remove DockerStorageContainer.getUsername and getPassword (#36548)
    
    * Move CHECK_READY_USER and CHECK_READY_PASSWORD to 
StorageContainerConstants
    
    * Remove DockerStorageContainer.getUsername and getPassword
    
    * Remove DockerStorageContainer.getUsername and getPassword
---
 .../storage/type/docker/DockerStorageContainer.java  | 20 +-------------------
 .../pipeline/cases/PipelineContainerComposer.java    |  6 +++---
 2 files changed, 4 insertions(+), 22 deletions(-)

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 2ca959adaca..b55618560ab 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
@@ -117,7 +117,7 @@ public abstract class DockerStorageContainer extends 
DockerITContainer implement
      * @return access data source
      */
     public DataSource createAccessDataSource(final String dataSourceName) {
-        return 
StorageContainerUtils.generateDataSource(getJdbcUrl(dataSourceName), 
getUsername(), getPassword(), 20);
+        return 
StorageContainerUtils.generateDataSource(getJdbcUrl(dataSourceName), 
StorageContainerConstants.OPERATION_USER, 
StorageContainerConstants.OPERATION_PASSWORD, 20);
     }
     
     /**
@@ -142,24 +142,6 @@ public abstract class DockerStorageContainer extends 
DockerITContainer implement
     
     protected abstract Optional<String> getDefaultDatabaseName();
     
-    /**
-     * Get username.
-     *
-     * @return username
-     */
-    public final String getUsername() {
-        return StorageContainerConstants.OPERATION_USER;
-    }
-    
-    /**
-     * Get unified database access password.
-     *
-     * @return unified database access password
-     */
-    public final String getPassword() {
-        return StorageContainerConstants.OPERATION_PASSWORD;
-    }
-    
     /**
      * Get database container exposed port.
      *
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
index 2424cc9e273..178f495f0a8 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/PipelineContainerComposer.java
@@ -41,6 +41,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;
 import 
org.apache.shardingsphere.single.yaml.config.YamlSingleRuleConfiguration;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
+import 
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
 import 
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
 import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
@@ -125,9 +126,8 @@ public final class PipelineContainerComposer implements 
AutoCloseable {
                 ? new DockerContainerComposer(testParam.getDatabaseType(), 
testParam.getStorageContainerImage(), testParam.getStorageContainerCount())
                 : new NativeContainerComposer(testParam.getDatabaseType());
         if (PipelineE2EEnvironment.getInstance().getItEnvType() == 
PipelineEnvTypeEnum.DOCKER) {
-            DockerStorageContainer storageContainer = 
((DockerContainerComposer) containerComposer).getStorageContainers().get(0);
-            username = storageContainer.getUsername();
-            password = storageContainer.getPassword();
+            username = StorageContainerConstants.OPERATION_USER;
+            password = StorageContainerConstants.OPERATION_PASSWORD;
         } else {
             username = 
PipelineE2EEnvironment.getInstance().getActualDataSourceUsername(databaseType);
             password = 
PipelineE2EEnvironment.getInstance().getActualDataSourcePassword(databaseType);