You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2018/11/08 06:23:10 UTC
[incubator-dubbo] branch dev-metadata updated (d85550a -> 708cdb5)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from d85550a Merge branch 'dev-metadata' of https://github.com/apache/incubator-dubbo into dev-metadata
new 546b135 override url in directory
new 708cdb5 Remove default group in DynamicConfiguration API
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dubbo/governance/AbstractDynamicConfiguration.java | 5 ++---
.../support/apollo/ApolloDynamicConfiguration.java | 2 +-
.../dubbo/registry/integration/RegistryDirectory.java | 17 ++++++++++++++---
3 files changed, 17 insertions(+), 7 deletions(-)
[incubator-dubbo] 02/02: Remove default group in
DynamicConfiguration API
Posted by li...@apache.org.
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 <ke...@gmail.com>
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);
[incubator-dubbo] 01/02: override url in directory
Posted by li...@apache.org.
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 546b1353c298462382776bc1563462a1ac7d8dbb
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Nov 7 14:12:20 2018 +0800
override url in directory
---
.../dubbo/registry/integration/RegistryDirectory.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index a69192c..9ab35e6 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.governance.ConfigChangeEvent;
@@ -278,16 +279,26 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
List<Router> routers = toRouters(routerUrls);
addRouters(routers);
}
- List<Configurator> localConfigurators = this.configurators; // local reference
// merge override parameters
this.overrideDirectoryUrl = directoryUrl;
+ List<Configurator> localConfigurators = this.configurators; // local reference
if (localConfigurators != null && !localConfigurators.isEmpty()) {
for (Configurator configurator : localConfigurators) {
this.overrideDirectoryUrl = configurator.configure(overrideDirectoryUrl);
}
}
- // FIXME should we apply dynamicConfigurators to overrideDirectoryUrl?
-
+ List<Configurator> localAppDynamicConfigurators = this.appDynamicConfigurators; // local reference
+ if (CollectionUtils.isNotEmpty(localAppDynamicConfigurators)) {
+ localAppDynamicConfigurators.forEach(configurator -> {
+ this.overrideDirectoryUrl = configurator.configure(overrideDirectoryUrl);
+ });
+ }
+ List<Configurator> localDynamicConfigurators = this.dynamicConfigurators; // local reference
+ if (CollectionUtils.isNotEmpty(localDynamicConfigurators)) {
+ localDynamicConfigurators.forEach(configurator -> {
+ this.overrideDirectoryUrl = configurator.configure(overrideDirectoryUrl);
+ });
+ }
// providers
refreshInvoker(invokerUrls);
}