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 1a25f5fe338 Rename variable name from runMode to mode (#36678)
1a25f5fe338 is described below
commit 1a25f5fe3385d7ef899bcff124d432acd7868249
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Tue Sep 23 23:43:08 2025 +0800
Rename variable name from runMode to mode (#36678)
---
.../composer/ClusterShowProcessListContainerComposer.java | 14 +++++++-------
.../showprocesslist/engine/ShowProcessListE2EIT.java | 6 +++---
.../showprocesslist/env/ShowProcessListEnvironment.java | 4 ++--
.../parameter/ShowProcessListTestParameter.java | 4 ++--
.../env/container/compose/ContainerComposerRegistry.java | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 7437ea18ce0..91a2b357ad5 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -56,19 +56,19 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
public ClusterShowProcessListContainerComposer(final
ShowProcessListTestParameter testParam) {
containers = new E2EContainers(testParam.getScenario());
- governanceContainer = isClusterMode(testParam.getRunMode())
+ governanceContainer = isClusterMode(testParam.getMode())
? containers.registerContainer(new
GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class,
"ZooKeeper")))
: null;
StorageContainer storageContainer = containers.registerContainer(
new DockerStorageContainer("",
DatabaseTypedSPILoader.getService(StorageContainerOption.class,
testParam.getDatabaseType()), testParam.getScenario()));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(), new LinkedList<>(),
- getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode(),
testParam.getGovernanceCenter()),
AdapterContainerUtils.getAdapterContainerImage(),
+ getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getMode(),
testParam.getRegCenterType()), AdapterContainerUtils.getAdapterContainerImage(),
"");
String envType =
ShowProcessListEnvironment.getInstance().getItEnvType().name();
jdbcContainer = AdapterContainerFactory.newInstance(AdapterType.JDBC,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
proxyContainer =
AdapterContainerFactory.newInstance(AdapterType.PROXY,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
if (proxyContainer instanceof DockerE2EContainer) {
- if (isClusterMode(testParam.getRunMode())) {
+ if (isClusterMode(testParam.getMode())) {
((DockerE2EContainer)
proxyContainer).dependsOn(governanceContainer);
}
((DockerE2EContainer) proxyContainer).dependsOn(storageContainer);
@@ -77,16 +77,16 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
containers.registerContainer(jdbcContainer);
}
- private Map<String, String> getMountedResources(final String scenario,
final DatabaseType databaseType, final String runMode, final String
governanceCenter) {
+ private Map<String, String> getMountedResources(final String scenario,
final DatabaseType databaseType, final String mode, final String refCenterType)
{
Map<String, String> result = new HashMap<>(2, 1F);
- result.put(isClusterMode(runMode) ?
String.format("/env/common/cluster/proxy/%s/conf/",
governanceCenter.toLowerCase())
+ result.put(isClusterMode(mode) ?
String.format("/env/common/cluster/proxy/%s/conf/", refCenterType.toLowerCase())
: "/env/common/standalone/proxy/conf/",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
return result;
}
- private boolean isClusterMode(final String runMode) {
- return "Cluster".equals(runMode);
+ private boolean isClusterMode(final String mode) {
+ return "Cluster".equals(mode);
}
/**
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
index 1ab65fd37d1..0979b83a61b 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/engine/ShowProcessListE2EIT.java
@@ -117,15 +117,15 @@ class ShowProcessListE2EIT {
return ShowProcessListEnvTypeEnum.DOCKER == ENV.getItEnvType();
}
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+ private static final class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final
ParameterDeclarations parameters, final ExtensionContext context) {
Collection<Arguments> result = new LinkedList<>();
for (String each : ENV.getScenarios()) {
- for (String runMode : ENV.getRunModes()) {
+ for (String mode : ENV.getModes()) {
for (String governanceType : ENV.getGovernanceCenters()) {
- result.add(Arguments.of(new
ShowProcessListTestParameter(TypedSPILoader.getService(DatabaseType.class,
"MySQL"), each, runMode, governanceType)));
+ result.add(Arguments.of(new
ShowProcessListTestParameter(TypedSPILoader.getService(DatabaseType.class,
"MySQL"), each, mode, governanceType)));
}
}
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
index e52f4e47e06..6c645392bad 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/env/ShowProcessListEnvironment.java
@@ -37,7 +37,7 @@ public final class ShowProcessListEnvironment {
private final ShowProcessListEnvTypeEnum itEnvType;
- private final Collection<String> runModes;
+ private final Collection<String> modes;
private final Collection<String> scenarios;
@@ -46,7 +46,7 @@ public final class ShowProcessListEnvironment {
private ShowProcessListEnvironment() {
props = loadProperties();
itEnvType =
ShowProcessListEnvTypeEnum.valueOf(props.getProperty("showprocesslist.e2e.env.type",
ShowProcessListEnvTypeEnum.NONE.name()).toUpperCase());
- runModes =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.artifact.modes",
"Standalone,Cluster"));
+ modes =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.artifact.modes",
"Standalone,Cluster"));
scenarios = getScenarios(props);
governanceCenters =
Splitter.on(",").trimResults().splitToList(props.getProperty("showprocesslist.e2e.governance.centers"));
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/parameter/ShowProcessListTestParameter.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/parameter/ShowProcessListTestParameter.java
index f08c651201f..4a9bc12b1b4 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/parameter/ShowProcessListTestParameter.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/parameter/ShowProcessListTestParameter.java
@@ -31,7 +31,7 @@ public final class ShowProcessListTestParameter {
private final String scenario;
- private final String runMode;
+ private final String mode;
- private final String governanceCenter;
+ private final String regCenterType;
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index b719c56b4d6..319dcab8be4 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -46,7 +46,7 @@ public final class ContainerComposerRegistry implements
AutoCloseable {
* @param key key
* @param scenario scenario
* @param databaseType databaseType
- * @param mode adapterMode
+ * @param mode mode
* @param adapterType adapterType
* @return composed container
*/
