diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/health/SofaBootHealthCheckAutoConfiguration.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/health/SofaBootHealthCheckAutoConfiguration.java index 8e17f14b3..4544f1308 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/health/SofaBootHealthCheckAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/health/SofaBootHealthCheckAutoConfiguration.java @@ -50,7 +50,7 @@ * @author qilong.zql * @since 2.5.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(HealthCheckProperties.class) @ConditionalOnClass(HealthChecker.class) public class SofaBootHealthCheckAutoConfiguration { @@ -114,7 +114,7 @@ public ComponentHealthChecker sofaComponentHealthChecker(SofaRuntimeContext sofa return new ComponentHealthChecker(sofaRuntimeContext); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ HealthChecker.class, ModelCreatingStage.class }) @ConditionalOnProperty(value = "com.alipay.sofa.boot.enable-isle", matchIfMissing = true) public static class SofaModuleHealthIndicatorConfiguration { @@ -124,7 +124,7 @@ public ModuleHealthChecker sofaModuleHealthChecker() { } } - @Configuration + @Configuration(proxyBeanMethods = false) @AutoConfigureBefore(HealthEndpointAutoConfiguration.class) @ConditionalOnClass(HealthChecker.class) public static class ReadinessCheckExtensionConfiguration { diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupEndPointAutoConfiguration.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupEndPointAutoConfiguration.java index 13a3a324f..a43d9ffa4 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupEndPointAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupEndPointAutoConfiguration.java @@ -30,7 +30,7 @@ * @author Zhijie * @since 2020/7/7 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(StartupReporter.class) @AutoConfigureBefore(SofaStartupAutoConfiguration.class) public class StartupEndPointAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java index fc073fe57..3556a27de 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/startup/StartupHealthCheckStageConfiguration.java @@ -32,7 +32,7 @@ * @author huzijie * @version StartupHealthCheckStageConfiguration.java, v 0.1 2020年12月31日 5:09 下午 huzijie Exp $ */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SofaBootHealthCheckAutoConfiguration.class) @ConditionalOnClass({ HealthChecker.class, StartupReporter.class }) public class StartupHealthCheckStageConfiguration { diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/version/VersionEndpointAutoConfiguration.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/version/VersionEndpointAutoConfiguration.java index 58b8d4c7c..beca3cd71 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/version/VersionEndpointAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/main/java/com/alipay/sofa/boot/actuator/autoconfigure/version/VersionEndpointAutoConfiguration.java @@ -27,7 +27,7 @@ * @author qilong.zql * @since 3.0.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class VersionEndpointAutoConfiguration { @Bean @ConditionalOnMissingBean diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/EmptyConfiguration.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/EmptyConfiguration.java index 08c478086..bbb87b34e 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/EmptyConfiguration.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/EmptyConfiguration.java @@ -24,6 +24,6 @@ * @since 3.2.0 */ @EnableAutoConfiguration -@Configuration +@Configuration(proxyBeanMethods = false) public class EmptyConfiguration { } diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/HealthCheckManagementTest.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/HealthCheckManagementTest.java index ef09ccb55..24978198b 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/HealthCheckManagementTest.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/HealthCheckManagementTest.java @@ -68,7 +68,7 @@ public void testHealthCheckNotReadyLiveness() { SofaBootConstants.SOFABOOT_HEALTH_CHECK_NOT_READY_MSG)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class HealthCheckManagementTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/SofaModuleHealthCheckerTest.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/SofaModuleHealthCheckerTest.java index 896099ee7..00af43cf7 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/SofaModuleHealthCheckerTest.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/SofaModuleHealthCheckerTest.java @@ -72,7 +72,7 @@ public void testCustomConfig() { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) static class EmptyConfiguration { } diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/StartupHealthCheckStageConfigurationTest.java b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/StartupHealthCheckStageConfigurationTest.java index 053991eb2..1e8036b1a 100644 --- a/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/StartupHealthCheckStageConfigurationTest.java +++ b/sofa-boot-project/sofa-boot-actuator-autoconfigure/src/test/java/com/alipay/sofa/actuator/autoconfigure/test/StartupHealthCheckStageConfigurationTest.java @@ -75,7 +75,7 @@ public void startupReporterNotExist() { })); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(value = { HealthEndpointProperties.class }) static class TestHealthCheckConfiguration { } 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 3b8aec5e1..505a376f0 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 @@ -41,7 +41,7 @@ /** * @author xuanbei 18/3/12 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaModuleProperties.class) @ConditionalOnClass(ApplicationRuntimeModel.class) @ConditionalOnProperty(value = "com.alipay.sofa.boot.enable-isle", matchIfMissing = true) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java index 44f18002b..999c22f97 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java @@ -69,7 +69,7 @@ /** * @author LiWei */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaBootRpcProperties.class) @ConditionalOnClass(SofaBootRpcProperties.class) public class SofaRpcAutoConfiguration { @@ -202,7 +202,7 @@ public ApplicationListener boltSwaggerServiceApplicationListener() { return new BoltSwaggerServiceApplicationListener(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ SofaBootRpcProperties.class, ReadinessCheckCallback.class, Health.class }) public static class RpcAfterHealthCheckCallbackConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/runtime/SofaRuntimeAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/runtime/SofaRuntimeAutoConfiguration.java index 1ffe65941..b064835ea 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/runtime/SofaRuntimeAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/runtime/SofaRuntimeAutoConfiguration.java @@ -52,7 +52,7 @@ /** * @author xuanbei 18/3/17 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaRuntimeConfigurationProperties.class) @ConditionalOnClass(SofaFramework.class) public class SofaRuntimeAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupAutoConfiguration.java index 9a4668309..cefdc01b3 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupAutoConfiguration.java @@ -30,7 +30,7 @@ * @author Zhijie * @since 2020/7/8 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(StartupReporter.class) @EnableConfigurationProperties(StartupProperties.class) public class SofaStartupAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java index 37a27dffa..2e321403e 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/startup/SofaStartupIsleAutoConfiguration.java @@ -37,7 +37,7 @@ * @author huzijie * @version SofaStartupIsleAutoConfiguration.java, v 0.1 2021年01月04日 7:07 下午 huzijie Exp $ */ -@Configuration +@Configuration(proxyBeanMethods = false) @AutoConfigureBefore(SofaModuleAutoConfiguration.class) @ConditionalOnClass({ ApplicationRuntimeModel.class, StartupReporter.class }) @ConditionalOnProperty(value = "com.alipay.sofa.boot.enable-isle", matchIfMissing = true) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/OpenTracingSpringMvcAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/OpenTracingSpringMvcAutoConfiguration.java index aa46cd52c..4a99079f3 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/OpenTracingSpringMvcAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/OpenTracingSpringMvcAutoConfiguration.java @@ -41,7 +41,7 @@ * @author yangguanchao * @since 2018/05/01 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ OpenTracingSpringMvcProperties.class, SofaTracerProperties.class }) @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.springmvc", value = "enable", matchIfMissing = true) @AutoConfigureAfter(SofaTracerAutoConfiguration.class) @@ -51,7 +51,7 @@ public class OpenTracingSpringMvcAutoConfiguration { @Autowired private OpenTracingSpringMvcProperties openTracingSpringProperties; - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnClass(SpringMvcSofaTracerFilter.class) public class SpringMvcDelegatingFilterProxyConfiguration { @@ -73,7 +73,7 @@ public FilterRegistrationBean springMvcDelegatingFilterProxy() { } } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnClass(WebfluxSofaTracerFilter.class) public class WebfluxSofaTracerFilterConfiguration { diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerAutoConfiguration.java index d361463f8..193947c34 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerAutoConfiguration.java @@ -40,7 +40,7 @@ * @author yangguanchao * @since 2018/05/08 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaTracerProperties.class) @ConditionalOnClass({ SpanReportListenerHolder.class, Tracer.class, SofaTracerProperties.class, FlexibleTracer.class }) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerDataSourceAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerDataSourceAutoConfiguration.java index e34a822f6..1eabec1f5 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerDataSourceAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerDataSourceAutoConfiguration.java @@ -31,7 +31,7 @@ * @author qilong.zql * @since 2.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaTracerDataSourceProperties.class) @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.datasource", value = "enable", matchIfMissing = true) @ConditionalOnClass({ SmartDataSource.class, SofaTracerDataSourceProperties.class }) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerFeignClientAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerFeignClientAutoConfiguration.java index 17a33be76..2edd0b2e4 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerFeignClientAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerFeignClientAutoConfiguration.java @@ -30,7 +30,7 @@ /** * @author guolei.sgl (guolei.sgl@antfin.com) 2019/3/13 6:04 PM **/ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ Client.class, SofaTracerFeignContextBeanPostProcessor.class, SofaTracerFeignContext.class }) @AutoConfigureBefore(FeignAutoConfiguration.class) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java index af44c022a..80c792918 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java @@ -28,19 +28,19 @@ /** * @author guolei.sgl (guolei.sgl@antfin.com) 2019/9/11 9:43 PM **/ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.resttemplate", value = "enable", matchIfMissing = true) @ConditionalOnClass({ RestTemplateTracer.class, SofaTracerRestTemplateEnhance.class }) public class SofaTracerRestTemplateAutoConfiguration { @Bean - public SofaTracerRestTemplateBeanPostProcessor sofaTracerRestTemplateBeanPostProcessor() { - return new SofaTracerRestTemplateBeanPostProcessor(sofaTracerRestTemplateEnhance()); + public SofaTracerRestTemplateEnhance sofaTracerRestTemplateEnhance() { + return new SofaTracerRestTemplateEnhance(); } @Bean - public SofaTracerRestTemplateEnhance sofaTracerRestTemplateEnhance() { - return new SofaTracerRestTemplateEnhance(); + public SofaTracerRestTemplateBeanPostProcessor sofaTracerRestTemplateBeanPostProcessor(SofaTracerRestTemplateEnhance sofaTracerRestTemplateEnhance) { + return new SofaTracerRestTemplateBeanPostProcessor(sofaTracerRestTemplateEnhance); } } diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/TracerAnnotationAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/TracerAnnotationAutoConfiguration.java index 1a7230fc2..4fd8acde0 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/TracerAnnotationAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/TracerAnnotationAutoConfiguration.java @@ -32,7 +32,7 @@ /** * @author guolei.sgl (guolei.sgl@antfin.com) 2019/8/9 3:20 PM **/ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnProperty(prefix = "com.alipay.sofa.tracer.flexible", value = "enable", matchIfMissing = true) @AutoConfigureAfter(SofaTracerAutoConfiguration.class) @ConditionalOnBean(Tracer.class) diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/ZipkinSofaTracerAutoConfiguration.java b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/ZipkinSofaTracerAutoConfiguration.java index 571b64455..abb90f5d0 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/ZipkinSofaTracerAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/ZipkinSofaTracerAutoConfiguration.java @@ -34,7 +34,7 @@ * @author yangguanchao * @since 2018/05/01 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(ZipkinSofaTracerProperties.class) @ConditionalOnProperty(value = "com.alipay.sofa.tracer.zipkin.enabled", matchIfMissing = true) @ConditionalOnClass({ zipkin2.Span.class, zipkin2.reporter.AsyncReporter.class, RestTemplate.class, diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimeManagerTest.java b/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimeManagerTest.java index db4e49398..383c364a2 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimeManagerTest.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimeManagerTest.java @@ -47,7 +47,7 @@ public void testSofaRuntimeManagerHasCtx() { Assert.assertNotNull(applicationContext.getBean("sofaRuntimeContext")); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class SofaRuntimeManagerTestConfiguration { } diff --git a/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimePropertiesTest.java b/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimePropertiesTest.java index cb455f763..67b6f6c9f 100644 --- a/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimePropertiesTest.java +++ b/sofa-boot-project/sofa-boot-autoconfigure/src/test/java/com/alipay/sofa/autoconfigure/test/runtime/SofaRuntimePropertiesTest.java @@ -92,7 +92,7 @@ public void testExtensionFailureInsulating() { Assert.assertTrue(configurationProperties.isExtensionFailureInsulating()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class SofaRuntimePropertiesTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/AfterHealthReadinessCheckCallbackTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/AfterHealthReadinessCheckCallbackTest.java index 7b6284996..fc5b15a42 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/AfterHealthReadinessCheckCallbackTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/AfterHealthReadinessCheckCallbackTest.java @@ -132,7 +132,7 @@ private void initApplicationContext(boolean health, boolean mark, Class clazz) { ctx = springApplication.run(); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReadinessCheckCallbackBreakTestConfiguration extends AfterHealthReadinessCheckCallbackTestConfiguration { @Bean @@ -146,7 +146,7 @@ public LowestOrderReadinessCheckCallback lowestOrderReadinessCheckCallback() { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class AfterHealthReadinessCheckCallbackTestConfiguration { @@ -181,7 +181,7 @@ public HealthIndicatorProcessor healthIndicatorProcessor() { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReadinessCheckFailedTestConfiguration extends AfterHealthReadinessCheckCallbackTestConfiguration { @Bean @@ -190,7 +190,7 @@ public HealthChecker failedHealthCheck() { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReadinessCheckSuccessTestConfiguration extends AfterHealthReadinessCheckCallbackTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckConfigurationTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckConfigurationTest.java index 178e2632e..fcfc84b6e 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckConfigurationTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckConfigurationTest.java @@ -84,7 +84,7 @@ private void initApplicationContext(Map properties, Class config applicationContext = springApplication.run(); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class HealthCheckConfigurationTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckInsulatorTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckInsulatorTest.java index b5834c3bd..a69f8ac42 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckInsulatorTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckInsulatorTest.java @@ -39,7 +39,7 @@ public class HealthCheckInsulatorTest { @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) - @Configuration + @Configuration(proxyBeanMethods = false) static class HealthCheckConfiguration { @Bean public AfterReadinessCheckCallbackProcessor afterReadinessCheckCallbackProcessor() { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckerProcessorTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckerProcessorTest.java index 54e1b6887..5c59549b5 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckerProcessorTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthCheckerProcessorTest.java @@ -60,7 +60,7 @@ public class HealthCheckerProcessorTest { private ApplicationContext applicationContext; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class HealthCheckerProcessorTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorCheckProcessorTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorCheckProcessorTest.java index 62c99cf67..4851a92c8 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorCheckProcessorTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorCheckProcessorTest.java @@ -49,7 +49,7 @@ public class HealthIndicatorCheckProcessorTest { private ApplicationContext applicationContext; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class HealthIndicatorConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorExclusionTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorExclusionTest.java index 1a8a25f2a..ee4d347e0 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorExclusionTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/HealthIndicatorExclusionTest.java @@ -45,7 +45,7 @@ public class HealthIndicatorExclusionTest { private ApplicationContext applicationContext; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class HealthIndicatorConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerSuccessTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerSuccessTest.java index a2833589d..8d89f34d9 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerSuccessTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerSuccessTest.java @@ -52,7 +52,7 @@ public class ManualReadinessCheckListenerSuccessTest { @Autowired private ApplicationContext applicationContext; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class HealthCheckConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerTest.java index 4bbcb972d..698739e9a 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ManualReadinessCheckListenerTest.java @@ -58,7 +58,7 @@ public class ManualReadinessCheckListenerTest { @Autowired private ApplicationAvailability applicationAvailability; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) @Import(ApplicationAvailabilityAutoConfiguration.class) diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReactiveHealthIndicatorTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReactiveHealthIndicatorTest.java index 7395d773d..19b73cd51 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReactiveHealthIndicatorTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReactiveHealthIndicatorTest.java @@ -64,7 +64,7 @@ public void testReadinessCheckFailedHttpCode() { Assert.assertNotNull(healthMap.get("reactiveDemo").getDetails().get("reactiveTest")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ReactiveHealthIndicatorConfiguration { @Bean public ReactiveHealthIndicator reactiveDemoHealthIndicator() { @@ -72,7 +72,7 @@ public ReactiveHealthIndicator reactiveDemoHealthIndicator() { } } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) static class ReactiveHealthIndicatorTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessCheckListenerTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessCheckListenerTest.java index d08f7d25c..36d3dca8e 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessCheckListenerTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessCheckListenerTest.java @@ -61,7 +61,7 @@ public class ReadinessCheckListenerTest { @Autowired private ApplicationAvailability applicationAvailability; - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) @Import(ApplicationAvailabilityAutoConfiguration.class) diff --git a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessHealthCheckHttpCodeTest.java b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessHealthCheckHttpCodeTest.java index d35452661..b2b509a8d 100644 --- a/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessHealthCheckHttpCodeTest.java +++ b/sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReadinessHealthCheckHttpCodeTest.java @@ -60,7 +60,7 @@ public void testVersions404HttpCode() { Assert.assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); } - @Configuration + @Configuration(proxyBeanMethods = false) static class DownHealthIndicatorConfiguration { @Bean public HealthIndicator downHealthIndicator() { diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleTest.java index 50813aaf5..5a764d168 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleTest.java @@ -79,7 +79,7 @@ public void test() { Assert.assertFalse(applicationRuntimeModel.getInstalled().contains(failModule)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaModuleProperties.class) public static class FailModuleTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleWithParallelTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleWithParallelTest.java index 4e02233b3..a6df94fda 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleWithParallelTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/FailModuleWithParallelTest.java @@ -61,7 +61,7 @@ public void test() { } @Import(FailModuleTest.FailModuleTestConfiguration.class) - @Configuration + @Configuration(proxyBeanMethods = false) static class FailModuleWithParallelTestConfiguration { // ignore } diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/ModelCreatingStageTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/ModelCreatingStageTest.java index 1e3aafc09..4cf49cf7d 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/ModelCreatingStageTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/ModelCreatingStageTest.java @@ -60,7 +60,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws this.applicationContext = applicationContext; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaModuleProperties.class) static class ModelCreatingStageTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PipelineStageTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PipelineStageTest.java index 262a2d95a..58505c16f 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PipelineStageTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PipelineStageTest.java @@ -65,7 +65,7 @@ public void testStage() { Assert.assertEquals(30000, pipelineStages.get(3).getOrder()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaModuleProperties.class) static class StageTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PostProcessorShareTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PostProcessorShareTest.java index d7abda431..33cbb333c 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PostProcessorShareTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/PostProcessorShareTest.java @@ -67,7 +67,7 @@ public void test() { Assert.assertTrue(processors.keySet().contains("testE")); } - @Configuration + @Configuration(proxyBeanMethods = false) static class ProcessorConfig { @Bean diff --git a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/SofaModuleProfileCheckerTest.java b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/SofaModuleProfileCheckerTest.java index ace3a9174..08de9893e 100644 --- a/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/SofaModuleProfileCheckerTest.java +++ b/sofa-boot-project/sofa-boot-core/isle-sofa-boot/src/test/java/com/alipay/sofa/isle/test/SofaModuleProfileCheckerTest.java @@ -112,7 +112,7 @@ public void test() throws Exception { Assert.assertTrue(sofaModuleProfileChecker.acceptModule(dd)); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableConfigurationProperties(SofaModuleProperties.class) static class SofaModuleProfileCheckerTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/HealthcheckTestConfiguration.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/HealthcheckTestConfiguration.java index 75a3fd2a5..2720a9aa1 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/HealthcheckTestConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/HealthcheckTestConfiguration.java @@ -31,7 +31,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @EnableConfigurationProperties({ HealthCheckProperties.class, SofaRuntimeConfigurationProperties.class }) public class HealthcheckTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/RuntimeTestConfiguration.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/RuntimeTestConfiguration.java index 02927f1a0..875663314 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/RuntimeTestConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/RuntimeTestConfiguration.java @@ -49,7 +49,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class RuntimeTestConfiguration { @Bean public static BindingConverterFactory bindingConverterFactory() { diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaRpcTestAutoConfiguration.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaRpcTestAutoConfiguration.java index c622e6713..45f2f7bdd 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaRpcTestAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaRpcTestAutoConfiguration.java @@ -63,7 +63,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) @Import({ RuntimeTestConfiguration.class, HealthcheckTestConfiguration.class }) @EnableConfigurationProperties(SofaBootRpcProperties.class) public class SofaRpcTestAutoConfiguration { @@ -174,7 +174,7 @@ public ApplicationListener boltSwaggerServiceApplicationListener() { return new BoltSwaggerServiceApplicationListener(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ReadinessCheckCallback.class) public static class RpcAfterHealthCheckCallbackConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/misc/ComponentHealthCheckerTest.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/misc/ComponentHealthCheckerTest.java index ded0de015..344e7da80 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/misc/ComponentHealthCheckerTest.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/misc/ComponentHealthCheckerTest.java @@ -56,7 +56,7 @@ public void componentHealthCheckerTest() { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class ComponentHealthCheckerTestConfiguration { @Bean public ComponentHealthChecker sofaComponentHealthChecker(SofaRuntimeContext sofaRuntimeContext) { diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/parameter/ParameterAnnotationTest.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/parameter/ParameterAnnotationTest.java index 5270a550a..d099bfd03 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/parameter/ParameterAnnotationTest.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/parameter/ParameterAnnotationTest.java @@ -74,7 +74,7 @@ public void testParameter() { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class Config { @Bean diff --git a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/service/ServiceTest.java b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/service/ServiceTest.java index e3ac02d01..3613b5f4e 100644 --- a/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/service/ServiceTest.java +++ b/sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/service/ServiceTest.java @@ -63,7 +63,7 @@ public static void afterClass() { Assert.assertNull(serverConfig.getServer()); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class ServiceTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/AsyncInitTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/AsyncInitTest.java index 8bd8d96c9..70eba4b4c 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/AsyncInitTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/AsyncInitTest.java @@ -58,7 +58,7 @@ public void testAsyncInitBean() { TimeWasteBean.resetCount(); } - @Configuration + @Configuration(proxyBeanMethods = false) @ImportResource({ "classpath*:META-INF/async/*.xml" }) @Import(SofaRuntimeTestConfiguration.class) static class AsyncInitTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/BeanPostProcessorOrderTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/BeanPostProcessorOrderTest.java index 0bbe45c62..f717c38f7 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/BeanPostProcessorOrderTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/BeanPostProcessorOrderTest.java @@ -98,7 +98,7 @@ private List getApplicationShutdownAwares() throws Excepti return (List) applicationShutdownAwaresField.get(sofaRuntimeManager); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class BeanPostProcessorOrderTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ClientFactoryTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ClientFactoryTest.java index 974756e59..8be0966fd 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ClientFactoryTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ClientFactoryTest.java @@ -93,7 +93,7 @@ public void testPublishAndReferenceServiceViaClientFactory() { Assert.assertEquals(sampleService, referenceClient.reference(referenceParam)); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class ClientFactoryTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentLifeCycleTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentLifeCycleTest.java index 34b541f06..bce16cf84 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentLifeCycleTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentLifeCycleTest.java @@ -55,7 +55,7 @@ public void testComponentLifeCycle() { Assert.assertEquals("deactivated", lifeCycleSampleService.service()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class ComponentLifeCycleTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentManagerTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentManagerTest.java index 7c38c210b..c8126100d 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentManagerTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ComponentManagerTest.java @@ -65,7 +65,7 @@ public void testAppName() { Assert.assertEquals("ComponentManagerTest", sofaRuntimeContext.getAppName()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class ComponentManagerTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ExtensionTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ExtensionTest.java index f7c25ea2d..6acae9ced 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ExtensionTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ExtensionTest.java @@ -235,7 +235,7 @@ public void setExtensionClient(ExtensionClient extensionClient) { this.extensionClient = extensionClient; } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) @ImportResource("classpath*:META-INF/extension/test-extension.xml") static class ExtensionTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/RuntimeContextAwareTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/RuntimeContextAwareTest.java index a7d95c4c7..57cf0f8a3 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/RuntimeContextAwareTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/RuntimeContextAwareTest.java @@ -47,7 +47,7 @@ public void testRuntimeContextAware() { Assert.assertNotNull(runtimeContextAwareBean.getSofaRuntimeContext()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class RuntimeContextAwareTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceAopTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceAopTest.java index 29e047b8c..72f04d3d5 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceAopTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceAopTest.java @@ -67,7 +67,7 @@ public void testServiceAop() { Assert.assertFalse(StateAspect.isAspectInvoked()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import({ AopAutoConfiguration.class, RuntimeConfiguration.class }) @Aspect static class ServiceAopTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceWithoutInterfaceTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceWithoutInterfaceTest.java index 7399309af..a70a6f4cc 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceWithoutInterfaceTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/ServiceWithoutInterfaceTest.java @@ -47,7 +47,7 @@ public void testServiceNoInterface() { Assert.assertEquals("ServiceWithoutInterface", serviceWithoutInterface.service()); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class ServiceWithoutInterfaceTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaBindingTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaBindingTest.java index f9d14452b..264b48830 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaBindingTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaBindingTest.java @@ -183,7 +183,7 @@ public void testBindingType() { Assert.assertEquals(map.get(null), null); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) @ImportResource("classpath*:META-INF/service/test-service.xml") static class SofaBindingTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaEventHandlerTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaEventHandlerTest.java index 14523b8c4..36e4c3dce 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaEventHandlerTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaEventHandlerTest.java @@ -173,7 +173,7 @@ public Biz getBiz(SofaRuntimeManager sofaRuntimeManager) { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) static class SofaEventHandlerTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaFactoryBeanTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaFactoryBeanTest.java index 977b8337d..c12634ee7 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaFactoryBeanTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaFactoryBeanTest.java @@ -103,7 +103,7 @@ public void testServiceFactoryBean() throws Exception{ }); } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) @ImportResource("classpath*:META-INF/service/test-service.xml") static class SofaFactoryBeanTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaServiceAndReferenceTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaServiceAndReferenceTest.java index ebee9e7bc..1f82cea07 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaServiceAndReferenceTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/SofaServiceAndReferenceTest.java @@ -186,7 +186,7 @@ public void testSofaReferenceOnStaticField() throws IOException, NoSuchFieldExce + SofaServiceAndReferenceTest.class.getDeclaredField("staticSampleService"))); } - @Configuration + @Configuration(proxyBeanMethods = false) static class MultipleBindingsSofaServiceConfiguration { /** * since the sofa-boot does not have any binding converter implementation, @@ -199,7 +199,7 @@ SampleService sampleService() { } } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestSofaReferenceConfiguration { @Bean public SampleService sampleService(@SofaReference(uniqueId = "rpc", binding = @SofaReferenceBinding(bindingType = "bolt")) SampleService sampleService) { @@ -207,7 +207,7 @@ public SampleService sampleService(@SofaReference(uniqueId = "rpc", binding = @S } } - @Configuration + @Configuration(proxyBeanMethods = false) static class TestSofaReferenceOnMethodConfiguration { @Bean public SofaServiceAndReferenceTest sofaServiceAndReferenceTest() { @@ -221,7 +221,7 @@ public SampleService sampleService() { } } - @Configuration + @Configuration(proxyBeanMethods = false) @Import(RuntimeConfiguration.class) @EnableAutoConfiguration static class TestSofaServiceConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/StaticBeanPostProcessorTest.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/StaticBeanPostProcessorTest.java index 69f65e2f4..d8514ce7e 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/StaticBeanPostProcessorTest.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/StaticBeanPostProcessorTest.java @@ -47,7 +47,7 @@ public void testStaticBeanPostProcessor() { Assert.isTrue("aop".equals(StateMessage.getFactoryMessage())); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration @Import(RuntimeConfiguration.class) static class BeanPostProcessorTestConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/RuntimeConfiguration.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/RuntimeConfiguration.java index e19252c2c..428a7b804 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/RuntimeConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/RuntimeConfiguration.java @@ -48,7 +48,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class RuntimeConfiguration { @Bean public static BindingConverterFactory bindingConverterFactory() { diff --git a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/SofaRuntimeTestConfiguration.java b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/SofaRuntimeTestConfiguration.java index d2db2dd10..87d1460a1 100644 --- a/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/SofaRuntimeTestConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/runtime-sofa-boot/src/test/java/com/alipay/sofa/runtime/test/configuration/SofaRuntimeTestConfiguration.java @@ -28,7 +28,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class SofaRuntimeTestConfiguration { @Bean public AsyncProxyBeanPostProcessor asyncProxyBeanPostProcessor() { diff --git a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupAutoConfiguration.java b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupAutoConfiguration.java index a1e71981f..2f9b022d2 100644 --- a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupAutoConfiguration.java @@ -31,7 +31,7 @@ * @author Zhijie * @since 2020/7/8 */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass(StartupReporter.class) @EnableConfigurationProperties(StartupProperties.class) public class SofaStartupAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java index f067df9c8..31810470e 100644 --- a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupHealthCheckAutoConfiguration.java @@ -32,7 +32,7 @@ * @author huzijie * @version SofaStartupHealthCheckAutoConfiguration.java, v 0.1 2021年01月04日 9:19 下午 huzijie Exp $ */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ReadinessCheckListener.class, StartupReporter.class }) public class SofaStartupHealthCheckAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java index bd3d704bf..2489eaff9 100644 --- a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/configuration/SofaStartupIsleAutoConfiguration.java @@ -46,7 +46,7 @@ * @author huzijie * @version SofaStartupIsleAutoConfiguration.java, v 0.1 2021年01月04日 7:07 下午 huzijie Exp $ */ -@Configuration +@Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ApplicationRuntimeModel.class, StartupReporter.class }) @EnableConfigurationProperties({ SofaModuleProperties.class }) public class SofaStartupIsleAutoConfiguration { diff --git a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/spring/RuntimeConfiguration.java b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/spring/RuntimeConfiguration.java index f55a9c220..31eaef8e2 100644 --- a/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/spring/RuntimeConfiguration.java +++ b/sofa-boot-project/sofa-boot-core/startup-sofa-boot/src/test/java/com/alipay/sofa/startup/test/spring/RuntimeConfiguration.java @@ -48,7 +48,7 @@ * @author qilong.zql * @since 3.2.0 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class RuntimeConfiguration { @Bean public static BindingConverterFactory bindingConverterFactory() { diff --git a/sofa-boot-project/sofa-boot-starters/isle-sofa-boot-starter/src/test/java/com/alipay/sofa/isle/IsleSpringComponentTest.java b/sofa-boot-project/sofa-boot-starters/isle-sofa-boot-starter/src/test/java/com/alipay/sofa/isle/IsleSpringComponentTest.java index 56dc9abde..4a462bbb3 100644 --- a/sofa-boot-project/sofa-boot-starters/isle-sofa-boot-starter/src/test/java/com/alipay/sofa/isle/IsleSpringComponentTest.java +++ b/sofa-boot-project/sofa-boot-starters/isle-sofa-boot-starter/src/test/java/com/alipay/sofa/isle/IsleSpringComponentTest.java @@ -60,7 +60,7 @@ public void setSofaRuntimeContext(SofaRuntimeContext sofaRuntimeContext) { this.sofaRuntimeContext = sofaRuntimeContext; } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class IsleSpringComponentTestConfiguration { @Bean diff --git a/sofa-boot-project/sofa-boot-starters/log-sofa-boot-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogTestBase.java b/sofa-boot-project/sofa-boot-starters/log-sofa-boot-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogTestBase.java index 363fbeb32..0fba1ec9e 100644 --- a/sofa-boot-project/sofa-boot-starters/log-sofa-boot-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogTestBase.java +++ b/sofa-boot-project/sofa-boot-starters/log-sofa-boot-starter/src/test/java/com/alipay/sofa/common/boot/logging/test/LogTestBase.java @@ -64,7 +64,7 @@ protected File getLogbackDefaultFile(Environment environment) { } @EnableAutoConfiguration - @Configuration + @Configuration(proxyBeanMethods = false) protected static class EmptyConfig { } } diff --git a/sofa-boot-project/sofa-boot-starters/tracer-sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/base/HikariDataSourceConfiguration.java b/sofa-boot-project/sofa-boot-starters/tracer-sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/base/HikariDataSourceConfiguration.java index 8d51a834d..10f2a4379 100644 --- a/sofa-boot-project/sofa-boot-starters/tracer-sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/base/HikariDataSourceConfiguration.java +++ b/sofa-boot-project/sofa-boot-starters/tracer-sofa-boot-starter/src/test/java/com/alipay/sofa/tracer/boot/base/HikariDataSourceConfiguration.java @@ -28,7 +28,7 @@ * @author qilong.zql * @since 2.3.2 */ -@Configuration +@Configuration(proxyBeanMethods = false) public class HikariDataSourceConfiguration { @Value("${spring.datasource.url}") private String jdbcUrl; diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/cloud/SpringCloudEnvTest.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/cloud/SpringCloudEnvTest.java index e073c5669..a5b3ac66a 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/cloud/SpringCloudEnvTest.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/cloud/SpringCloudEnvTest.java @@ -81,7 +81,7 @@ public void clearLogDir() { FileSystemUtils.deleteRecursively(new File("./logs")); } - @Configuration + @Configuration(proxyBeanMethods = false) @EnableAutoConfiguration static class SpringCloudEnvTestConfiguration { diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/lisener/SofaConfigSourceSupportListenerTest.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/lisener/SofaConfigSourceSupportListenerTest.java index adb82fe5f..116cad4d6 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/lisener/SofaConfigSourceSupportListenerTest.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/lisener/SofaConfigSourceSupportListenerTest.java @@ -50,7 +50,7 @@ public void test() { Assert.assertEquals("systemValue", SofaConfigs.getOrDefault(key4)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SofaBootTestConfiguration { } diff --git a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/spring/SofaBootstrapTest.java b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/spring/SofaBootstrapTest.java index eb063a822..109e3106c 100644 --- a/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/spring/SofaBootstrapTest.java +++ b/sofa-boot-project/sofa-boot/src/test/java/com/alipay/sofa/boot/test/spring/SofaBootstrapTest.java @@ -64,7 +64,7 @@ public void environmentCustomizeTest() { Assert.assertNotNull(propertySources.get(SofaBootConstants.SOFA_DEFAULT_PROPERTY_SOURCE)); } - @Configuration + @Configuration(proxyBeanMethods = false) static class SofaBootstrapTestConfiguration { }