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/29 03:54:31 UTC
[dubbo] branch 3.0-multi-instances updated: Fix setApplicationModel
override issue of MetadataServiceNameMapping
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
The following commit(s) were added to refs/heads/3.0-multi-instances by this push:
new c92f563 Fix setApplicationModel override issue of MetadataServiceNameMapping
c92f563 is described below
commit c92f56319b58c95f882c8e913bf488ca8f676cc9
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Aug 29 11:54:01 2021 +0800
Fix setApplicationModel override issue of MetadataServiceNameMapping
---
.../dubbo/registry/client/metadata/MetadataServiceNameMapping.java | 2 +-
.../apache/dubbo/registry/client/migration/MigrationInvokerTest.java | 1 +
.../dubbo/registry/client/migration/MigrationRuleListenerTest.java | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
index dd69e02..a0cf07d 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
@@ -114,7 +114,7 @@ public class MetadataServiceNameMapping extends AbstractServiceNameMapping imple
@Override
public void setApplicationModel(ApplicationModel applicationModel) {
- this.applicationModel = applicationModel;
+ super.setApplicationModel(applicationModel);
metadataReportInstance = applicationModel.getBeanFactory().getBean(MetadataReportInstance.class);
}
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
index 85c5d7a..653fd85 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationInvokerTest.java
@@ -39,6 +39,7 @@ import java.util.List;
public class MigrationInvokerTest {
@BeforeEach
public void before() {
+ ApplicationModel.reset();
ApplicationConfig applicationConfig = new ApplicationConfig();
applicationConfig.setName("Test");
ApplicationModel.defaultModel().getConfigManager().setApplication(applicationConfig);
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
index b49995d..2b00b89 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/migration/MigrationRuleListenerTest.java
@@ -45,6 +45,7 @@ public class MigrationRuleListenerTest {
DynamicConfiguration dynamicConfiguration = Mockito.mock(DynamicConfiguration.class);
+ ApplicationModel.reset();
ApplicationModel.defaultModel().getEnvironment().setDynamicConfiguration(dynamicConfiguration);
ApplicationModel.defaultModel().getEnvironment().setLocalMigrationRule(rule);
ApplicationConfig applicationConfig = new ApplicationConfig();
@@ -61,6 +62,7 @@ public class MigrationRuleListenerTest {
MigrationRuleListener migrationRuleListener = new MigrationRuleListener();
MigrationInvoker<?> migrationInvoker = Mockito.mock(MigrationInvoker.class);
migrationRuleListener.getHandlers().put(migrationInvoker, handler);
+ migrationRuleListener.setApplicationModel(ApplicationModel.defaultModel());
Thread.sleep(5000);
Mockito.verify(handler, Mockito.timeout(5000)).doMigrate(Mockito.any());