From ee490fe7c8cd4a3d7cc2b0b4bda7cf2becdf0ec8 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Fri, 24 Jan 2025 05:46:20 +0800 Subject: [PATCH] Move field ContextRefresher.REFRESH_ARGS_PROPERTY_SOURCE down to LegacyContextRefresher (#1450) It's specific to LegacyContextRefresher. Signed-off-by: Yanming Zhou --- .../cloud/context/refresh/ConfigDataContextRefresher.java | 3 --- .../cloud/context/refresh/ContextRefresher.java | 2 -- .../cloud/context/refresh/LegacyContextRefresher.java | 2 ++ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java index 4a5d813e..aa61373d 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java @@ -92,9 +92,6 @@ public class ConfigDataContextRefresher extends ContextRefresher postProcessor.postProcessEnvironment(environment, application); } - if (environment.getPropertySources().contains(REFRESH_ARGS_PROPERTY_SOURCE)) { - environment.getPropertySources().remove(REFRESH_ARGS_PROPERTY_SOURCE); - } MutablePropertySources target = getContext().getEnvironment().getPropertySources(); String targetName = null; for (PropertySource source : environment.getPropertySources()) { diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java index 4982b980..54991a87 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java @@ -51,8 +51,6 @@ public abstract class ContextRefresher { protected final Log logger = LogFactory.getLog(getClass()); - protected static final String REFRESH_ARGS_PROPERTY_SOURCE = "refreshArgs"; - protected static final String[] DEFAULT_PROPERTY_SOURCES = new String[] { // order matters, if cli args aren't first, things get messy CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME, "defaultProperties" }; diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java index 5a30aadf..fe5fa4b9 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/LegacyContextRefresher.java @@ -41,6 +41,8 @@ import static org.springframework.cloud.util.PropertyUtils.BOOTSTRAP_ENABLED_PRO */ public class LegacyContextRefresher extends ContextRefresher { + private static final String REFRESH_ARGS_PROPERTY_SOURCE = "refreshArgs"; + @Deprecated public LegacyContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) { super(context, scope);