Refactor DockerStorageContainer (#36629)

terrymanu · web-flow · commit 00bba6c26202 · 2025-09-19T17:17:02.000+08:00
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
@@ -187,7 +187,8 @@ public DataSource createAccessDataSource(final String dataSourceName) {
      */
     public String getJdbcUrl(final String dataSourceName) {
         DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, option.getType());
-        return dataSourceEnvironment.getURL(getHost(), getMappedPort(), Strings.isNullOrEmpty(dataSourceName) ? option.getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName);
+        String toBeConnectedDataSourceName = Strings.isNullOrEmpty(dataSourceName) ? option.getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName;
+        return dataSourceEnvironment.getURL(getHost(), getMappedPort(), toBeConnectedDataSourceName);
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ public DataSource createAccessDataSource(final String dataSourceName) {`
`187`	`187`	`*/`
`188`	`188`	`public String getJdbcUrl(final String dataSourceName) {`
`189`	`189`	`DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, option.getType());`
`190`		`- return dataSourceEnvironment.getURL(getHost(), getMappedPort(), Strings.isNullOrEmpty(dataSourceName) ? option.getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName);`
	`190`	`+ String toBeConnectedDataSourceName = Strings.isNullOrEmpty(dataSourceName) ? option.getDefaultDatabaseName(majorVersion).orElse("") : dataSourceName;`
	`191`	`+ return dataSourceEnvironment.getURL(getHost(), getMappedPort(), toBeConnectedDataSourceName);`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`/**`