[dubbo] branch 3.0 updated: Optimize configuration item key (#10006)

[liujun]

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 ec98ff364c Optimize configuration item key (#10006)
ec98ff364c is described below

commit ec98ff364cb58f0fad82dda044cbcc0604c098c0
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon May 9 10:02:13 2022 +0800

    Optimize configuration item key (#10006)
---
 .../registry/client/migration/MigrationRuleHandler.java     |  2 +-
 .../registry/client/migration/model/MigrationRule.java      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
index 30fc819575..6d99dae252 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleHandler.java
@@ -24,7 +24,7 @@ import 
org.apache.dubbo.registry.client.migration.model.MigrationRule;
 import org.apache.dubbo.registry.client.migration.model.MigrationStep;
 
 public class MigrationRuleHandler<T> {
-    public static final String DUBBO_SERVICEDISCOVERY_MIGRATION = 
"dubbo.application.service-discovery.migration";
+    public static final String DUBBO_SERVICEDISCOVERY_MIGRATION = 
"dubbo.application.migration.step";
     private static final Logger logger = 
LoggerFactory.getLogger(MigrationRuleHandler.class);
 
     private MigrationClusterInvoker<T> migrationInvoker;
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 8be1e682db..2c5dfea956 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
@@ -19,6 +19,7 @@ package org.apache.dubbo.registry.client.migration.model;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.ConfigurationUtils;
 import org.apache.dubbo.common.utils.CollectionUtils;
+import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.metadata.ServiceNameMapping;
 
 import org.yaml.snakeyaml.Yaml;
@@ -180,13 +181,21 @@ public class MigrationRule {
             // initial step : APPLICATION_FIRST
             step = MigrationStep.APPLICATION_FIRST;
             step = Enum.valueOf(MigrationStep.class,
-                consumerURL.getParameter(MIGRATION_STEP_KEY,
-                    
ConfigurationUtils.getCachedDynamicProperty(consumerURL.getScopeModel(), 
DUBBO_SERVICEDISCOVERY_MIGRATION, step.name())));
+                consumerURL.getParameter(MIGRATION_STEP_KEY, 
getDefaultStep(consumerURL, step.name())));
         }
 
         return step;
     }
 
+    private String getDefaultStep(URL consumerURL, String defaultStep) {
+        String globalDefaultStep = 
ConfigurationUtils.getCachedDynamicProperty(consumerURL.getScopeModel(), 
DUBBO_SERVICEDISCOVERY_MIGRATION, null);
+        if (StringUtils.isEmpty(globalDefaultStep)) {
+            // check 'dubbo.application.service-discovery.migration' for 
compatibility
+            globalDefaultStep = 
ConfigurationUtils.getCachedDynamicProperty(consumerURL.getScopeModel(), 
"dubbo.application.service-discovery.migration", defaultStep);
+        }
+        return globalDefaultStep;
+    }
+
     public MigrationStep getStep() {
         return step;
     }