This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 6d3e765 Replace hard code strings with constants (#3803)
6d3e765 is described below
commit 6d3e765adbc3c9236073c1dbc824971a3d2517db
Author: Duncan-tree-zhou <[email protected]>
AuthorDate: Thu Apr 4 11:14:25 2019 +0800
Replace hard code strings with constants (#3803)
---
.../main/java/org/apache/dubbo/common/Constants.java | 10 ++++++++++
.../apache/dubbo/config/AbstractInterfaceConfig.java | 18 +++++++++---------
.../java/org/apache/dubbo/config/ProviderConfig.java | 4 ++--
.../java/org/apache/dubbo/config/ReferenceConfig.java | 8 ++++----
.../java/org/apache/dubbo/config/RegistryConfig.java | 8 ++++----
.../java/org/apache/dubbo/config/ServiceConfig.java | 4 ++--
6 files changed, 31 insertions(+), 21 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 3f48821..b43c532 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
@@ -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
index 4269924..082a0c1 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
@@ -347,8 +347,8 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
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 abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
*/
@Deprecated
public void setLocal(String local) {
- checkName("local", local);
+ checkName(Constants.LOCAL_KEY, local);
this.local = local;
}
@@ -641,7 +641,7 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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 abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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 abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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 abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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 abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
}
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
index e6540c0..bc5c31d 100644
---
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 class ProviderConfig extends AbstractServiceConfig {
}
public void setContextpath(String contextpath) {
- checkPathName("contextpath", contextpath);
+ checkPathName(Constants.CONTEXTPATH_KEY, contextpath);
this.contextpath = contextpath;
}
@@ -322,7 +322,7 @@ public class ProviderConfig extends AbstractServiceConfig {
}
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
index 4e98706..d265399 100644
---
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 @@ public class ReferenceConfig<T> extends
AbstractReferenceConfig {
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 class ReferenceConfig<T> extends
AbstractReferenceConfig {
}
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
index 43d683c..9945187 100644
---
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 class RegistryConfig extends AbstractConfig {
}
public void setUsername(String username) {
- checkName("username", username);
+ checkName(Constants.USERNAME_KEY, username);
this.username = username;
}
@@ -199,7 +199,7 @@ public class RegistryConfig extends AbstractConfig {
}
public void setPassword(String password) {
- checkLength("password", password);
+ checkLength(Constants.PASSWORD_KEY, password);
this.password = password;
}
@@ -239,7 +239,7 @@ public class RegistryConfig extends AbstractConfig {
}
public void setFile(String file) {
- checkPathLength("file", file);
+ checkPathLength(Constants.FILE_KEY, file);
this.file = file;
}
@@ -293,7 +293,7 @@ public class RegistryConfig extends AbstractConfig {
}
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
index 8f822b5..24d6b83 100644
---
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 @@ public class ServiceConfig<T> extends AbstractServiceConfig
{
} 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 @@ public class ServiceConfig<T> extends AbstractServiceConfig
{
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;
}
