set proxyBeanMethods=false on @configuration (#846)

Co-authored-by: 致节 <[email protected]>

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 {

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 {

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 {

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

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 {
 }

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

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 {
     }
 

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 {
     }

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)

sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java

@@ -69,7 +69,7 @@
 /**
  * @author <a href="mailto:[email protected]">LiWei</a>
  */
-@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

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 {

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 {

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)

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 {

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 })

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 })

sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerFeignClientAutoConfiguration.java

@@ -30,7 +30,7 @@
 /**
  * @author guolei.sgl ([email protected]) 2019/3/13 6:04 PM
  **/
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ Client.class, SofaTracerFeignContextBeanPostProcessor.class,
                      SofaTracerFeignContext.class })
 @AutoConfigureBefore(FeignAutoConfiguration.class)

sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/SofaTracerRestTemplateAutoConfiguration.java

@@ -28,19 +28,19 @@
 /**
  * @author guolei.sgl ([email protected]) 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);
     }
 }

sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/tracer/TracerAnnotationAutoConfiguration.java

@@ -32,7 +32,7 @@
 /**
  * @author guolei.sgl ([email protected]) 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)

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,

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 {
     }

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 {
 

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

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<String, Object> properties, Class config
         applicationContext = springApplication.run();
     }
 
-    @Configuration
+    @Configuration(proxyBeanMethods = false)
     @EnableConfigurationProperties({ HealthCheckProperties.class,
             SofaRuntimeConfigurationProperties.class })
     static class HealthCheckConfigurationTestConfiguration {

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() {

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 {

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 {

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 {

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 {

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)

sofa-boot-project/sofa-boot-core/healthcheck-sofa-boot/src/test/java/com/alipay/sofa/healthcheck/test/ReactiveHealthIndicatorTest.java

@@ -64,15 +64,15 @@ public void testReadinessCheckFailedHttpCode() {
         Assert.assertNotNull(healthMap.get("reactiveDemo").getDetails().get("reactiveTest"));
     }
 
-    @Configuration
+    @Configuration(proxyBeanMethods = false)
     static class ReactiveHealthIndicatorConfiguration {
         @Bean
         public ReactiveHealthIndicator reactiveDemoHealthIndicator() {
             return () -> Mono.just(Health.up().withDetail("reactiveTest", new HashMap<>()).build());
         }
     }
 
-    @Configuration
+    @Configuration(proxyBeanMethods = false)
     @EnableConfigurationProperties({ HealthCheckProperties.class,
             SofaRuntimeConfigurationProperties.class })
     static class ReactiveHealthIndicatorTestConfiguration {

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)

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() {