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 8671f786be5 Refactor usage of ProxyContainerConstants (#36631)
8671f786be5 is described below
commit 8671f786be5eb788e821aea468005a70d74e3636
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Sep 19 18:38:56 2025 +0800
Refactor usage of ProxyContainerConstants (#36631)
---
.../container/adapter/impl/ShardingSphereProxyClusterContainer.java | 4 ++--
.../adapter/impl/ShardingSphereProxyEmbeddedContainer.java | 2 +-
.../adapter/impl/ShardingSphereProxyStandaloneContainer.java | 6 +++---
.../test/e2e/env/container/constants/ProxyContainerConstants.java | 2 +-
.../e2e/operation/pipeline/cases/PipelineContainerComposer.java | 4 ++--
.../test/e2e/operation/pipeline/cases/cdc/CDCE2EIT.java | 2 +-
.../e2e/operation/transaction/env/TransactionE2EEnvironment.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
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
index 537fd64a790..bf42bad766a 100644
---
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 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
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 final class ShardingSphereProxyClusterContainer
extends DockerITContainer
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
index be132746c6a..f0fc6ed1637 100644
---
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 final class ShardingSphereProxyEmbeddedContainer
implements AdapterContai
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
index 87f8cbd1193..eeaeb76ff2e 100644
---
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 final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
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 final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
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
index fcf7ce47281..e2484b81f01 100644
---
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 @@ import lombok.NoArgsConstructor;
@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
index e383abe5525..ebb5e862291 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
@@ -137,14 +137,14 @@ public final class PipelineContainerComposer implements
AutoCloseable {
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
index 6cba6fc7ca8..47640a16556 100644
---
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 @@ class CDCE2EIT {
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
index 4037bfe2ae9..53258eff21f 100644
---
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 final class TransactionE2EEnvironment {
*/
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;
}
