You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/06/03 09:52:52 UTC
[dubbo] branch master updated: Adjust constant name (#7958)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 4c2d925 Adjust constant name (#7958)
4c2d925 is described below
commit 4c2d925649e9e11300f3b16e2cacbad08f02c559
Author: 灼华 <43...@users.noreply.github.com>
AuthorDate: Thu Jun 3 17:52:40 2021 +0800
Adjust constant name (#7958)
---
.../src/main/java/org/apache/dubbo/config/Constants.java | 4 ++--
.../main/java/org/apache/dubbo/config/ProtocolConfig.java | 4 ++--
.../main/java/org/apache/dubbo/config/RegistryConfig.java | 4 ++--
.../java/org/apache/dubbo/config/context/ConfigManager.java | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java
index 55f7405..d4e90c6 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java
@@ -110,10 +110,10 @@ public interface Constants {
String SHUTDOWN_TIMEOUT_KEY = "shutdown.timeout";
- String PROTOCOLS_SUFFIX = "dubbo.protocols.";
+ String PROTOCOLS_PREFIX = "dubbo.protocols.";
- String REGISTRIES_SUFFIX = "dubbo.registries.";
+ String REGISTRIES_PREFIX = "dubbo.registries.";
String ZOOKEEPER_PROTOCOL = "zookeeper";
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
index b8af63c..daa45b5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ProtocolConfig.java
@@ -23,7 +23,7 @@ import java.util.Map;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_VERSION_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SSL_ENABLED_KEY;
-import static org.apache.dubbo.config.Constants.PROTOCOLS_SUFFIX;
+import static org.apache.dubbo.config.Constants.PROTOCOLS_PREFIX;
/**
* ProtocolConfig
@@ -530,7 +530,7 @@ public class ProtocolConfig extends AbstractConfig {
}
super.refresh();
if (StringUtils.isNotEmpty(this.getId())) {
- this.setPrefix(PROTOCOLS_SUFFIX);
+ this.setPrefix(PROTOCOLS_PREFIX);
super.refresh();
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
index d822b05..3d01240 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/RegistryConfig.java
@@ -29,7 +29,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.PREFERRED_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_KEY;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.PojoUtils.updatePropertyIfAbsent;
-import static org.apache.dubbo.config.Constants.REGISTRIES_SUFFIX;
+import static org.apache.dubbo.config.Constants.REGISTRIES_PREFIX;
/**
* RegistryConfig
@@ -510,7 +510,7 @@ public class RegistryConfig extends AbstractConfig {
public void refresh() {
super.refresh();
if (StringUtils.isNotEmpty(this.getId())) {
- this.setPrefix(REGISTRIES_SUFFIX);
+ this.setPrefix(REGISTRIES_PREFIX);
super.refresh();
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 4d2fc25..2cbc124 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -59,8 +59,8 @@ import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_KEY;
import static org.apache.dubbo.common.utils.ReflectUtils.getProperty;
import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty;
import static org.apache.dubbo.config.AbstractConfig.getTagName;
-import static org.apache.dubbo.config.Constants.PROTOCOLS_SUFFIX;
-import static org.apache.dubbo.config.Constants.REGISTRIES_SUFFIX;
+import static org.apache.dubbo.config.Constants.PROTOCOLS_PREFIX;
+import static org.apache.dubbo.config.Constants.REGISTRIES_PREFIX;
public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
@@ -262,9 +262,9 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
public Set<String> getProtocolIds() {
Set<String> protocolIds = new HashSet<>();
protocolIds.addAll(getSubProperties(ApplicationModel.getEnvironment()
- .getExternalConfigurationMap(), PROTOCOLS_SUFFIX));
+ .getExternalConfigurationMap(), PROTOCOLS_PREFIX));
protocolIds.addAll(getSubProperties(ApplicationModel.getEnvironment()
- .getAppExternalConfigurationMap(), PROTOCOLS_SUFFIX));
+ .getAppExternalConfigurationMap(), PROTOCOLS_PREFIX));
return unmodifiableSet(protocolIds);
}
@@ -297,9 +297,9 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
public Set<String> getRegistryIds() {
Set<String> registryIds = new HashSet<>();
registryIds.addAll(getSubProperties(ApplicationModel.getEnvironment().getExternalConfigurationMap(),
- REGISTRIES_SUFFIX));
+ REGISTRIES_PREFIX));
registryIds.addAll(getSubProperties(ApplicationModel.getEnvironment().getAppExternalConfigurationMap(),
- REGISTRIES_SUFFIX));
+ REGISTRIES_PREFIX));
return unmodifiableSet(registryIds);
}