remove SearchStrategy#CURRENT (#1220)

Co-authored-by: 致节 <[email protected]>
sofastack · Aug 7, 2023 · e827925 · e827925
1 parent 312cd32
commit e827925
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/...alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java b/...alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java
@@ -29,7 +29,6 @@
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -45,7 +44,7 @@ public class StartupHealthCheckStageConfiguration {
 
     @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     @Bean
-    @ConditionalOnMissingBean(value = ReadinessCheckListener.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = ReadinessCheckListener.class)
     public StartupReadinessCheckListener startupReadinessCheckListener(Environment environment,
                                                                        HealthCheckerProcessor healthCheckerProcessor,
                                                                        HealthIndicatorProcessor healthIndicatorProcessor,

diff --git a/...ain/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java b/...ain/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java
@@ -29,7 +29,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,7 +45,7 @@
 public class SofaStartupIsleAutoConfiguration {
 
     @Bean
-    @ConditionalOnMissingBean(value = SpringContextInstallStage.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = SpringContextInstallStage.class)
     public StartupSpringContextInstallStage startupSpringContextInstallStage(ApplicationContext applicationContext,
                                                                              SofaModuleProperties sofaModuleProperties,
                                                                              StartupReporter startupReporter) {
@@ -55,7 +54,7 @@ public StartupSpringContextInstallStage startupSpringContextInstallStage(Applica
     }
 
     @Bean
-    @ConditionalOnMissingBean(value = ModelCreatingStage.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = ModelCreatingStage.class)
     public StartupModelCreatingStage startupModelCreatingStage(ApplicationContext applicationContext,
                                                                SofaModuleProperties sofaModuleProperties,
                                                                SofaModuleProfileChecker sofaModuleProfileChecker,

diff --git a/...a/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java b/...a/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java
@@ -27,7 +27,6 @@
 import com.alipay.sofa.startup.stage.healthcheck.StartupReadinessCheckListener;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -41,7 +40,7 @@
 public class SofaStartupHealthCheckAutoConfiguration {
 
     @Bean
-    @ConditionalOnMissingBean(value = ReadinessCheckListener.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = ReadinessCheckListener.class)
     public StartupReadinessCheckListener startupReadinessCheckListener(Environment environment,
                                                                        HealthCheckerProcessor healthCheckerProcessor,
                                                                        HealthIndicatorProcessor healthIndicatorProcessor,

diff --git a/...est/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java b/...est/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java
@@ -40,7 +40,6 @@
 import com.alipay.sofa.startup.test.stage.TestModelCreatingStage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -59,7 +58,7 @@
 public class SofaStartupIsleAutoConfiguration {
 
     @Bean
-    @ConditionalOnMissingBean(value = SpringContextInstallStage.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = SpringContextInstallStage.class)
     public StartupSpringContextInstallStage startupSpringContextInstallStage(ApplicationContext applicationContext,
                                                                              SofaModuleProperties sofaModuleProperties,
                                                                              StartupReporter startupReporter) {
@@ -68,7 +67,7 @@ public StartupSpringContextInstallStage startupSpringContextInstallStage(Applica
     }
 
     @Bean
-    @ConditionalOnMissingBean(value = ModelCreatingStage.class, search = SearchStrategy.CURRENT)
+    @ConditionalOnMissingBean(value = ModelCreatingStage.class)
     public StartupModelCreatingStage startupModelCreatingStage(ApplicationContext applicationContext,
                                                                SofaModuleProperties sofaModuleProperties,
                                                                SofaModuleProfileChecker sofaModuleProfileChecker,