You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by al...@apache.org on 2023/04/09 23:22:00 UTC

[dubbo-samples] branch master updated: Replace deprecated ApplicationModel method. (#821)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git


The following commit(s) were added to refs/heads/master by this push:
     new f90cc19e Replace deprecated ApplicationModel method. (#821)
f90cc19e is described below

commit f90cc19eda12ce8f597136ac483fb8732e12921e
Author: Andy Cheung <mi...@msn.cn>
AuthorDate: Mon Apr 10 07:21:51 2023 +0800

    Replace deprecated ApplicationModel method. (#821)
---
 .../java/org/apache/dubbo/demo/consumer/UpgradeUtil.java     | 12 ++++++------
 .../org/apache/dubbo/samples/governance/UpgradeUtil.java     | 12 ++++++------
 .../org/apache/dubbo/samples/governance/UpgradeUtil.java     | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/main/java/org/apache/dubbo/demo/consumer/UpgradeUtil.java b/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/main/java/org/apache/dubbo/demo/consumer/UpgradeUtil.java
index efcc58d2..e8163cb5 100644
--- a/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/main/java/org/apache/dubbo/demo/consumer/UpgradeUtil.java
+++ b/2-advanced/dubbo-samples-cloud-native/dubbo-servicediscovery-migration/dubbo-servicediscovery-migration-consumer/src/main/java/org/apache/dubbo/demo/consumer/UpgradeUtil.java
@@ -32,8 +32,8 @@ public class UpgradeUtil {
         String content = "step: APPLICATION_FIRST\r\n" +
                 "proportion: " + proportion;
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -41,8 +41,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_INTERFACE\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -50,8 +50,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_APPLICATION\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
diff --git a/4-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java b/4-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
index 03b1379b..8a235812 100644
--- a/4-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
+++ b/4-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
@@ -26,8 +26,8 @@ public class UpgradeUtil {
         String content = "step: APPLICATION_FIRST\r\n" +
                 "proportion: " + proportion;
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -35,8 +35,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_INTERFACE\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -44,8 +44,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_APPLICATION\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
diff --git a/4-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java b/4-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
index 03b1379b..8a235812 100644
--- a/4-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
+++ b/4-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/UpgradeUtil.java
@@ -26,8 +26,8 @@ public class UpgradeUtil {
         String content = "step: APPLICATION_FIRST\r\n" +
                 "proportion: " + proportion;
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -35,8 +35,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_INTERFACE\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 
@@ -44,8 +44,8 @@ public class UpgradeUtil {
         String content = "step: FORCE_APPLICATION\r\n" +
                 "force: true";
 
-        String RULE_KEY = ApplicationModel.getName() + ".migration";
-        DynamicConfiguration configuration = ApplicationModel.getEnvironment().getDynamicConfiguration().get();
+        String RULE_KEY = ApplicationModel.defaultModel().getApplicationName() + ".migration";
+        DynamicConfiguration configuration = ApplicationModel.defaultModel().getModelEnvironment().getDynamicConfiguration().get();
         configuration.publishConfig(RULE_KEY, DUBBO_SERVICEDISCOVERY_MIGRATION, content);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org