This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 412249e3323 Refactor NetworkAliasUtil (#19334)
412249e3323 is described below
commit 412249e33233c5b65b375b86681238376d263280
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jul 19 00:04:09 2022 +0800
Refactor NetworkAliasUtil (#19334)
* Refactor NetworkAliasUtil
* Refactor NetworkAliasUtil
* Refactor NetworkAliasUtil
---
.../test/integration/util/NetworkAliasUtil.java | 21 ++++++++++++++-------
.../compose/mode/ClusterComposedContainer.java | 4 ++--
.../compose/mode/StandaloneComposedContainer.java | 4 ++--
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/util/NetworkAliasUtil.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/util/NetworkAliasUtil.java
index 49d8d0727d7..82a7d8fc665 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/util/NetworkAliasUtil.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/util/NetworkAliasUtil.java
@@ -17,26 +17,33 @@
package org.apache.shardingsphere.test.integration.util;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+/**
+ * Network alias util.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class NetworkAliasUtil {
/**
- * Get network alias with scenario.
+ * Get network alias.
*
- * @param containerType container type, such as "zk", "db"
- * @param scenario scenario
+ * @param containerType container type
* @return network alias
*/
- public static String getNetworkAliasWithScenario(final String
containerType, final String scenario) {
- return String.join(".", containerType.toLowerCase(), scenario, "host");
+ public static String getNetworkAlias(final String containerType) {
+ return String.join(".", containerType.toLowerCase(), "host");
}
/**
* Get network alias.
*
* @param containerType container type
+ * @param scenario scenario
* @return network alias
*/
- public static String getNetworkAlias(final String containerType) {
- return String.join(".", containerType.toLowerCase(), "host");
+ public static String getNetworkAlias(final String containerType, final
String scenario) {
+ return String.join(".", containerType.toLowerCase(), scenario, "host");
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
index 6e8e5fc1581..3b00f4b1257 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/ClusterComposedContainer.java
@@ -51,13 +51,13 @@ public final class ClusterComposedContainer implements
ComposedContainer {
// TODO support other types of governance
governanceContainer =
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"),
NetworkAliasUtil.getNetworkAlias("zk"));
storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(),
scenario),
-
NetworkAliasUtil.getNetworkAliasWithScenario(parameterizedArray.getDatabaseType().getType(),
scenario));
+
NetworkAliasUtil.getNetworkAlias(parameterizedArray.getDatabaseType().getType(),
scenario));
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(parameterizedArray.getMode(),
parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(),
storageContainer,
scenario);
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
}
- this.adapterContainer = containers.registerContainer(adapterContainer,
NetworkAliasUtil.getNetworkAliasWithScenario(parameterizedArray.getAdapter(),
scenario));
+ this.adapterContainer = containers.registerContainer(adapterContainer,
NetworkAliasUtil.getNetworkAlias(parameterizedArray.getAdapter(), scenario));
}
@Override
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/StandaloneComposedContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/StandaloneComposedContainer.java
index 3df605672bd..28a89c8f871 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/StandaloneComposedContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/container/compose/mode/StandaloneComposedContainer.java
@@ -45,10 +45,10 @@ public final class StandaloneComposedContainer implements
ComposedContainer {
String scenario = parameterizedArray.getScenario();
containers = new ITContainers(scenario);
storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(),
scenario),
-
NetworkAliasUtil.getNetworkAliasWithScenario(parameterizedArray.getDatabaseType().getType(),
scenario));
+
NetworkAliasUtil.getNetworkAlias(parameterizedArray.getDatabaseType().getType(),
scenario));
adapterContainer =
containers.registerContainer(AdapterContainerFactory.newInstance(parameterizedArray.getMode(),
parameterizedArray.getAdapter(), parameterizedArray.getDatabaseType(),
storageContainer, scenario),
-
NetworkAliasUtil.getNetworkAliasWithScenario(parameterizedArray.getAdapter(),
scenario));
+
NetworkAliasUtil.getNetworkAlias(parameterizedArray.getAdapter(), scenario));
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(storageContainer);
}
