replace magic string "dubbo" with constants (#3602)

kezhenxu94 · lixiaojiee · commit 6a7028446bcd · 2019-03-06T18:59:35.000+08:00
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
@@ -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
@@ -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<String, String> toMap() {
         Map<String, String> map = new HashMap<String, String>(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
@@ -63,22 +63,22 @@ public static URL parseURL(String address, Map<String, String> 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<String, String> defaultParameters = defaults == null ? null : new HashMap<String, String>(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
@@ -296,10 +296,10 @@ protected List<URL> loadRegistries(boolean provider) {
                     Map<String, String> map = new HashMap<String, String>();
                     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<URL> 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
@@ -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());
         }

Original file line number	Diff line number	Diff line change
`@@ -1122,22 +1122,22 @@ public URL clearParameters() {`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`	`1124`	`public String getRawParameter(String key) {`
`1125`		`- if ("protocol".equals(key)) {`
	`1125`	`+ if (Constants.PROTOCOL_KEY.equals(key)) {`
`1126`	`1126`	`return protocol;`
`1127`	`1127`	`}`
`1128`		`- if ("username".equals(key)) {`
	`1128`	`+ if (Constants.USERNAME_KEY.equals(key)) {`
`1129`	`1129`	`return username;`
`1130`	`1130`	`}`
`1131`		`- if ("password".equals(key)) {`
	`1131`	`+ if (Constants.PASSWORD_KEY.equals(key)) {`
`1132`	`1132`	`return password;`
`1133`	`1133`	`}`
`1134`		`- if ("host".equals(key)) {`
	`1134`	`+ if (Constants.HOST_KEY.equals(key)) {`
`1135`	`1135`	`return host;`
`1136`	`1136`	`}`
`1137`		`- if ("port".equals(key)) {`
	`1137`	`+ if (Constants.PORT_KEY.equals(key)) {`
`1138`	`1138`	`return String.valueOf(port);`
`1139`	`1139`	`}`
`1140`		`- if ("path".equals(key)) {`
	`1140`	`+ if (Constants.PATH_KEY.equals(key)) {`
`1141`	`1141`	`return path;`
`1142`	`1142`	`}`
`1143`	`1143`	`return getParameter(key);`
`@@ -1146,22 +1146,22 @@ public String getRawParameter(String key) {`
`1146`	`1146`	`public Map<String, String> toMap() {`
`1147`	`1147`	`Map<String, String> map = new HashMap<String, String>(parameters);`
`1148`	`1148`	`if (protocol != null) {`
`1149`		`- map.put("protocol", protocol);`
	`1149`	`+ map.put(Constants.PROTOCOL_KEY, protocol);`
`1150`	`1150`	`}`
`1151`	`1151`	`if (username != null) {`
`1152`		`- map.put("username", username);`
	`1152`	`+ map.put(Constants.USERNAME_KEY, username);`
`1153`	`1153`	`}`
`1154`	`1154`	`if (password != null) {`
`1155`		`- map.put("password", password);`
	`1155`	`+ map.put(Constants.USERNAME_KEY, password);`
`1156`	`1156`	`}`
`1157`	`1157`	`if (host != null) {`
`1158`		`- map.put("host", host);`
	`1158`	`+ map.put(Constants.HOST_KEY, host);`
`1159`	`1159`	`}`
`1160`	`1160`	`if (port > 0) {`
`1161`		`- map.put("port", String.valueOf(port));`
	`1161`	`+ map.put(Constants.PORT_KEY, String.valueOf(port));`
`1162`	`1162`	`}`
`1163`	`1163`	`if (path != null) {`
`1164`		`- map.put("path", path);`
	`1164`	`+ map.put(Constants.PATH_KEY, path);`
`1165`	`1165`	`}`
`1166`	`1166`	`return map;`
`1167`	`1167`	`}`