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 30994a877f5 Refactor : extract the constant for config path in
container (#20655)
30994a877f5 is described below
commit 30994a877f539f547e502692b9af97a9390cf56b
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Tue Aug 30 23:17:33 2022 +0800
Refactor : extract the constant for config path in container (#20655)
---
.../adapter/config/ProxyClusterContainerConfigurationFactory.java | 3 ++-
.../env/container/atomic/constants/ProxyContainerConstants.java | 2 ++
.../container/config/ProxyClusterContainerConfigurationFactory.java | 5 +++--
.../proxy/ScalingProxyClusterContainerConfigurationFactory.java | 5 +++--
.../config/proxy/ProxyClusterContainerConfigurationFactory.java | 5 +++--
5 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
index 3dd3cfbdd85..af6d8926e53 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
import java.util.Collections;
import java.util.Map;
@@ -39,6 +40,6 @@ public final class ProxyClusterContainerConfigurationFactory {
}
private static Map<String, String> getMountedResources() {
- return Collections.singletonMap("/env/log/logback.xml",
"/opt/shardingsphere-proxy/conf/logback.xml");
+ return Collections.singletonMap("/env/log/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/ProxyContainerConstants.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/ProxyContainerConstants.java
index 45b94c17a25..4d0dee7e9b9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/ProxyContainerConstants.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/constants/ProxyContainerConstants.java
@@ -32,6 +32,8 @@ public class ProxyContainerConstants {
public static final String AGENT_HOME_IN_CONTAINER =
"/usr/local/shardingsphere-agent";
+ public static final String CONFIG_PATH_IN_CONTAINER =
"/opt/shardingsphere-proxy/conf/";
+
public static final String PROXY_CONTAINER_NAME_PREFIX =
"ShardingSphere-Proxy";
public static final String PROXY_CONTAINER_IMAGE =
"apache/shardingsphere-proxy-test";
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
index dc7d33afdb5..b3384899551 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.test.integration.ha.framework.container.config
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
import java.util.HashMap;
import java.util.Map;
@@ -42,8 +43,8 @@ public final class ProxyClusterContainerConfigurationFactory {
private static Map<String, String> getMountedResources(final String
scenario) {
Map<String, String> result = new HashMap<>(2, 1);
- result.put("logback-test.xml",
"/opt/shardingsphere-proxy/conf/logback.xml");
- result.put(String.format("env/scenario/%s/proxy/server.yaml",
scenario), "/opt/shardingsphere-proxy/conf/server.yaml");
+ result.put("logback-test.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
+ result.put(String.format("env/scenario/%s/proxy/server.yaml",
scenario), ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
return result;
}
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationF
[...]
index 12fbad9d9f5..11bed8a6568 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.integration.env.container.atomic.util.DatabaseTypeUtil;
import java.util.HashMap;
@@ -53,9 +54,9 @@ public final class
ScalingProxyClusterContainerConfigurationFactory {
result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
if (DatabaseTypeUtil.isMySQL(databaseType)) {
String majorVersion =
DatabaseTypeUtil.parseMajorVersion(dockerImageName);
- result.put(String.format("/env/%s/server-%s.yaml",
databaseType.getType().toLowerCase(), majorVersion),
"/opt/shardingsphere-proxy/conf/server.yaml");
+ result.put(String.format("/env/%s/server-%s.yaml",
databaseType.getType().toLowerCase(), majorVersion),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
} else {
- result.put(String.format("/env/%s/server.yaml",
databaseType.getType().toLowerCase()),
"/opt/shardingsphere-proxy/conf/server.yaml");
+ result.put(String.format("/env/%s/server.yaml",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
}
return result;
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index 92981381b9a..d70a342e27b 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -21,6 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.integration.env.container.atomic.util.DatabaseTypeUtil;
import java.util.HashMap;
@@ -48,8 +49,8 @@ public final class ProxyClusterContainerConfigurationFactory {
private static Map<String, String> getMountedResource(final DatabaseType
databaseType) {
Map<String, String> result = new HashMap<>(2, 1);
- result.put(String.format("/env/%s/server.yaml",
databaseType.getType().toLowerCase()),
"/opt/shardingsphere-proxy/conf/server.yaml");
- result.put("/logback-test.xml",
"/opt/shardingsphere-proxy/conf/logback-test.xml");
+ result.put(String.format("/env/%s/server.yaml",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
+ result.put("/logback-test.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
return result;
}
}
