From 2bf662ce90c0aaac5d1d6c7eab2b9e420a69e315 Mon Sep 17 00:00:00 2001 From: lazy <65394407+liuzg-coder@users.noreply.github.com> Date: Fri, 29 Sep 2023 20:33:22 +0800 Subject: [PATCH] delete useless parts and rewrite the code (#13138) * refactor: modify non-standard naming * refactor: delete useless parts and rewrite the code --------- Co-authored-by: liuzhigang Co-authored-by: Albumen Kevin --- .../spring/context/DubboContextPostProcessor.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboContextPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboContextPostProcessor.java index 257d0fc0b5..3f44969c92 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboContextPostProcessor.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/context/DubboContextPostProcessor.java @@ -30,22 +30,24 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.EnvironmentAware; import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.Environment; import java.util.SortedMap; -public class DubboContextPostProcessor implements BeanDefinitionRegistryPostProcessor, ApplicationContextAware { +public class DubboContextPostProcessor implements BeanDefinitionRegistryPostProcessor, ApplicationContextAware, EnvironmentAware { /** * The bean name of {@link DubboConfigConfigurationRegistrar} */ public final static String BEAN_NAME = "dubboContextPostProcessor"; - private BeanDefinitionRegistry registry; - private ApplicationContext applicationContext; + private ConfigurableEnvironment environment; + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { ApplicationModel applicationModel = DubboBeanUtils.getApplicationModel(beanFactory); @@ -58,7 +60,6 @@ public class DubboContextPostProcessor implements BeanDefinitionRegistryPostProc // Initialize dubbo Environment before ConfigManager // Extract dubbo props from Spring env and put them to app config - ConfigurableEnvironment environment = (ConfigurableEnvironment) applicationContext.getEnvironment(); SortedMap dubboProperties = EnvironmentUtils.filterDubboProperties(environment); applicationModel.getModelEnvironment().getAppConfigMap().putAll(dubboProperties); @@ -70,11 +71,15 @@ public class DubboContextPostProcessor implements BeanDefinitionRegistryPostProc @Override public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry beanDefinitionRegistry) throws BeansException { DubboSpringInitializer.initialize(beanDefinitionRegistry); - this.registry = beanDefinitionRegistry; } @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } + + @Override + public void setEnvironment(Environment environment) { + this.environment = (ConfigurableEnvironment) environment; + } }