Skip to content

Commit 18a4227

Browse files
author
Ryan Baxter
committed
Added proxyBeanMethods = false to configuration classes. Fixes spring-cloud#623 
1 parent 80a9a38 commit 18a4227

File tree

100 files changed

+147
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+147
-147
lines changed

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
* @author Olga Maciaszek-Sharma
4848
* @author Tim Ysewyn
4949
*/
50-
@Configuration
50+
@Configuration(proxyBeanMethods = false)
5151
public class CommonsClientAutoConfiguration {
5252

53-
@Configuration
53+
@Configuration(proxyBeanMethods = false)
5454
@ConditionalOnClass(HealthIndicator.class)
5555
@EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class)
5656
@ConditionalOnBean(DiscoveryClient.class)
@@ -84,7 +84,7 @@ public HasFeatures commonsFeatures() {
8484

8585
}
8686

87-
@Configuration
87+
@Configuration(proxyBeanMethods = false)
8888
@ConditionalOnClass(Endpoint.class)
8989
@ConditionalOnProperty(value = "spring.cloud.features.enabled", matchIfMissing = true)
9090
protected static class ActuatorConfiguration {

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
* @author Tim Ysewyn
4141
* @since 2.2.0
4242
*/
43-
@Configuration
43+
@Configuration(proxyBeanMethods = false)
4444
public class ReactiveCommonsClientAutoConfiguration {
4545

46-
@Configuration
46+
@Configuration(proxyBeanMethods = false)
4747
@EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class)
4848
@ConditionalOnClass(ReactiveHealthIndicator.class)
4949
@ConditionalOnBean(ReactiveDiscoveryClient.class)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Biju Kunjummen
3232
*/
3333

34-
@Configuration
34+
@Configuration(proxyBeanMethods = false)
3535
@AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class)
3636
public class CompositeDiscoveryClientAutoConfiguration {
3737

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/reactive/ReactiveCompositeDiscoveryClientAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Tim Ysewyn
3232
* @since 2.2.0
3333
*/
34-
@Configuration
34+
@Configuration(proxyBeanMethods = false)
3535
@ConditionalOnDiscoveryEnabled
3636
@ConditionalOnReactiveDiscoveryEnabled
3737
public class ReactiveCompositeDiscoveryClientAutoConfiguration {

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/noop/NoopDiscoveryClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* instead}.
4646
* @author Dave Syer
4747
*/
48-
@Configuration
48+
@Configuration(proxyBeanMethods = false)
4949
@EnableConfigurationProperties
5050
@ConditionalOnMissingBean(DiscoveryClient.class)
5151
@Deprecated
@@ -120,7 +120,7 @@ private interface PortFinder {
120120

121121
}
122122

123-
@Configuration
123+
@Configuration(proxyBeanMethods = false)
124124
@ConditionalOnClass(name = {
125125
"org.springframework.web.context.support.GenericWebApplicationContext",
126126
"org.springframework.boot.context.embedded.EmbeddedWebApplicationContext" })

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
* @author Biju Kunjummen
4040
*/
41-
@Configuration
41+
@Configuration(proxyBeanMethods = false)
4242
@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class,
4343
CommonsClientAutoConfiguration.class })
4444
public class SimpleDiscoveryClientAutoConfiguration

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/reactive/SimpleReactiveDiscoveryClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* @author Tim Ysewyn
4747
* @since 2.2.0
4848
*/
49-
@Configuration
49+
@Configuration(proxyBeanMethods = false)
5050
@ConditionalOnDiscoveryEnabled
5151
@ConditionalOnReactiveDiscoveryEnabled
5252
@EnableConfigurationProperties(DiscoveryClientHealthIndicatorProperties.class)
@@ -101,7 +101,7 @@ public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEve
101101
}
102102
}
103103

104-
@Configuration
104+
@Configuration(proxyBeanMethods = false)
105105
@ConditionalOnClass(ReactiveHealthIndicator.class)
106106
protected static class HealthConfiguration {
107107

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/hypermedia/CloudHypermediaAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* @author Oliver Gierke
3737
*/
38-
@Configuration
38+
@Configuration(proxyBeanMethods = false)
3939
@ConditionalOnBean(type = "org.springframework.cloud.client.hypermedia.RemoteResource")
4040
@EnableConfigurationProperties(CloudHypermediaProperties.class)
4141
public class CloudHypermediaAutoConfiguration {

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/AsyncLoadBalancerAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
*
3535
* @author Rob Worsnop
3636
*/
37-
@Configuration
37+
@Configuration(proxyBeanMethods = false)
3838
@ConditionalOnBean(LoadBalancerClient.class)
3939
@ConditionalOnClass(AsyncRestTemplate.class)
4040
public class AsyncLoadBalancerAutoConfiguration {
4141

42-
@Configuration
42+
@Configuration(proxyBeanMethods = false)
4343
static class AsyncRestTemplateCustomizerConfig {
4444

4545
@LoadBalanced
@@ -63,7 +63,7 @@ public void afterSingletonsInstantiated() {
6363

6464
}
6565

66-
@Configuration
66+
@Configuration(proxyBeanMethods = false)
6767
static class LoadBalancerInterceptorConfig {
6868

6969
@Bean

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* @author Will Tran
4343
* @author Gang Li
4444
*/
45-
@Configuration
45+
@Configuration(proxyBeanMethods = false)
4646
@ConditionalOnClass(RestTemplate.class)
4747
@ConditionalOnBean(LoadBalancerClient.class)
4848
@EnableConfigurationProperties(LoadBalancerRetryProperties.class)
@@ -74,7 +74,7 @@ public LoadBalancerRequestFactory loadBalancerRequestFactory(
7474
return new LoadBalancerRequestFactory(loadBalancerClient, this.transformers);
7575
}
7676

77-
@Configuration
77+
@Configuration(proxyBeanMethods = false)
7878
@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
7979
static class LoadBalancerInterceptorConfig {
8080

@@ -102,7 +102,7 @@ public RestTemplateCustomizer restTemplateCustomizer(
102102
/**
103103
* Auto configuration for retry mechanism.
104104
*/
105-
@Configuration
105+
@Configuration(proxyBeanMethods = false)
106106
@ConditionalOnClass(RetryTemplate.class)
107107
public static class RetryAutoConfiguration {
108108

@@ -118,7 +118,7 @@ public LoadBalancedRetryFactory loadBalancedRetryFactory() {
118118
/**
119119
* Auto configuration for retry intercepting mechanism.
120120
*/
121-
@Configuration
121+
@Configuration(proxyBeanMethods = false)
122122
@ConditionalOnClass(RetryTemplate.class)
123123
public static class RetryInterceptorAutoConfiguration {
124124

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/LoadBalancerBeanPostProcessorAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @author Olga Maciaszek-Sharma
4444
* @since 2.2.0
4545
*/
46-
@Configuration
46+
@Configuration(proxyBeanMethods = false)
4747
@ConditionalOnClass(WebClient.class)
4848
@Conditional(LoadBalancerBeanPostProcessorAutoConfiguration.OnAnyLoadBalancerImplementationPresentCondition.class)
4949
public class LoadBalancerBeanPostProcessorAutoConfiguration {
@@ -56,7 +56,7 @@ public LoadBalancerWebClientBuilderBeanPostProcessor loadBalancerWebClientBuilde
5656
deferringExchangeFilterFunction, context);
5757
}
5858

59-
@Configuration
59+
@Configuration(proxyBeanMethods = false)
6060
@Conditional(ReactorLoadBalancerClientAutoConfiguration.OnNoRibbonDefaultCondition.class)
6161
@ConditionalOnBean(ReactiveLoadBalancer.Factory.class)
6262
protected static class ReactorDeferringLoadBalancerFilterConfig {
@@ -71,7 +71,7 @@ DeferringLoadBalancerExchangeFilterFunction<ReactorLoadBalancerExchangeFilterFun
7171

7272
}
7373

74-
@Configuration
74+
@Configuration(proxyBeanMethods = false)
7575
@ConditionalOnBean(LoadBalancerClient.class)
7676
@AutoConfigureAfter(ReactorDeferringLoadBalancerFilterConfig.class)
7777
@Deprecated

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactiveLoadBalancerAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @author Spencer Gibb
3131
* @author Olga Maciaszek-Sharma
3232
*/
33-
@Configuration
33+
@Configuration(proxyBeanMethods = false)
3434
@ConditionalOnClass(WebClient.class)
3535
@ConditionalOnBean(LoadBalancerClient.class)
3636
@AutoConfigureAfter(ReactorLoadBalancerClientAutoConfiguration.class)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/reactive/ReactorLoadBalancerClientAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @author Olga Maciaszek-Sharma
4141
* @since 2.2.0
4242
*/
43-
@Configuration
43+
@Configuration(proxyBeanMethods = false)
4444
@ConditionalOnClass(WebClient.class)
4545
@ConditionalOnBean(ReactiveLoadBalancer.Factory.class)
4646
public class ReactorLoadBalancerClientAutoConfiguration {
@@ -54,7 +54,7 @@ public ReactorLoadBalancerClientRibbonWarnLogger reactorLoadBalancerClientRibbon
5454
return new ReactorLoadBalancerClientRibbonWarnLogger();
5555
}
5656

57-
@Configuration
57+
@Configuration(proxyBeanMethods = false)
5858
@Conditional(OnNoRibbonDefaultCondition.class)
5959
protected static class ReactorLoadBalancerExchangeFilterFunctionConfig {
6060

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* @author Spencer Gibb
2828
*/
29-
@Configuration
29+
@Configuration(proxyBeanMethods = false)
3030
@Import(AutoServiceRegistrationConfiguration.class)
3131
@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
3232
matchIfMissing = true)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* @author Spencer Gibb
2525
*/
26-
@Configuration
26+
@Configuration(proxyBeanMethods = false)
2727
@EnableConfigurationProperties(AutoServiceRegistrationProperties.class)
2828
@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled",
2929
matchIfMissing = true)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* @author Spencer Gibb
3030
*/
31-
@Configuration
31+
@Configuration(proxyBeanMethods = false)
3232
public class ServiceRegistryAutoConfiguration {
3333

3434
@ConditionalOnBean(ServiceRegistry.class)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/HttpClientConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
/**
3030
* @author Ryan Baxter
3131
*/
32-
@Configuration
32+
@Configuration(proxyBeanMethods = false)
3333
public class HttpClientConfiguration {
3434

35-
@Configuration
35+
@Configuration(proxyBeanMethods = false)
3636
@ConditionalOnProperty(name = "spring.cloud.httpclientfactories.apache.enabled",
3737
matchIfMissing = true)
3838
@ConditionalOnClass(HttpClient.class)
@@ -59,7 +59,7 @@ public ApacheHttpClientFactory apacheHttpClientFactory(
5959

6060
}
6161

62-
@Configuration
62+
@Configuration(proxyBeanMethods = false)
6363
@ConditionalOnProperty(name = "spring.cloud.httpclientfactories.ok.enabled",
6464
matchIfMissing = true)
6565
@ConditionalOnClass(OkHttpClient.class)

‎spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/UtilAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* @author Spencer Gibb
2828
*/
29-
@Configuration
29+
@Configuration(proxyBeanMethods = false)
3030
@ConditionalOnProperty(value = "spring.cloud.util.enabled", matchIfMissing = true)
3131
@AutoConfigureOrder(0)
3232
@EnableConfigurationProperties

‎spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Marcin Grzejszczak
3333
* @since 1.3.6
3434
*/
35-
@Configuration
35+
@Configuration(proxyBeanMethods = false)
3636
@ConditionalOnProperty(value = "spring.cloud.compatibility-verifier.enabled",
3737
matchIfMissing = true)
3838
@AutoConfigureOrder(0)

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/actuator/FeaturesEndpointTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private FeaturesEndpoint.Feature newFeature(String name, Class<?> type) {
6868
return new FeaturesEndpoint.Feature(name, type.getCanonicalName(), null, null);
6969
}
7070

71-
@Configuration
71+
@Configuration(proxyBeanMethods = false)
7272
public static class FeaturesConfig {
7373

7474
@Bean
@@ -87,7 +87,7 @@ HasFeatures localFeatures() {
8787

8888
}
8989

90-
@Configuration
90+
@Configuration(proxyBeanMethods = false)
9191
@EnableConfigurationProperties
9292
public static class Config {
9393

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AutoRegisterPropertyFalseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void veryifyBeans() {
6060
}
6161

6262
@EnableAutoConfiguration
63-
@Configuration
63+
@Configuration(proxyBeanMethods = false)
6464
public static class App {
6565

6666
}

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientAutoRegisterFalseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void veryifyBeans() {
5959
}
6060

6161
@EnableAutoConfiguration
62-
@Configuration
62+
@Configuration(proxyBeanMethods = false)
6363
@EnableDiscoveryClient(autoRegister = false)
6464
public static class App {
6565

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/EnableDiscoveryClientMissingImplTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testContextFails() {
4949
}
5050

5151
@EnableAutoConfiguration
52-
@Configuration
52+
@Configuration(proxyBeanMethods = false)
5353
@EnableDiscoveryClient
5454
// this will fail with @EnableDiscoveryClient and no implementation (nothing in
5555
// spring.factories)

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void simpleDiscoveryClientShouldBeHaveTheLowestPrecedence() {
6565
}
6666

6767
@EnableAutoConfiguration
68-
@Configuration
68+
@Configuration(proxyBeanMethods = false)
6969
public static class Config {
7070

7171
@Bean

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientTestsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* @author Olga Maciaszek-Sharma
3535
* @author Tim Ysewyn
3636
*/
37-
@Configuration
37+
@Configuration(proxyBeanMethods = false)
3838
@EnableAutoConfiguration
3939
public class CompositeDiscoveryClientTestsConfig {
4040

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryClientHealthIndicatorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private Status assertHealth(Health health, Status expected) {
8787
return status;
8888
}
8989

90-
@Configuration
90+
@Configuration(proxyBeanMethods = false)
9191
@EnableConfigurationProperties
9292
public static class Config {
9393

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/DiscoveryClientAutoConfigurationDefaultTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void simpleDiscoveryClientShouldBeTheDefault() {
4747
}
4848

4949
@EnableAutoConfiguration
50-
@Configuration
50+
@Configuration(proxyBeanMethods = false)
5151
public static class Config {
5252

5353
}

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ReactiveSimpleDiscoveryPropertiesAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void testPort() {
5050
}
5151

5252
@EnableAutoConfiguration
53-
@Configuration
53+
@Configuration(proxyBeanMethods = false)
5454
public static class Config {
5555

5656
}

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/ServletSimpleDiscoveryPropertiesAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testPort() {
4949
}
5050

5151
@EnableAutoConfiguration
52-
@Configuration
52+
@Configuration(proxyBeanMethods = false)
5353
public static class Config {
5454

5555
}

‎spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientPropertiesMappingTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testGetANonExistentServiceShouldReturnAnEmptyList() {
9393
then(this.discoveryClient.getInstances("nonexistent")).isEmpty();
9494
}
9595

96-
@Configuration
96+
@Configuration(proxyBeanMethods = false)
9797
@EnableAutoConfiguration
9898
public static class SampleConfig {
9999

0 commit comments

Comments
 (0)