Refactor usage of ProxyContainerConstants (#36631)

terrymanu · web-flow · commit 8671f786be5e · 2025-09-19T18:38:56.000+08:00
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -68,7 +68,7 @@ protected void configure() {
         mapResources(config.getMountedResources());
         DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
         setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(
-                dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)));
+                dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD)));
         withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));
     }
     
@@ -78,7 +78,7 @@ public DataSource getTargetDataSource(final String serverLists) {
         if (null == dataSource) {
             DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
             targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(
-                    dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
+                    dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));
         }
         return targetDataSourceProvider.get();
     }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyEmbeddedContainer.java
@@ -96,7 +96,7 @@ public DataSource getTargetDataSource(final String serverLists) {
         if (null == dataSource) {
             DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
             targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(dataSourceEnvironment.getURL(
-                    "127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
+                    "127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));
         }
         return targetDataSourceProvider.get();
     }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyStandaloneContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -52,8 +52,8 @@ public ShardingSphereProxyStandaloneContainer(final DatabaseType databaseType, f
     protected void configure() {
         withExposedPorts(3307, 3308);
         mapResources(config.getMountedResources());
-        setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(
-                DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType).getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), "proxy", "Proxy@123")));
+        setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType)
+                .getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD)));
     }
     
     @Override
@@ -62,7 +62,7 @@ public DataSource getTargetDataSource(final String serverLists) {
         if (null == dataSource) {
             DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);
             targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(
-                    dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));
+                    dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));
         }
         return targetDataSourceProvider.get();
     }
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/ProxyContainerConstants.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/constants/ProxyContainerConstants.java
@@ -26,7 +26,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ProxyContainerConstants {
     
-    public static final String USERNAME = "proxy";
+    public static final String USER = "proxy";
     
     public static final String PASSWORD = "Proxy@123";
     
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
@@ -137,14 +137,14 @@ public PipelineContainerComposer(final PipelineTestParameter testParam, final Pi
         containerComposer.start();
         sourceDataSource = StorageContainerUtils.generateDataSource(getActualJdbcUrlTemplate(DS_0, false), username, password, 2);
         proxyDataSource = StorageContainerUtils.generateDataSource(
-                appendExtraParameter(containerComposer.getProxyJdbcUrl(PROXY_DATABASE)), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2);
+                appendExtraParameter(containerComposer.getProxyJdbcUrl(PROXY_DATABASE)), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2);
         init(jobType);
     }
     
     @SneakyThrows(SQLException.class)
     private void init(final PipelineJobType jobType) {
         String jdbcUrl = containerComposer.getProxyJdbcUrl(databaseType instanceof PostgreSQLDatabaseType || databaseType instanceof OpenGaussDatabaseType ? "postgres" : "");
-        try (Connection connection = DriverManager.getConnection(jdbcUrl, ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)) {
+        try (Connection connection = DriverManager.getConnection(jdbcUrl, ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD)) {
             cleanUpPipelineJobs(connection, jobType);
             cleanUpProxyDatabase(connection);
             // Compatible with "drop database if exists sharding_db;" failed for now
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java
@@ -182,7 +182,7 @@ private CDCClient buildCDCClientAndStart(final PipelineDataSource dataSource, fi
         DataSourceRecordConsumer recordConsumer = new DataSourceRecordConsumer(dataSource, containerComposer.getDatabaseType());
         CDCClient result = new CDCClient(new CDCClientConfiguration("localhost", containerComposer.getContainerComposer().getProxyCDCPort(), 5000));
         result.connect(recordConsumer, new RetryStreamingExceptionHandler(result, 5, 5000), (ctx, serverErrorResult) -> log.error("Server error: {}", serverErrorResult.getErrorMessage()));
-        result.login(new CDCLoginParameter(ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD));
+        result.login(new CDCLoginParameter(ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD));
         // TODO add full=false test case later
         result.startStreaming(new StartStreamingParameter("sharding_db", Collections.singleton(SchemaTable.newBuilder().setTable("*").setSchema("*").build()), true));
         return result;
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
@@ -131,7 +131,7 @@ public int getActualDataSourceDefaultPort(final DatabaseType databaseType) {
      */
     public String getActualDataSourceUsername(final DatabaseType databaseType) {
         return itEnvType == TransactionE2EEnvTypeEnum.NATIVE
-                ? String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username", databaseType.getType().toLowerCase()), ProxyContainerConstants.USERNAME))
+                ? String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username", databaseType.getType().toLowerCase()), ProxyContainerConstants.USER))
                 : StorageContainerConstants.OPERATION_USER;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected void configure() {`
`68`	`68`	`mapResources(config.getMountedResources());`
`69`	`69`	`DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);`
`70`	`70`	`setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(`
`71`		`- dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)));`
	`71`	`+ dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD)));`
`72`	`72`	`withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));`
`73`	`73`	`}`
`74`	`74`
`@@ -78,7 +78,7 @@ public DataSource getTargetDataSource(final String serverLists) {`
`78`	`78`	`if (null == dataSource) {`
`79`	`79`	`DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);`
`80`	`80`	`targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(`
`81`		`- dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));`
	`81`	`+ dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));`
`82`	`82`	`}`
`83`	`83`	`return targetDataSourceProvider.get();`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public DataSource getTargetDataSource(final String serverLists) {`
`96`	`96`	`if (null == dataSource) {`
`97`	`97`	`DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);`
`98`	`98`	`targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(dataSourceEnvironment.getURL(`
`99`		`- "127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));`
	`99`	`+ "127.0.0.1", 3307, config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));`
`100`	`100`	`}`
`101`	`101`	`return targetDataSourceProvider.get();`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ public ShardingSphereProxyStandaloneContainer(final DatabaseType databaseType, f`
`52`	`52`	`protected void configure() {`
`53`	`53`	`withExposedPorts(3307, 3308);`
`54`	`54`	`mapResources(config.getMountedResources());`
`55`		`- setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(`
`56`		`- DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType).getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), "proxy", "Proxy@123")));`
	`55`	`+ setWaitStrategy(new JdbcConnectCheckingWaitStrategy(() -> DriverManager.getConnection(DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType)`
	`56`	`+ .getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD)));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`@@ -62,7 +62,7 @@ public DataSource getTargetDataSource(final String serverLists) {`
`62`	`62`	`if (null == dataSource) {`
`63`	`63`	`DataSourceEnvironment dataSourceEnvironment = DatabaseTypedSPILoader.getService(DataSourceEnvironment.class, databaseType);`
`64`	`64`	`targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(`
`65`		`- dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD, 2));`
	`65`	`+ dataSourceEnvironment.getURL(getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USER, ProxyContainerConstants.PASSWORD, 2));`
`66`	`66`	`}`
`67`	`67`	`return targetDataSourceProvider.get();`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public int getActualDataSourceDefaultPort(final DatabaseType databaseType) {`
`131`	`131`	`*/`
`132`	`132`	`public String getActualDataSourceUsername(final DatabaseType databaseType) {`
`133`	`133`	`return itEnvType == TransactionE2EEnvTypeEnum.NATIVE`
`134`		`- ? String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username", databaseType.getType().toLowerCase()), ProxyContainerConstants.USERNAME))`
	`134`	`+ ? String.valueOf(props.getOrDefault(String.format("transaction.it.native.%s.username", databaseType.getType().toLowerCase()), ProxyContainerConstants.USER))`
`135`	`135`	`: StorageContainerConstants.OPERATION_USER;`
`136`	`136`	`}`
`137`	`137`