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/08/31 17:09:14 UTC
[dubbo] 04/04: Add Scope Model check
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 185a1d182cc8bb58bc15400de4ed250edbb1fd00
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Sep 1 01:05:15 2021 +0800
Add Scope Model check
---
.../src/main/java/org/apache/dubbo/config/ServiceConfig.java | 2 +-
.../java/org/apache/dubbo/metadata/ServiceNameMapping.java | 6 +++++-
.../dubbo/registry/client/migration/model/MigrationRule.java | 10 +++++-----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index ec49581..d3f9e7d 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -253,7 +253,7 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
List<URL> exportedURLs = this.getExportedUrls();
exportedURLs.forEach(url -> {
if (url.getParameters().containsKey(SERVICE_NAME_MAPPING_KEY)) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(getScopeModel());
try {
boolean succeeded = serviceNameMapping.map(url);
if (succeeded) {
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java
index fe5a933..96dca1a 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/ServiceNameMapping.java
@@ -56,7 +56,11 @@ public interface ServiceNameMapping {
}
static ServiceNameMapping getDefaultExtension(ScopeModel scopeModel) {
- return scopeModel.getDefaultExtension(ServiceNameMapping.class);
+ if (scopeModel != null) {
+ return scopeModel.getDefaultExtension(ServiceNameMapping.class);
+ } else {
+ return getExtensionLoader(ServiceNameMapping.class).getDefaultExtension();
+ }
}
static String buildMappingKey(URL url) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/model/MigrationRule.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/model/MigrationRule.java
index 247f159..27a51fc 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/model/MigrationRule.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/model/MigrationRule.java
@@ -151,7 +151,7 @@ public class MigrationRule {
}
if (applications != null) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(consumerURL.getScopeModel());
Set<String> services = serviceNameMapping.getServices(consumerURL);
if (CollectionUtils.isNotEmpty(services)) {
for (String service : services) {
@@ -192,7 +192,7 @@ public class MigrationRule {
}
if (applications != null) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(consumerURL.getScopeModel());
Set<String> services = serviceNameMapping.getServices(consumerURL);
if (CollectionUtils.isNotEmpty(services)) {
for (String service : services) {
@@ -232,7 +232,7 @@ public class MigrationRule {
}
if (applications != null) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(consumerURL.getScopeModel());
Set<String> services = serviceNameMapping.getServices(consumerURL);
if (CollectionUtils.isNotEmpty(services)) {
for (String service : services) {
@@ -268,7 +268,7 @@ public class MigrationRule {
}
if (applications != null) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(consumerURL.getScopeModel());
Set<String> services = serviceNameMapping.getServices(consumerURL);
if (CollectionUtils.isNotEmpty(services)) {
for (String service : services) {
@@ -308,7 +308,7 @@ public class MigrationRule {
}
if (applications != null) {
- ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension();
+ ServiceNameMapping serviceNameMapping = ServiceNameMapping.getDefaultExtension(consumerURL.getScopeModel());
Set<String> services = serviceNameMapping.getServices(consumerURL);
if (CollectionUtils.isNotEmpty(services)) {
for (String service : services) {