Added proxyBeanMethods = false to configuration classes. Fixes #623

This commit is contained in:
Ryan Baxter
2019-11-14 20:04:28 -05:00
parent 80a9a38712
commit 18a4227c4e
100 changed files with 147 additions and 147 deletions

View File

@@ -34,7 +34,7 @@ import org.springframework.core.annotation.AliasFor;
*
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@Import(LoadBalancerClientConfigurationRegistrar.class)
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)

View File

@@ -46,7 +46,7 @@ import org.springframework.core.env.Environment;
* @author Olga Maciaszek-Sharma
* @author Tim Ysewyn
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnDiscoveryEnabled
public class LoadBalancerClientConfiguration {
@@ -63,7 +63,7 @@ public class LoadBalancerClientConfiguration {
ServiceInstanceListSupplier.class), name);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnReactiveDiscoveryEnabled
@Order(REACTIVE_SERVICE_INSTANCE_SUPPLIER_ORDER)
public static class ReactiveSupportConfiguration {
@@ -100,7 +100,7 @@ public class LoadBalancerClientConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBlockingDiscoveryEnabled
@Order(REACTIVE_SERVICE_INSTANCE_SUPPLIER_ORDER + 1)
public static class BlockingSupportConfiguration {

View File

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Import;
*
* @author Dave Syer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE })
@Documented

View File

@@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate;
* @author Olga Maciaszek-Sharma
* @since 2.1.3
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@LoadBalancerClients
@AutoConfigureAfter(LoadBalancerAutoConfiguration.class)
@AutoConfigureBefore({
@@ -61,7 +61,7 @@ public class BlockingLoadBalancerClientAutoConfiguration {
return new BlockingLoadBalancerClientRibbonWarnLogger();
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(RestTemplate.class)
@Conditional(OnNoRibbonDefaultCondition.class)
protected static class BlockingLoadbalancerClientConfig {

View File

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
* @author Spencer Gibb
* @author Olga Maciaszek-Sharma
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@LoadBalancerClients
@AutoConfigureBefore({ ReactorLoadBalancerClientAutoConfiguration.class,
LoadBalancerBeanPostProcessorAutoConfiguration.class,

View File

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
* @see CacheAutoConfiguration
* @see CacheAspectSupport
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ CacheManager.class, CacheAutoConfiguration.class })
@ConditionalOnMissingBean(CacheAspectSupport.class)
@EnableCaching

View File

@@ -141,7 +141,7 @@ class BlockingLoadBalancerClientTests {
}
}
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableAutoConfiguration
@SpringBootConfiguration
@LoadBalancerClients({