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/03/14 08:58:03 UTC
[dubbo] branch 2.6.x updated: Dubbo qos command not work to offline
provider (#6683)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new 951d306 Dubbo qos command not work to offline provider (#6683)
951d306 is described below
commit 951d30644ad624a2b7564313650fe8c3480dfd86
Author: qixiaobo <qi...@gmail.com>
AuthorDate: Sun Mar 14 16:57:47 2021 +0800
Dubbo qos command not work to offline provider (#6683)
---
.../main/java/com/alibaba/dubbo/config/ReferenceConfig.java | 11 +++++++++++
.../main/java/com/alibaba/dubbo/config/ServiceConfig.java | 12 ++++++++++++
2 files changed, 23 insertions(+)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index 9a9226f..8be61c5 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -538,14 +538,25 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
@Parameter(excluded = true)
public String getUniqueServiceName() {
StringBuilder buf = new StringBuilder();
+ String group = getGroup();
if (group != null && group.length() > 0) {
buf.append(group).append("/");
}
buf.append(interfaceName);
+ String version = getVersion();
if (version != null && version.length() > 0) {
buf.append(":").append(version);
}
return buf.toString();
}
+ @Override
+ public String getVersion() {
+ return StringUtils.isEmpty(this.version) ? (consumer != null ? consumer.getVersion() : this.version) : this.version;
+ }
+
+ @Override
+ public String getGroup() {
+ return StringUtils.isEmpty(this.group) ? (consumer != null ? consumer.getGroup() : this.group) : this.group;
+ }
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index 3f971df..705ef53 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -854,13 +854,25 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
@Parameter(excluded = true)
public String getUniqueServiceName() {
StringBuilder buf = new StringBuilder();
+ String group = getGroup();
if (group != null && group.length() > 0) {
buf.append(group).append("/");
}
buf.append(interfaceName);
+ String version = getVersion();
if (version != null && version.length() > 0) {
buf.append(":").append(version);
}
return buf.toString();
}
+
+ @Override
+ public String getVersion() {
+ return StringUtils.isEmpty(this.version) ? (provider != null ? provider.getVersion() : this.version) : this.version;
+ }
+
+ @Override
+ public String getGroup() {
+ return StringUtils.isEmpty(this.group) ? (provider != null ? provider.getGroup() : this.group) : this.group;
+ }
}