This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch dev-metadata in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 708cdb5678256b0dfbafa87e086def4f22e352de Author: ken.lj <[email protected]> AuthorDate: Thu Nov 8 14:22:59 2018 +0800 Remove default group in DynamicConfiguration API --- .../org/apache/dubbo/governance/AbstractDynamicConfiguration.java | 5 ++--- .../dubbo/governance/support/apollo/ApolloDynamicConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java b/dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java index 146f0a1..e3c7077 100644 --- a/dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java +++ b/dubbo-governance/dubbo-governance-api/src/main/java/org/apache/dubbo/governance/AbstractDynamicConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.governance; -import org.apache.dubbo.common.Constants; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.config.AbstractConfiguration; @@ -46,7 +45,7 @@ public abstract class AbstractDynamicConfiguration<TargetConfigListener> extends @Override public String getConfig(String key) { - return getConfig(key, url.getParameter(Constants.CONFIG_GROUP_KEY, DEFAULT_GROUP), null); + return getConfig(key, null, null); } @Override @@ -56,7 +55,7 @@ public abstract class AbstractDynamicConfiguration<TargetConfigListener> extends @Override public String getConfig(String key, ConfigurationListener listener) { - return getConfig(key, url.getParameter(Constants.CONFIG_GROUP_KEY, DEFAULT_GROUP), listener); + return getConfig(key, null, listener); } @Override diff --git a/dubbo-governance/dubbo-governance-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java b/dubbo-governance/dubbo-governance-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java index b236709..749f290 100644 --- a/dubbo-governance/dubbo-governance-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java +++ b/dubbo-governance/dubbo-governance-apollo/src/main/java/org/apache/dubbo/governance/support/apollo/ApolloDynamicConfiguration.java @@ -97,7 +97,7 @@ public class ApolloDynamicConfiguration extends AbstractDynamicConfiguration<Con */ @Override protected String getInternalProperty(String key, String group, long timeout) { - if (DEFAULT_GROUP.equals(group)) { + if (StringUtils.isNotEmpty(group) && !url.getParameter(Constants.CONFIG_GROUP_KEY, DEFAULT_GROUP).equals(group)) { Config config = ConfigService.getConfig(group); if (config != null) { return config.getProperty(key, null);
