From 3160602072c198728cca48e449984a4e596e7c37 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Mon, 19 Jun 2023 09:34:06 +0800 Subject: [PATCH] Rename getModelEnvironment to modelEnvironment (#12551) --- .../DefaultGovernanceRuleRepositoryImpl.java | 2 +- .../ShortestResponseLoadBalance.java | 2 +- .../common/config/ConfigurationUtils.java | 16 +++---- .../common/config/ModuleEnvironment.java | 2 +- .../apache/dubbo/config/AbstractConfig.java | 2 +- .../dubbo/config/AbstractInterfaceConfig.java | 2 +- .../org/apache/dubbo/config/MethodConfig.java | 2 +- .../config/context/AbstractConfigManager.java | 4 +- .../dubbo/rpc/model/ApplicationModel.java | 6 +-- .../dubbo/rpc/model/FrameworkModel.java | 2 +- .../apache/dubbo/rpc/model/ModuleModel.java | 2 +- .../apache/dubbo/rpc/model/ScopeModel.java | 23 +++++++++- .../common/config/ConfigurationUtilsTest.java | 4 +- .../dubbo/common/config/EnvironmentTest.java | 4 +- .../dubbo/rpc/model/ModuleModelTest.java | 2 +- .../dubbo/rpc/model/ScopeModelUtilTest.java | 2 +- .../config/bootstrap/DubboBootstrap.java | 2 +- .../deploy/DefaultApplicationDeployer.java | 2 +- .../config/utils/ConfigValidationUtils.java | 2 +- .../dubbo/config/AbstractConfigTest.java | 44 +++++++++---------- .../dubbo/config/ConfigCenterConfigTest.java | 14 +++--- .../dubbo/config/ConsumerConfigTest.java | 8 ++-- .../config/bootstrap/DubboBootstrapTest.java | 6 +-- .../DubboInfraBeanRegisterPostProcessor.java | 2 +- .../ServiceDiscoveryRegistryDirectory.java | 6 +-- .../migration/MigrationRuleListener.java | 4 +- .../integration/RegistryDirectory.java | 8 ++-- .../integration/RegistryProtocol.java | 12 ++--- .../migration/MigrationRuleListenerTest.java | 12 ++--- .../dubbo/rpc/filter/GenericFilter.java | 2 +- 30 files changed, 111 insertions(+), 90 deletions(-) diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java index 6d6770876b..1d8d7183c3 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/governance/DefaultGovernanceRuleRepositoryImpl.java @@ -54,7 +54,7 @@ public class DefaultGovernanceRuleRepositoryImpl implements GovernanceRuleReposi } private DynamicConfiguration getDynamicConfiguration() { - return moduleModel.getModelEnvironment().getDynamicConfiguration().orElse(null); + return moduleModel.modelEnvironment().getDynamicConfiguration().orElse(null); } } diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java index 67df332e48..1244e76147 100644 --- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java @@ -59,7 +59,7 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance implements @Override public void setApplicationModel(ApplicationModel applicationModel) { - slidePeriod = applicationModel.getModelEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000); + slidePeriod = applicationModel.modelEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000); executorService = applicationModel.getFrameworkModel().getBeanFactory() .getBean(FrameworkExecutorRepository.class).getSharedExecutor(); } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java index efdfe2104d..dae8a0ca03 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ConfigurationUtils.java @@ -76,7 +76,7 @@ public final class ConfigurationUtils { * @return */ public static Configuration getSystemConfiguration(ScopeModel scopeModel) { - return getScopeModelOrDefaultApplicationModel(scopeModel).getModelEnvironment().getSystemConfiguration(); + return getScopeModelOrDefaultApplicationModel(scopeModel).modelEnvironment().getSystemConfiguration(); } /** @@ -85,7 +85,7 @@ public final class ConfigurationUtils { * @return */ public static Configuration getEnvConfiguration(ScopeModel scopeModel) { - return getScopeModelOrDefaultApplicationModel(scopeModel).getModelEnvironment().getEnvironmentConfiguration(); + return getScopeModelOrDefaultApplicationModel(scopeModel).modelEnvironment().getEnvironmentConfiguration(); } /** @@ -97,11 +97,11 @@ public final class ConfigurationUtils { */ public static Configuration getGlobalConfiguration(ScopeModel scopeModel) { - return getScopeModelOrDefaultApplicationModel(scopeModel).getModelEnvironment().getConfiguration(); + return getScopeModelOrDefaultApplicationModel(scopeModel).modelEnvironment().getConfiguration(); } public static Configuration getDynamicGlobalConfiguration(ScopeModel scopeModel) { - return scopeModel.getModelEnvironment().getDynamicGlobalConfiguration(); + return scopeModel.modelEnvironment().getDynamicGlobalConfiguration(); } // FIXME @@ -364,7 +364,7 @@ public final class ConfigurationUtils { */ @Deprecated public static Configuration getSystemConfiguration() { - return ApplicationModel.defaultModel().getModelEnvironment().getSystemConfiguration(); + return ApplicationModel.defaultModel().modelEnvironment().getSystemConfiguration(); } /** @@ -374,7 +374,7 @@ public final class ConfigurationUtils { */ @Deprecated public static Configuration getEnvConfiguration() { - return ApplicationModel.defaultModel().getModelEnvironment().getEnvironmentConfiguration(); + return ApplicationModel.defaultModel().modelEnvironment().getEnvironmentConfiguration(); } /** @@ -384,7 +384,7 @@ public final class ConfigurationUtils { */ @Deprecated public static Configuration getGlobalConfiguration() { - return ApplicationModel.defaultModel().getModelEnvironment().getConfiguration(); + return ApplicationModel.defaultModel().modelEnvironment().getConfiguration(); } /** @@ -394,7 +394,7 @@ public final class ConfigurationUtils { */ @Deprecated public static Configuration getDynamicGlobalConfiguration() { - return ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().getDynamicGlobalConfiguration(); + return ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().getDynamicGlobalConfiguration(); } /** diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ModuleEnvironment.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ModuleEnvironment.java index 673815afb1..cf51624262 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/ModuleEnvironment.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/ModuleEnvironment.java @@ -54,7 +54,7 @@ public class ModuleEnvironment extends Environment implements ModuleExt { public ModuleEnvironment(ModuleModel moduleModel) { super(moduleModel); this.moduleModel = moduleModel; - this.applicationDelegate = moduleModel.getApplicationModel().getModelEnvironment(); + this.applicationDelegate = moduleModel.getApplicationModel().modelEnvironment(); } @Override diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java index 3e4daf34bc..eee83f501c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractConfig.java @@ -696,7 +696,7 @@ public abstract class AbstractConfig implements Serializable { } protected void refreshWithPrefixes(List prefixes, ConfigMode configMode) { - Environment environment = getScopeModel().getModelEnvironment(); + Environment environment = getScopeModel().modelEnvironment(); List> configurationMaps = environment.getConfigurationMaps(); // Search props starts with PREFIX in order diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java index 450d49f605..8b0f4c4167 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java @@ -302,7 +302,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig { } protected Environment getEnvironment() { - return getScopeModel().getModelEnvironment(); + return getScopeModel().modelEnvironment(); } @Override diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java index d8696fadc4..914002e1a4 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/MethodConfig.java @@ -236,7 +236,7 @@ public class MethodConfig extends AbstractMethodConfig { private void refreshArgument(ArgumentConfig argument, InmemoryConfiguration subPropsConfiguration) { if (argument.getIndex() != null && argument.getIndex() >= 0) { String prefix = argument.getIndex() + "."; - Environment environment = getScopeModel().getModelEnvironment(); + Environment environment = getScopeModel().modelEnvironment(); List methods = MethodUtils.getMethods(argument.getClass(), method -> method.getDeclaringClass() != Object.class); for (java.lang.reflect.Method method : methods) { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/AbstractConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/AbstractConfigManager.java index 8a5dfdd79b..0f8a0e23d4 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/AbstractConfigManager.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/AbstractConfigManager.java @@ -105,7 +105,7 @@ public abstract class AbstractConfigManager extends LifecycleAdapter { this.scopeModel = scopeModel; this.applicationModel = ScopeModelUtil.getApplicationModel(scopeModel); this.supportedConfigTypes = supportedConfigTypes; - environment = scopeModel.getModelEnvironment(); + environment = scopeModel.modelEnvironment(); } @Override @@ -113,7 +113,7 @@ public abstract class AbstractConfigManager extends LifecycleAdapter { if (!initialized.compareAndSet(false, true)) { return; } - CompositeConfiguration configuration = scopeModel.getModelEnvironment().getConfiguration(); + CompositeConfiguration configuration = scopeModel.modelEnvironment().getConfiguration(); // dubbo.config.mode String configModeStr = (String) configuration.getProperty(ConfigKeys.DUBBO_CONFIG_MODE); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java index 0978143257..0544df59ed 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java @@ -201,7 +201,7 @@ public class ApplicationModel extends ScopeModel { } @Override - public Environment getModelEnvironment() { + public Environment modelEnvironment() { if (environment == null) { environment = (Environment) this.getExtensionLoader(ApplicationExt.class) .getExtension(Environment.NAME); @@ -390,11 +390,11 @@ public class ApplicationModel extends ScopeModel { } /** - * @deprecated Replace to {@link ScopeModel#getModelEnvironment()} + * @deprecated Replace to {@link ScopeModel#modelEnvironment()} */ @Deprecated public static Environment getEnvironment() { - return defaultModel().getModelEnvironment(); + return defaultModel().modelEnvironment(); } /** diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java index 2bdfa9f577..09a001f3bb 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java @@ -367,7 +367,7 @@ public class FrameworkModel extends ScopeModel { } @Override - public Environment getModelEnvironment() { + public Environment modelEnvironment() { throw new UnsupportedOperationException("Environment is inaccessible for FrameworkModel"); } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java index 5422c6169a..358868af69 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java @@ -150,7 +150,7 @@ public class ModuleModel extends ScopeModel { } @Override - public ModuleEnvironment getModelEnvironment() { + public ModuleEnvironment modelEnvironment() { if (moduleEnvironment == null) { moduleEnvironment = (ModuleEnvironment) this.getExtensionLoader(ModuleExt.class) .getExtension(ModuleEnvironment.NAME); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java index bbf1bcc987..a96df0eb43 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java @@ -243,7 +243,28 @@ public abstract class ScopeModel implements ExtensionAccessor { return Collections.unmodifiableSet(classLoaders); } - public abstract Environment getModelEnvironment(); + /** + * Get current model's environment. + *
+ * Note: This method should not start with `get` or it would be invoked due to Spring boot refresh. + * @see Configuration refresh issue + */ + public abstract Environment modelEnvironment(); + + /** + * Get current model's environment. + * + * @see Configuration refresh issue + * @deprecated use modelEnvironment() instead + */ + @Deprecated + public final Environment getModelEnvironment() { + try { + return modelEnvironment(); + } catch (Exception ex) { + return null; + } + } public String getInternalId() { return this.internalId; diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/ConfigurationUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/ConfigurationUtilsTest.java index de3bd2df71..16853eb32e 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/ConfigurationUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/ConfigurationUtilsTest.java @@ -37,7 +37,7 @@ class ConfigurationUtilsTest { FrameworkModel frameworkModel = new FrameworkModel(); ApplicationModel applicationModel = frameworkModel.newApplication(); - Environment originApplicationEnvironment = applicationModel.getModelEnvironment(); + Environment originApplicationEnvironment = applicationModel.modelEnvironment(); Environment applicationEnvironment = Mockito.spy(originApplicationEnvironment); applicationModel.setEnvironment(applicationEnvironment); @@ -52,7 +52,7 @@ class ConfigurationUtilsTest { Assertions.assertEquals("a", ConfigurationUtils.getCachedDynamicProperty(applicationModel, "TestKey", "xxx")); ModuleModel moduleModel = applicationModel.newModule(); - ModuleEnvironment originModuleEnvironment = moduleModel.getModelEnvironment(); + ModuleEnvironment originModuleEnvironment = moduleModel.modelEnvironment(); ModuleEnvironment moduleEnvironment = Mockito.spy(originModuleEnvironment); moduleModel.setModuleEnvironment(moduleEnvironment); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java index 5d502fffaa..e0a1204193 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/config/EnvironmentTest.java @@ -39,7 +39,7 @@ class EnvironmentTest { @Test void testResolvePlaceholders() { - Environment environment = ApplicationModel.defaultModel().getModelEnvironment(); + Environment environment = ApplicationModel.defaultModel().modelEnvironment(); Map externalMap = new LinkedHashMap<>(); externalMap.put("zookeeper.address", "127.0.0.1"); @@ -65,7 +65,7 @@ class EnvironmentTest { void test() { FrameworkModel frameworkModel = new FrameworkModel(); ApplicationModel applicationModel = frameworkModel.newApplication(); - Environment environment = applicationModel.getModelEnvironment(); + Environment environment = applicationModel.modelEnvironment(); // test getPrefixedConfiguration RegistryConfig registryConfig = new RegistryConfig(); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ModuleModelTest.java b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ModuleModelTest.java index 2f76c09edb..4bf1b6f748 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ModuleModelTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ModuleModelTest.java @@ -61,7 +61,7 @@ class ModuleModelTest { ApplicationModel applicationModel = frameworkModel.newApplication(); ModuleModel moduleModel = applicationModel.newModule(); - ModuleEnvironment modelEnvironment = moduleModel.getModelEnvironment(); + ModuleEnvironment modelEnvironment = moduleModel.modelEnvironment(); Assertions.assertNotNull(modelEnvironment); frameworkModel.destroy(); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java index dcf0cfba79..2e90314da1 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/ScopeModelUtilTest.java @@ -108,7 +108,7 @@ class ScopeModelUtilTest { } @Override - public Environment getModelEnvironment() { + public Environment modelEnvironment() { return null; } diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java index 2002ec0cb0..bfb2278fb6 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java @@ -162,7 +162,7 @@ public final class DubboBootstrap { private DubboBootstrap(ApplicationModel applicationModel) { this.applicationModel = applicationModel; configManager = applicationModel.getApplicationConfigManager(); - environment = applicationModel.getModelEnvironment(); + environment = applicationModel.modelEnvironment(); executorRepository = ExecutorRepository.getInstance(applicationModel); applicationDeployer = applicationModel.getDeployer(); diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java index af73f59ad2..6302ee6eb3 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java @@ -146,7 +146,7 @@ public class DefaultApplicationDeployer extends AbstractDeployer 0) { System.setProperty(SHUTDOWN_WAIT_KEY, wait.trim()); diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java index 02e93d69b2..0a811bbae5 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java @@ -335,8 +335,8 @@ class AbstractConfigTest { external.put("dubbo.override.key", "external"); // @Parameter(key="key2", useKeyAsProperty=true) external.put("dubbo.override.key2", "external"); - ApplicationModel.defaultModel().getModelEnvironment().initialize(); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().initialize(); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); SysProps.setProperty("dubbo.override.address", "system://127.0.0.1:2181"); SysProps.setProperty("dubbo.override.protocol", "system"); @@ -353,7 +353,7 @@ class AbstractConfigTest { Assertions.assertEquals("external", overrideConfig.getKey()); Assertions.assertEquals("system", overrideConfig.getKey2()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -377,14 +377,14 @@ class AbstractConfigTest { Assertions.assertEquals("override-config://", overrideConfig.getEscape()); Assertions.assertEquals("system", overrideConfig.getKey()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @Test void testRefreshProperties() throws Exception { try { - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(new HashMap<>()); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(new HashMap<>()); OverrideConfig overrideConfig = new OverrideConfig(); overrideConfig.setAddress("override-config://127.0.0.1:2181"); overrideConfig.setProtocol("override-config"); @@ -392,7 +392,7 @@ class AbstractConfigTest { Properties properties = new Properties(); properties.load(this.getClass().getResourceAsStream("/dubbo.properties")); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperties(properties); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperties(properties); overrideConfig.refresh(); @@ -402,7 +402,7 @@ class AbstractConfigTest { Assertions.assertEquals("properties", overrideConfig.getKey2()); //Assertions.assertEquals("properties", overrideConfig.getUseKeyAsProperty()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -425,8 +425,8 @@ class AbstractConfigTest { external.put("dubbo.override.key", "external"); // @Parameter(key="key2", useKeyAsProperty=true) external.put("dubbo.override.key2", "external"); - ApplicationModel.defaultModel().getModelEnvironment().initialize(); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().initialize(); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); overrideConfig.refresh(); @@ -437,7 +437,7 @@ class AbstractConfigTest { Assertions.assertEquals("external", overrideConfig.getKey()); Assertions.assertEquals("external", overrideConfig.getKey2()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -457,8 +457,8 @@ class AbstractConfigTest { external.put("dubbo.overrides.override-id.key2", "external"); external.put("dubbo.override.address", "external://127.0.0.1:2181"); external.put("dubbo.override.exclude", "external"); - ApplicationModel.defaultModel().getModelEnvironment().initialize(); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().initialize(); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); // refresh config overrideConfig.refresh(); @@ -469,7 +469,7 @@ class AbstractConfigTest { Assertions.assertEquals("external", overrideConfig.getKey()); Assertions.assertEquals("external", overrideConfig.getKey2()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -485,8 +485,8 @@ class AbstractConfigTest { Map external = new HashMap<>(); external.put("dubbo.override.parameters", "[{key3:value3},{key4:value4},{key2:value5}]"); - ApplicationModel.defaultModel().getModelEnvironment().initialize(); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().initialize(); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); // refresh config overrideConfig.refresh(); @@ -502,7 +502,7 @@ class AbstractConfigTest { Assertions.assertEquals("value6", overrideConfig.getParameters().get("key3")); Assertions.assertEquals("value4", overrideConfig.getParameters().get("key4")); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -514,7 +514,7 @@ class AbstractConfigTest { overrideConfig.refresh(); assertEquals("value00", overrideConfig.getParameters().get("key00")); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -587,14 +587,14 @@ class AbstractConfigTest { external.put("notConflictKey", "value-from-external"); external.put("dubbo.override.notConflictKey2", "value-from-external"); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); overrideConfig.refresh(); Assertions.assertEquals("value-from-config", overrideConfig.getNotConflictKey()); Assertions.assertEquals("value-from-external", overrideConfig.getNotConflictKey2()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } @@ -1021,8 +1021,8 @@ class AbstractConfigTest { external.put("dubbo.outer.a1", "1"); external.put("dubbo.outer.b.b1", "11"); external.put("dubbo.outer.b.b2", "12"); - ApplicationModel.defaultModel().getModelEnvironment().initialize(); - ApplicationModel.defaultModel().getModelEnvironment().setExternalConfigMap(external); + ApplicationModel.defaultModel().modelEnvironment().initialize(); + ApplicationModel.defaultModel().modelEnvironment().setExternalConfigMap(external); // refresh config outerConfig.refresh(); @@ -1031,7 +1031,7 @@ class AbstractConfigTest { Assertions.assertEquals(11, outerConfig.getB().getB1()); Assertions.assertEquals(12, outerConfig.getB().getB2()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().destroy(); + ApplicationModel.defaultModel().modelEnvironment().destroy(); } } diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java index 961feee93b..0af13133ca 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java @@ -160,8 +160,8 @@ class ConfigCenterConfigTest { ApplicationModel.defaultModel().getDefaultModule(); // Config instance has id, dubbo props has no id - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-center.check", "false"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-center.timeout", "1234"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-center.check", "false"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-center.timeout", "1234"); try { // Config instance has id @@ -179,7 +179,7 @@ class ConfigCenterConfigTest { Assertions.assertEquals(3000L, configCenter.getTimeout()); Assertions.assertEquals(false, configCenter.isCheck()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().refresh(); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().refresh(); DubboBootstrap.getInstance().stop(); } } @@ -215,8 +215,8 @@ class ConfigCenterConfigTest { ApplicationModel.defaultModel().getDefaultModule(); // Config instance has id, dubbo props has id - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-centers.configcenterA.check", "false"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-centers.configcenterA.timeout", "1234"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-centers.configcenterA.check", "false"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.config-centers.configcenterA.timeout", "1234"); try { // Config instance has id @@ -235,7 +235,7 @@ class ConfigCenterConfigTest { Assertions.assertEquals(3000L, configCenter.getTimeout()); Assertions.assertEquals(false, configCenter.isCheck()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().refresh(); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().refresh(); DubboBootstrap.getInstance().stop(); } } @@ -294,4 +294,4 @@ class ConfigCenterConfigTest { Assertions.assertEquals("pass123", cc.getPassword()); } -} \ No newline at end of file +} diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java index 7f2283e47d..1a303ced7b 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java @@ -187,9 +187,9 @@ class ConsumerConfigTest { @Test void testOverrideConfigByDubboProps() { ApplicationModel.defaultModel().getDefaultModule(); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.check", "false"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.group", "demo"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.threads", "10"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.check", "false"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.group", "demo"); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().setProperty("dubbo.consumers.consumerA.threads", "10"); try { ConsumerConfig consumerConfig = new ConsumerConfig(); @@ -208,7 +208,7 @@ class ConsumerConfigTest { Assertions.assertEquals("groupA", consumerConfig.getGroup()); Assertions.assertEquals(10, consumerConfig.getThreads()); } finally { - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().refresh(); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().refresh(); DubboBootstrap.getInstance().destroy(); } } diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java index f65b14d0ba..2852bf55d4 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java @@ -115,13 +115,13 @@ class DubboBootstrapTest { System.clearProperty(SHUTDOWN_WAIT_SECONDS_KEY); writeDubboProperties(SHUTDOWN_WAIT_KEY, "100"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().refresh(); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().refresh(); ConfigValidationUtils.validateApplicationConfig(new ApplicationConfig("demo")); Assertions.assertEquals("100", System.getProperty(SHUTDOWN_WAIT_KEY)); System.clearProperty(SHUTDOWN_WAIT_KEY); writeDubboProperties(SHUTDOWN_WAIT_SECONDS_KEY, "1000"); - ApplicationModel.defaultModel().getModelEnvironment().getPropertiesConfiguration().refresh(); + ApplicationModel.defaultModel().modelEnvironment().getPropertiesConfiguration().refresh(); ConfigValidationUtils.validateApplicationConfig(new ApplicationConfig("demo")); Assertions.assertEquals("1000", System.getProperty(SHUTDOWN_WAIT_SECONDS_KEY)); } finally { @@ -369,4 +369,4 @@ class DubboBootstrapTest { } -} \ No newline at end of file +} diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java index d9f4f2b2ce..fcd759578e 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboInfraBeanRegisterPostProcessor.java @@ -85,7 +85,7 @@ public class DubboInfraBeanRegisterPostProcessor implements BeanDefinitionRegist // Extract dubbo props from Spring env and put them to app config ConfigurableEnvironment environment = (ConfigurableEnvironment) applicationContext.getEnvironment(); SortedMap dubboProperties = EnvironmentUtils.filterDubboProperties(environment); - applicationModel.getModelEnvironment().setAppConfigMap(dubboProperties); + applicationModel.modelEnvironment().setAppConfigMap(dubboProperties); // register ConfigManager singleton beanFactory.registerSingleton(ConfigManager.BEAN_NAME, applicationModel.getApplicationConfigManager()); diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java index eac73aec83..baec948745 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java @@ -124,7 +124,7 @@ public class ServiceDiscoveryRegistryDirectory extends DynamicDirectory { @Override public void subscribe(URL url) { - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { enableConfigurationListen = true; getConsumerConfigurationListener(moduleModel).addNotifyListener(this); referenceConfigurationListener = new ReferenceConfigurationListener(this.moduleModel, this, url); @@ -143,7 +143,7 @@ public class ServiceDiscoveryRegistryDirectory extends DynamicDirectory { public void unSubscribe(URL url) { super.unSubscribe(url); this.originalUrls = null; - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { getConsumerConfigurationListener(moduleModel).removeNotifyListener(this); referenceConfigurationListener.stop(); } @@ -152,7 +152,7 @@ public class ServiceDiscoveryRegistryDirectory extends DynamicDirectory { @Override public void destroy() { super.destroy(); - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, Constants.ENABLE_CONFIGURATION_LISTEN, true)) { getConsumerConfigurationListener(moduleModel).removeNotifyListener(this); referenceConfigurationListener.stop(); } diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java index 02e877ca89..de6abfd39b 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java @@ -97,7 +97,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur private void init() { this.ruleKey = moduleModel.getApplicationModel().getApplicationName() + ".migration"; - this.configuration = moduleModel.getModelEnvironment().getDynamicConfiguration().orElse(null); + this.configuration = moduleModel.modelEnvironment().getDynamicConfiguration().orElse(null); if (this.configuration != null) { logger.info("Listening for migration rules on dataId " + ruleKey + ", group " + DUBBO_SERVICEDISCOVERY_MIGRATION); @@ -115,7 +115,7 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur setRawRule(INIT); } - String localRawRule = moduleModel.getModelEnvironment().getLocalMigrationRule(); + String localRawRule = moduleModel.modelEnvironment().getLocalMigrationRule(); if (!StringUtils.isEmpty(localRawRule)) { localRuleMigrationFuture = moduleModel.getApplicationModel().getFrameworkModel().getBeanFactory() .getBean(FrameworkExecutorRepository.class).getSharedScheduledExecutor() diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java index 6405c75eab..2c58510507 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java @@ -138,7 +138,7 @@ public class RegistryDirectory extends DynamicDirectory { return null; } ); - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { consumerConfigurationListener.addNotifyListener(this); referenceConfigurationListener = new ReferenceConfigurationListener(moduleModel, this, url); } @@ -152,7 +152,7 @@ public class RegistryDirectory extends DynamicDirectory { @Override public void unSubscribe(URL url) { super.unSubscribe(url); - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { consumerConfigurationListener.removeNotifyListener(this); if (referenceConfigurationListener != null) { referenceConfigurationListener.stop(); @@ -163,7 +163,7 @@ public class RegistryDirectory extends DynamicDirectory { @Override public void destroy() { super.destroy(); - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { consumerConfigurationListener.removeNotifyListener(this); if (referenceConfigurationListener != null) { referenceConfigurationListener.stop(); @@ -183,7 +183,7 @@ public class RegistryDirectory extends DynamicDirectory { .filter(this::isNotCompatibleFor26x) .collect(Collectors.groupingBy(this::judgeCategory)); - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { List configuratorURLs = categoryUrls.getOrDefault(CONFIGURATORS_CATEGORY, Collections.emptyList()); this.configurators = Configurator.toConfigurators(configuratorURLs).orElse(this.configurators); diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java index 33f872ac75..a9e3b908c7 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java @@ -276,7 +276,7 @@ public class RegistryProtocol implements Protocol, ScopeModelAware { exporter.setRegistered(register); ApplicationModel applicationModel = getApplicationModel(providerUrl.getScopeModel()); - if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { + if (applicationModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { if (!registry.isServiceDiscovery()) { // Deprecated! Subscribe to override rules in 2.6.x or before. registry.subscribe(overrideSubscribeUrl, overrideSubscribeListener); @@ -657,7 +657,7 @@ public class RegistryProtocol implements Protocol, ScopeModelAware { } for (ApplicationModel applicationModel : frameworkModel.getApplicationModels()) { - if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { + if (applicationModel.modelEnvironment().getConfiguration().convert(Boolean.class, org.apache.dubbo.registry.Constants.ENABLE_CONFIGURATION_LISTEN, true)) { for (ModuleModel moduleModel : applicationModel.getPubModuleModels()) { String applicationName = applicationModel.tryGetApplicationName(); if (applicationName == null) { @@ -869,7 +869,7 @@ public class RegistryProtocol implements Protocol, ScopeModelAware { this.providerUrl = providerUrl; this.notifyListener = notifyListener; this.moduleModel = moduleModel; - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { this.initWith(DynamicConfiguration.getRuleKey(providerUrl) + CONFIGURATORS_SUFFIX); } } @@ -899,7 +899,7 @@ public class RegistryProtocol implements Protocol, ScopeModelAware { public ProviderConfigurationListener(ModuleModel moduleModel) { super(moduleModel); this.moduleModel = moduleModel; - if (moduleModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { + if (moduleModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { this.initWith(moduleModel.getApplicationModel().getApplicationName() + CONFIGURATORS_SUFFIX); } } @@ -1009,12 +1009,12 @@ public class RegistryProtocol implements Protocol, ScopeModelAware { if (listeners != null) { if (listeners.remove(notifyListener)) { ApplicationModel applicationModel = getApplicationModel(registerUrl.getScopeModel()); - if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { + if (applicationModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_26X_CONFIGURATION_LISTEN, true)) { if (!registry.isServiceDiscovery()) { registry.unsubscribe(subscribeUrl, notifyListener); } } - if (applicationModel.getModelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { + if (applicationModel.modelEnvironment().getConfiguration().convert(Boolean.class, ENABLE_CONFIGURATION_LISTEN, true)) { for (ModuleModel moduleModel : applicationModel.getPubModuleModels()) { if (moduleModel.getServiceRepository().getExportedServices().size() > 0) { moduleModel.getExtensionLoader(GovernanceRuleRepository.class).getDefaultExtension() 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 79c74a70dc..6b06bf0f9b 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 @@ -90,8 +90,8 @@ class MigrationRuleListenerTest { DynamicConfiguration dynamicConfiguration = Mockito.mock(DynamicConfiguration.class); ApplicationModel.reset(); - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setDynamicConfiguration(dynamicConfiguration); - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setLocalMigrationRule(localRule); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setDynamicConfiguration(dynamicConfiguration); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setLocalMigrationRule(localRule); ApplicationConfig applicationConfig = new ApplicationConfig(); applicationConfig.setName("demo-consumer"); ApplicationModel.defaultModel().getApplicationConfigManager().setApplication(applicationConfig); @@ -134,8 +134,8 @@ class MigrationRuleListenerTest { */ @Test void testWithInitAndNoLocalRule() { - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setDynamicConfiguration(null); - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setLocalMigrationRule(""); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setDynamicConfiguration(null); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setLocalMigrationRule(""); ApplicationConfig applicationConfig = new ApplicationConfig(); applicationConfig.setName("demo-consumer"); ApplicationModel.defaultModel().getApplicationConfigManager().setApplication(applicationConfig); @@ -170,8 +170,8 @@ class MigrationRuleListenerTest { DynamicConfiguration dynamicConfiguration = Mockito.mock(DynamicConfiguration.class); Mockito.doReturn(remoteRule).when(dynamicConfiguration).getConfig(Mockito.anyString(), Mockito.anyString()); - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setDynamicConfiguration(dynamicConfiguration); - ApplicationModel.defaultModel().getDefaultModule().getModelEnvironment().setLocalMigrationRule(localRule); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setDynamicConfiguration(dynamicConfiguration); + ApplicationModel.defaultModel().getDefaultModule().modelEnvironment().setLocalMigrationRule(localRule); ApplicationConfig applicationConfig = new ApplicationConfig(); applicationConfig.setName("demo-consumer"); ApplicationModel.defaultModel().getApplicationConfigManager().setApplication(applicationConfig); diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java index b69ba505f0..00f23815cd 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java @@ -115,7 +115,7 @@ public class GenericFilter implements Filter, Filter.Listener, ScopeModelAware { } else if (ProtocolUtils.isGsonGenericSerialization(generic)) { args = getGsonGenericArgs(args, method.getGenericParameterTypes()); } else if (ProtocolUtils.isJavaGenericSerialization(generic)) { - Configuration configuration = ApplicationModel.ofNullable(applicationModel).getModelEnvironment().getConfiguration(); + Configuration configuration = ApplicationModel.ofNullable(applicationModel).modelEnvironment().getConfiguration(); if (!configuration.getBoolean(CommonConstants.ENABLE_NATIVE_JAVA_GENERIC_SERIALIZE, false)) { String notice = "Trigger the safety barrier! " + "Native Java Serializer is not allowed by default." +