From 0bb15c4697805c91ef6e357643250058667d735f Mon Sep 17 00:00:00 2001 From: HzjNeverStop <441627022@qq.com> Date: Tue, 7 Nov 2023 20:36:00 +0800 Subject: [PATCH] register deprecate bean alias name for ApplicationRuntimeModel (#1263) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 致节 --- .../boot/autoconfigure/isle/SofaModuleAutoConfiguration.java | 3 ++- .../com/alipay/sofa/boot/isle/ApplicationRuntimeModel.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/isle/SofaModuleAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/isle/SofaModuleAutoConfiguration.java index c1a7eda0a..2117eefd2 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/isle/SofaModuleAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/isle/SofaModuleAutoConfiguration.java @@ -83,7 +83,8 @@ public SofaModuleContextLifecycle sofaModuleContextLifecycle(PipelineContext pip return new SofaModuleContextLifecycle(pipelineContext); } - @Bean(ApplicationRuntimeModel.APPLICATION_RUNTIME_MODEL_NAME) + @Bean({ ApplicationRuntimeModel.APPLICATION_RUNTIME_MODEL_NAME, + ApplicationRuntimeModel.APPLICATION }) @ConditionalOnMissingBean public ApplicationRuntimeModel applicationRuntimeModel(ModuleDeploymentValidator moduleDeploymentValidator, SofaModuleProfileChecker sofaModuleProfileChecker) { diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/ApplicationRuntimeModel.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/ApplicationRuntimeModel.java index 97e9367f1..8be32572e 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/ApplicationRuntimeModel.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/ApplicationRuntimeModel.java @@ -41,6 +41,9 @@ public class ApplicationRuntimeModel implements IsleDeploymentModel { public static final String APPLICATION_RUNTIME_MODEL_NAME = "APPLICATION_RUNTIME_MODEL"; + + @Deprecated + public static final String APPLICATION = "SOFABOOT-APPLICATION"; /** deploys */ private final List deploys = new ArrayList<>(); /** inactive deploys */