From 68dd8f4637c877ac4ae5493beec64cd398ba2773 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Wed, 6 Mar 2019 16:53:00 +0800 Subject: [PATCH] replace magic string "dubbo" with constants --- .../org/apache/dubbo/common/Constants.java | 6 +++++ .../java/org/apache/dubbo/common/URL.java | 24 +++++++++---------- .../apache/dubbo/common/utils/UrlUtils.java | 24 +++++++++---------- .../dubbo/config/AbstractInterfaceConfig.java | 6 ++--- .../monitor/dubbo/DubboMonitorFactory.java | 3 ++- 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java index dd7d22ee6d7..aa6ae056f4f 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java @@ -753,6 +753,12 @@ public class Constants { public static final String HOST_KEY = "host"; + public static final String PORT_KEY = "port"; + + public static final String USERNAME_KEY = "username"; + + public static final String PASSWORD_KEY = "password"; + public static final String ADDRESS_KEY = "address"; public static final String RETRY_TIMES_KEY = "retry.times"; diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java index 780914066fd..9167a03cccc 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java @@ -1122,22 +1122,22 @@ public URL clearParameters() { } public String getRawParameter(String key) { - if ("protocol".equals(key)) { + if (Constants.PROTOCOL_KEY.equals(key)) { return protocol; } - if ("username".equals(key)) { + if (Constants.USERNAME_KEY.equals(key)) { return username; } - if ("password".equals(key)) { + if (Constants.PASSWORD_KEY.equals(key)) { return password; } - if ("host".equals(key)) { + if (Constants.HOST_KEY.equals(key)) { return host; } - if ("port".equals(key)) { + if (Constants.PORT_KEY.equals(key)) { return String.valueOf(port); } - if ("path".equals(key)) { + if (Constants.PATH_KEY.equals(key)) { return path; } return getParameter(key); @@ -1146,22 +1146,22 @@ public String getRawParameter(String key) { public Map toMap() { Map map = new HashMap(parameters); if (protocol != null) { - map.put("protocol", protocol); + map.put(Constants.PROTOCOL_KEY, protocol); } if (username != null) { - map.put("username", username); + map.put(Constants.USERNAME_KEY, username); } if (password != null) { - map.put("password", password); + map.put(Constants.USERNAME_KEY, password); } if (host != null) { - map.put("host", host); + map.put(Constants.HOST_KEY, host); } if (port > 0) { - map.put("port", String.valueOf(port)); + map.put(Constants.PORT_KEY, String.valueOf(port)); } if (path != null) { - map.put("path", path); + map.put(Constants.PATH_KEY, path); } return map; } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java index 23b50339f4c..f7ca5c007b9 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java @@ -63,22 +63,22 @@ public static URL parseURL(String address, Map defaults) { url += URL_PARAM_STARTING_SYMBOL + Constants.BACKUP_KEY + "=" + backup.toString(); } } - String defaultProtocol = defaults == null ? null : defaults.get("protocol"); + String defaultProtocol = defaults == null ? null : defaults.get(Constants.PROTOCOL_KEY); if (defaultProtocol == null || defaultProtocol.length() == 0) { - defaultProtocol = "dubbo"; + defaultProtocol = Constants.DUBBO_PROTOCOL; } - String defaultUsername = defaults == null ? null : defaults.get("username"); - String defaultPassword = defaults == null ? null : defaults.get("password"); - int defaultPort = StringUtils.parseInteger(defaults == null ? null : defaults.get("port")); - String defaultPath = defaults == null ? null : defaults.get("path"); + String defaultUsername = defaults == null ? null : defaults.get(Constants.USERNAME_KEY); + String defaultPassword = defaults == null ? null : defaults.get(Constants.PASSWORD_KEY); + int defaultPort = StringUtils.parseInteger(defaults == null ? null : defaults.get(Constants.PORT_KEY)); + String defaultPath = defaults == null ? null : defaults.get(Constants.PATH_KEY); Map defaultParameters = defaults == null ? null : new HashMap(defaults); if (defaultParameters != null) { - defaultParameters.remove("protocol"); - defaultParameters.remove("username"); - defaultParameters.remove("password"); - defaultParameters.remove("host"); - defaultParameters.remove("port"); - defaultParameters.remove("path"); + defaultParameters.remove(Constants.PROTOCOL_KEY); + defaultParameters.remove(Constants.USERNAME_KEY); + defaultParameters.remove(Constants.PASSWORD_KEY); + defaultParameters.remove(Constants.HOST_KEY); + defaultParameters.remove(Constants.PORT_KEY); + defaultParameters.remove(Constants.PATH_KEY); } URL u = URL.valueOf(url); boolean changed = false; diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java index 937ed377344..c4ec8bb388b 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java @@ -296,10 +296,10 @@ protected List loadRegistries(boolean provider) { Map map = new HashMap(); appendParameters(map, application); appendParameters(map, config); - map.put("path", RegistryService.class.getName()); + map.put(Constants.PATH_KEY, RegistryService.class.getName()); appendRuntimeParameters(map); - if (!map.containsKey("protocol")) { - map.put("protocol", "dubbo"); + if (!map.containsKey(Constants.PROTOCOL_KEY)) { + map.put(Constants.PROTOCOL_KEY, Constants.DUBBO_PROTOCOL); } List urls = UrlUtils.parseURLs(address, map); diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java index 9d8e70f3f5c..36e43115bee 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java @@ -26,6 +26,7 @@ import org.apache.dubbo.rpc.ProxyFactory; import static org.apache.dubbo.common.Constants.CHECK_KEY; +import static org.apache.dubbo.common.Constants.DUBBO_PROTOCOL; import static org.apache.dubbo.common.Constants.PROTOCOL_KEY; import static org.apache.dubbo.common.Constants.REFERENCE_FILTER_KEY; @@ -48,7 +49,7 @@ public void setProxyFactory(ProxyFactory proxyFactory) { @Override protected Monitor createMonitor(URL url) { - url = url.setProtocol(url.getParameter(PROTOCOL_KEY, "dubbo")); + url = url.setProtocol(url.getParameter(PROTOCOL_KEY, DUBBO_PROTOCOL)); if (StringUtils.isEmpty(url.getPath())) { url = url.setPath(MonitorService.class.getName()); }