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 2020/09/15 06:14:22 UTC
[dubbo] branch 3.0 updated: 3.0 migration unsubscribe (#6738)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 966b467 3.0 migration unsubscribe (#6738)
966b467 is described below
commit 966b46799a7118f31142f44dba44cbc45170b09c
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Sep 15 14:14:02 2020 +0800
3.0 migration unsubscribe (#6738)
---
.../org/apache/dubbo/config/AbstractInterfaceConfig.java | 11 +++++++++--
.../main/java/org/apache/dubbo/config/ApplicationConfig.java | 12 ++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 970a6ae..cbab17a 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -451,11 +451,18 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
this.layer = layer;
}
+ /**
+ * Always use the global ApplicationConfig
+ */
public ApplicationConfig getApplication() {
- if (application != null) {
+ ApplicationConfig globalApplication = ApplicationModel.getConfigManager().getApplicationOrElseThrow();
+ if (globalApplication == null) {
+ return application;
+ }
+ if (application != null && !application.getName().equals(globalApplication.getName())) {
return application;
}
- return ApplicationModel.getConfigManager().getApplicationOrElseThrow();
+ return globalApplication;
}
@Deprecated
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
index 7e54e42..06bf05e 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/ApplicationConfig.java
@@ -42,6 +42,7 @@ import static org.apache.dubbo.common.constants.QosConstants.ACCEPT_FOREIGN_IP;
import static org.apache.dubbo.common.constants.QosConstants.QOS_ENABLE;
import static org.apache.dubbo.common.constants.QosConstants.QOS_HOST;
import static org.apache.dubbo.common.constants.QosConstants.QOS_PORT;
+import static org.apache.dubbo.common.constants.RegistryConstants.REGISTRY_PUBLISH_INTERFACE_KEY;
import static org.apache.dubbo.config.Constants.DEVELOPMENT_ENVIRONMENT;
import static org.apache.dubbo.config.Constants.PRODUCTION_ENVIRONMENT;
import static org.apache.dubbo.config.Constants.TEST_ENVIRONMENT;
@@ -159,6 +160,8 @@ public class ApplicationConfig extends AbstractConfig {
private String repository;
+ private Boolean publishInterface;
+
public ApplicationConfig() {
}
@@ -445,6 +448,15 @@ public class ApplicationConfig extends AbstractConfig {
this.repository = repository;
}
+ @Parameter(key = REGISTRY_PUBLISH_INTERFACE_KEY)
+ public Boolean getPublishInterface() {
+ return publishInterface;
+ }
+
+ public void setPublishInterface(Boolean publishInterface) {
+ this.publishInterface = publishInterface;
+ }
+
@Override
public void refresh() {
super.refresh();