Replace hard code strings with constants (#3803)

Duncan-tree-zhou · ralf0131 · commit 6d3e765adbc3 · 2019-04-04T11:14:25.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
@@ -79,6 +79,14 @@ public class Constants {
 
     public static final String DYNAMIC_KEY = "dynamic";
 
+    public static final String STATUS_KEY = "status";
+
+    public static final String CONTEXTPATH_KEY = "contextpath";
+
+    public static final String LISTENER_KEY = "listener";
+
+    public static final String LAYER_KEY = "layer";
+
     public static final String DUBBO_PROPERTIES_KEY = "dubbo.properties.file";
 
     public static final String DEFAULT_DUBBO_PROPERTIES = "dubbo.properties";
@@ -247,6 +255,8 @@ public class Constants {
 
     public static final String PROTOCOL_KEY = "protocol";
 
+    public static final String LOGSTAT_PROTOCOL = "logstat";
+
     public static final String DUBBO_PROTOCOL = DUBBO;
 
     public static final String ZOOKEEPER_PROTOCOL = "zookeeper";
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
@@ -347,8 +347,8 @@ protected URL loadMonitor(URL registryURL) {
         }
         if (ConfigUtils.isNotEmpty(address)) {
             if (!map.containsKey(Constants.PROTOCOL_KEY)) {
-                if (getExtensionLoader(MonitorFactory.class).hasExtension("logstat")) {
-                    map.put(Constants.PROTOCOL_KEY, "logstat");
+                if (getExtensionLoader(MonitorFactory.class).hasExtension(Constants.LOGSTAT_PROTOCOL)) {
+                    map.put(Constants.PROTOCOL_KEY, Constants.LOGSTAT_PROTOCOL);
                 } else {
                     map.put(Constants.PROTOCOL_KEY, Constants.DUBBO_PROTOCOL);
                 }
@@ -509,7 +509,7 @@ private void convertRegistryIdsToRegistries() {
             configedRegistries.addAll(getSubProperties(Environment.getInstance().getAppExternalConfigurationMap(),
                     Constants.REGISTRIES_SUFFIX));
 
-            registryIds = String.join(",", configedRegistries);
+            registryIds = String.join(Constants.COMMA_SEPARATOR, configedRegistries);
         }
 
         if (StringUtils.isEmpty(registryIds)) {
@@ -615,7 +615,7 @@ public void setLocal(Boolean local) {
      */
     @Deprecated
     public void setLocal(String local) {
-        checkName("local", local);
+        checkName(Constants.LOCAL_KEY, local);
         this.local = local;
     }
 
@@ -641,7 +641,7 @@ public String getCluster() {
     }
 
     public void setCluster(String cluster) {
-        checkExtension(Cluster.class, "cluster", cluster);
+        checkExtension(Cluster.class, Constants.CLUSTER_KEY, cluster);
         this.cluster = cluster;
     }
 
@@ -650,7 +650,7 @@ public String getProxy() {
     }
 
     public void setProxy(String proxy) {
-        checkExtension(ProxyFactory.class, "proxy", proxy);
+        checkExtension(ProxyFactory.class, Constants.PROXY_KEY, proxy);
         this.proxy = proxy;
     }
 
@@ -668,7 +668,7 @@ public String getFilter() {
     }
 
     public void setFilter(String filter) {
-        checkMultiExtension(Filter.class, "filter", filter);
+        checkMultiExtension(Filter.class, Constants.FILE_KEY, filter);
         this.filter = filter;
     }
 
@@ -678,7 +678,7 @@ public String getListener() {
     }
 
     public void setListener(String listener) {
-        checkMultiExtension(InvokerListener.class, "listener", listener);
+        checkMultiExtension(InvokerListener.class, Constants.LISTENER_KEY, listener);
         this.listener = listener;
     }
 
@@ -687,7 +687,7 @@ public String getLayer() {
     }
 
     public void setLayer(String layer) {
-        checkNameHasSymbol("layer", layer);
+        checkNameHasSymbol(Constants.LAYER_KEY, layer);
         this.layer = layer;
     }
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java
@@ -206,7 +206,7 @@ public String getContextpath() {
     }
 
     public void setContextpath(String contextpath) {
-        checkPathName("contextpath", contextpath);
+        checkPathName(Constants.CONTEXTPATH_KEY, contextpath);
         this.contextpath = contextpath;
     }
 
@@ -322,7 +322,7 @@ public String getStatus() {
     }
 
     public void setStatus(String status) {
-        checkMultiExtension(StatusChecker.class, "status", status);
+        checkMultiExtension(StatusChecker.class, Constants.STATUS_KEY, status);
         this.status = status;
     }
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -264,15 +264,15 @@ private void init() {
         if (!isGeneric()) {
             String revision = Version.getVersion(interfaceClass, version);
             if (revision != null && revision.length() > 0) {
-                map.put("revision", revision);
+                map.put(Constants.REVISION_KEY, revision);
             }
 
             String[] methods = Wrapper.getWrapper(interfaceClass).getMethodNames();
             if (methods.length == 0) {
                 logger.warn("No method found in service interface " + interfaceClass.getName());
-                map.put("methods", Constants.ANY_VALUE);
+                map.put(Constants.METHODS_KEY, Constants.ANY_VALUE);
             } else {
-                map.put("methods", StringUtils.join(new HashSet<String>(Arrays.asList(methods)), ","));
+                map.put(Constants.METHODS_KEY, StringUtils.join(new HashSet<String>(Arrays.asList(methods)), Constants.COMMA_SEPARATOR));
             }
         }
         map.put(Constants.INTERFACE_KEY, interfaceName);
@@ -558,7 +558,7 @@ public String getClient() {
     }
 
     public void setClient(String client) {
-        checkName("client", client);
+        checkName(Constants.CLIENT_KEY, client);
         this.client = client;
     }
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java
@@ -190,7 +190,7 @@ public String getUsername() {
     }
 
     public void setUsername(String username) {
-        checkName("username", username);
+        checkName(Constants.USERNAME_KEY, username);
         this.username = username;
     }
 
@@ -199,7 +199,7 @@ public String getPassword() {
     }
 
     public void setPassword(String password) {
-        checkLength("password", password);
+        checkLength(Constants.PASSWORD_KEY, password);
         this.password = password;
     }
 
@@ -239,7 +239,7 @@ public String getFile() {
     }
 
     public void setFile(String file) {
-        checkPathLength("file", file);
+        checkPathLength(Constants.FILE_KEY, file);
         this.file = file;
     }
 
@@ -293,7 +293,7 @@ public String getClient() {
     }
 
     public void setClient(String client) {
-        checkName("client", client);
+        checkName(Constants.CLIENT_KEY, client);
         /*if(client != null && client.length() > 0 && ! ExtensionLoader.getExtensionLoader(Transporter.class).hasExtension(client)){
             throw new IllegalStateException("No such client type : " + client);
         }*/
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -494,7 +494,7 @@ private void doExportUrlsFor1Protocol(ProtocolConfig protocolConfig, List<URL> r
         } else {
             String revision = Version.getVersion(interfaceClass, version);
             if (revision != null && revision.length() > 0) {
-                map.put("revision", revision);
+                map.put(Constants.REVISION_KEY, revision);
             }
 
             String[] methods = Wrapper.getWrapper(interfaceClass).getMethodNames();
@@ -655,7 +655,7 @@ private String findConfigedHosts(ProtocolConfig protocolConfig, List<URL> regist
     private String findHostToBindByConnectRegistries(List<URL> registryURLs) {
         if (CollectionUtils.isNotEmpty(registryURLs)) {
             for (URL registryURL : registryURLs) {
-                if (Constants.MULTICAST.equalsIgnoreCase(registryURL.getParameter("registry"))) {
+                if (Constants.MULTICAST.equalsIgnoreCase(registryURL.getParameter(Constants.REGISTRY_KEY))) {
                     // skip multicast registry since we cannot connect to it via Socket
                     continue;
                 }

Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,8 @@ protected URL loadMonitor(URL registryURL) {`
`347`	`347`	`}`
`348`	`348`	`if (ConfigUtils.isNotEmpty(address)) {`
`349`	`349`	`if (!map.containsKey(Constants.PROTOCOL_KEY)) {`
`350`		`- if (getExtensionLoader(MonitorFactory.class).hasExtension("logstat")) {`
`351`		`- map.put(Constants.PROTOCOL_KEY, "logstat");`
	`350`	`+ if (getExtensionLoader(MonitorFactory.class).hasExtension(Constants.LOGSTAT_PROTOCOL)) {`
	`351`	`+ map.put(Constants.PROTOCOL_KEY, Constants.LOGSTAT_PROTOCOL);`
`352`	`352`	`} else {`
`353`	`353`	`map.put(Constants.PROTOCOL_KEY, Constants.DUBBO_PROTOCOL);`
`354`	`354`	`}`
`@@ -509,7 +509,7 @@ private void convertRegistryIdsToRegistries() {`
`509`	`509`	`configedRegistries.addAll(getSubProperties(Environment.getInstance().getAppExternalConfigurationMap(),`
`510`	`510`	`Constants.REGISTRIES_SUFFIX));`
`511`	`511`
`512`		`- registryIds = String.join(",", configedRegistries);`
	`512`	`+ registryIds = String.join(Constants.COMMA_SEPARATOR, configedRegistries);`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`if (StringUtils.isEmpty(registryIds)) {`
`@@ -615,7 +615,7 @@ public void setLocal(Boolean local) {`
`615`	`615`	`*/`
`616`	`616`	`@Deprecated`
`617`	`617`	`public void setLocal(String local) {`
`618`		`- checkName("local", local);`
	`618`	`+ checkName(Constants.LOCAL_KEY, local);`
`619`	`619`	`this.local = local;`
`620`	`620`	`}`
`621`	`621`
`@@ -641,7 +641,7 @@ public String getCluster() {`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`public void setCluster(String cluster) {`
`644`		`- checkExtension(Cluster.class, "cluster", cluster);`
	`644`	`+ checkExtension(Cluster.class, Constants.CLUSTER_KEY, cluster);`
`645`	`645`	`this.cluster = cluster;`
`646`	`646`	`}`
`647`	`647`
`@@ -650,7 +650,7 @@ public String getProxy() {`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`public void setProxy(String proxy) {`
`653`		`- checkExtension(ProxyFactory.class, "proxy", proxy);`
	`653`	`+ checkExtension(ProxyFactory.class, Constants.PROXY_KEY, proxy);`
`654`	`654`	`this.proxy = proxy;`
`655`	`655`	`}`
`656`	`656`
`@@ -668,7 +668,7 @@ public String getFilter() {`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`public void setFilter(String filter) {`
`671`		`- checkMultiExtension(Filter.class, "filter", filter);`
	`671`	`+ checkMultiExtension(Filter.class, Constants.FILE_KEY, filter);`
`672`	`672`	`this.filter = filter;`
`673`	`673`	`}`
`674`	`674`
`@@ -678,7 +678,7 @@ public String getListener() {`
`678`	`678`	`}`
`679`	`679`
`680`	`680`	`public void setListener(String listener) {`
`681`		`- checkMultiExtension(InvokerListener.class, "listener", listener);`
	`681`	`+ checkMultiExtension(InvokerListener.class, Constants.LISTENER_KEY, listener);`
`682`	`682`	`this.listener = listener;`
`683`	`683`	`}`
`684`	`684`
`@@ -687,7 +687,7 @@ public String getLayer() {`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`public void setLayer(String layer) {`
`690`		`- checkNameHasSymbol("layer", layer);`
	`690`	`+ checkNameHasSymbol(Constants.LAYER_KEY, layer);`
`691`	`691`	`this.layer = layer;`
`692`	`692`	`}`
`693`	`693`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public String getContextpath() {`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`public void setContextpath(String contextpath) {`
`209`		`- checkPathName("contextpath", contextpath);`
	`209`	`+ checkPathName(Constants.CONTEXTPATH_KEY, contextpath);`
`210`	`210`	`this.contextpath = contextpath;`
`211`	`211`	`}`
`212`	`212`
`@@ -322,7 +322,7 @@ public String getStatus() {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`public void setStatus(String status) {`
`325`		`- checkMultiExtension(StatusChecker.class, "status", status);`
	`325`	`+ checkMultiExtension(StatusChecker.class, Constants.STATUS_KEY, status);`
`326`	`326`	`this.status = status;`
`327`	`327`	`}`
`328`	`328`
Original file line number	Diff line number	Diff line change
`@@ -264,15 +264,15 @@ private void init() {`
`264`	`264`	`if (!isGeneric()) {`
`265`	`265`	`String revision = Version.getVersion(interfaceClass, version);`
`266`	`266`	`if (revision != null && revision.length() > 0) {`
`267`		`- map.put("revision", revision);`
	`267`	`+ map.put(Constants.REVISION_KEY, revision);`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`String[] methods = Wrapper.getWrapper(interfaceClass).getMethodNames();`
`271`	`271`	`if (methods.length == 0) {`
`272`	`272`	`logger.warn("No method found in service interface " + interfaceClass.getName());`
`273`		`- map.put("methods", Constants.ANY_VALUE);`
	`273`	`+ map.put(Constants.METHODS_KEY, Constants.ANY_VALUE);`
`274`	`274`	`} else {`
`275`		`- map.put("methods", StringUtils.join(new HashSet<String>(Arrays.asList(methods)), ","));`
	`275`	`+ map.put(Constants.METHODS_KEY, StringUtils.join(new HashSet<String>(Arrays.asList(methods)), Constants.COMMA_SEPARATOR));`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`	`map.put(Constants.INTERFACE_KEY, interfaceName);`
`@@ -558,7 +558,7 @@ public String getClient() {`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`public void setClient(String client) {`
`561`		`- checkName("client", client);`
	`561`	`+ checkName(Constants.CLIENT_KEY, client);`
`562`	`562`	`this.client = client;`
`563`	`563`	`}`
`564`	`564`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public String getUsername() {`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`public void setUsername(String username) {`
`193`		`- checkName("username", username);`
	`193`	`+ checkName(Constants.USERNAME_KEY, username);`
`194`	`194`	`this.username = username;`
`195`	`195`	`}`
`196`	`196`
`@@ -199,7 +199,7 @@ public String getPassword() {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`public void setPassword(String password) {`
`202`		`- checkLength("password", password);`
	`202`	`+ checkLength(Constants.PASSWORD_KEY, password);`
`203`	`203`	`this.password = password;`
`204`	`204`	`}`
`205`	`205`
`@@ -239,7 +239,7 @@ public String getFile() {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`public void setFile(String file) {`
`242`		`- checkPathLength("file", file);`
	`242`	`+ checkPathLength(Constants.FILE_KEY, file);`
`243`	`243`	`this.file = file;`
`244`	`244`	`}`
`245`	`245`
`@@ -293,7 +293,7 @@ public String getClient() {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`public void setClient(String client) {`
`296`		`- checkName("client", client);`
	`296`	`+ checkName(Constants.CLIENT_KEY, client);`
`297`	`297`	`/*if(client != null && client.length() > 0 && ! ExtensionLoader.getExtensionLoader(Transporter.class).hasExtension(client)){`
`298`	`298`	`throw new IllegalStateException("No such client type : " + client);`
`299`	`299`	`}*/`