You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2020/02/04 20:33:50 UTC
[camel-spring-boot] 01/02: CAMEL-14471: camel-spring-boot: Disable
proxying of bean methods for auto-configuration classes
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9d2ec7cd5af5e8bdc58a9279ee93bce0b1430826
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Feb 2 14:52:22 2020 +0100
CAMEL-14471: camel-spring-boot: Disable proxying of bean methods for auto-configuration classes
---
.../java/org/apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +-
.../spring/boot/SupervisingRouteControllerAutoConfiguration.java | 2 +-
.../org/apache/camel/spring/boot/TypeConversionConfiguration.java | 2 +-
.../endpoint/CamelRouteControllerEndpointAutoConfiguration.java | 2 +-
.../actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java | 2 +-
.../spring/boot/actuate/health/CamelHealthAutoConfiguration.java | 2 +-
.../spring/boot/actuate/info/CamelInfoAutoConfiguration.java | 2 +-
.../camel/spring/boot/cloud/CamelCloudAutoConfiguration.java | 2 +-
.../CamelCloudServiceCallConfigurationAutoConfiguration.java | 2 +-
.../boot/cloud/CamelCloudServiceChooserAutoConfiguration.java | 2 +-
.../boot/cloud/CamelCloudServiceFilterAutoConfiguration.java | 2 +-
.../boot/cluster/ClusteredRouteControllerAutoConfiguration.java | 2 +-
.../spring/boot/health/HealthCheckRoutesAutoConfiguration.java | 2 +-
.../spring/boot/health/HealthCheckServiceAutoConfiguration.java | 2 +-
.../boot/properties/PropertiesComponentAutoConfiguration.java | 2 +-
.../camel/spring/boot/security/CamelSSLAutoConfiguration.java | 2 +-
.../consul/ConsulServerToServiceDefinitionAutoConfiguration.java | 2 +-
.../ServiceDefinitionToConsulRegistrationAutoConfiguration.java | 2 +-
.../spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java | 2 +-
.../CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java | 2 +-
...ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java | 2 +-
.../zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java | 2 +-
.../cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java | 2 +-
.../cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java | 2 +-
.../CamelSpringCloudServiceLoadBalancerAutoConfiguration.java | 2 +-
.../cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java | 2 +-
.../camel/springboot/maven/SpringBootAutoConfigurationMojo.java | 8 ++++----
27 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 2336ce6..924d5d9 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -51,7 +51,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MutablePropertySources;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(CamelConfigurationProperties.class)
@Import(TypeConversionConfiguration.class)
public class CamelAutoConfiguration {
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
index 8b493cb..4a013e3 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelAutoConfiguration.class)
@ConditionalOnProperty(prefix = "camel.supervising.controller", name = "enabled")
@EnableConfigurationProperties(SupervisingRouteControllerConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
index 3e0baac..a8fb5df 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java
@@ -29,7 +29,7 @@ import org.springframework.core.convert.support.DefaultConversionService;
import static java.util.Arrays.asList;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "camel.springboot.type-conversion", matchIfMissing = true)
public class TypeConversionConfiguration {
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
index 917b911..00bf60f 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointAutoConfiguration.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
/**
* Auto configuration for the {@link CamelRouteControllerEndpoint}.
*/
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({CamelRouteControllerEndpoint.class})
@ConditionalOnBean(CamelAutoConfiguration.class)
@AutoConfigureAfter(CamelAutoConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
index 9a9ebd8..6390ee5 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointAutoConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
/**
* Auto configuration for the {@link CamelRoutesEndpoint}.
*/
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties({ CamelRoutesEndpointProperties.class })
@ConditionalOnClass({CamelRoutesEndpoint.class})
@ConditionalOnBean(CamelAutoConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
index 839dc5b..1cf2f43 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
@@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({HealthIndicator.class})
@ConditionalOnBean(CamelAutoConfiguration.class)
@AutoConfigureAfter(CamelAutoConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
index 7a9edc9..dda7a53 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/info/CamelInfoAutoConfiguration.java
@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({InfoContributor.class})
@ConditionalOnBean(CamelAutoConfiguration.class)
@AutoConfigureAfter(CamelAutoConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
index 853baf3..f759775 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(CamelAutoConfiguration.class)
@AutoConfigureAfter(CamelAutoConfiguration.class)
@ConditionalOnProperty(value = "camel.cloud.enabled", matchIfMissing = true)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
index 579e776..be17fe8 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean({ CamelCloudAutoConfiguration.class, CamelContext.class})
@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
@Conditional(CamelCloudServiceCallConfigurationAutoConfiguration.ServiceCallCondition.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
index 5053fd4..3f559c8 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(CamelCloudAutoConfiguration.class)
@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
@Conditional(CamelCloudServiceChooserAutoConfiguration.ServiceChooserCondition.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
index 9f009e7..04fdd63 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(CamelCloudAutoConfiguration.class)
@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
@Conditional(CamelCloudServiceFilterAutoConfiguration.Condition.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
index 381bf2c..25be33f 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
@@ -42,7 +42,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelAutoConfiguration.class)
@ConditionalOnProperty(prefix = "camel.clustered.controller", name = "enabled")
@EnableConfigurationProperties(ClusteredRouteControllerConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
index 776b0f2..8e16d2c 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckRoutesAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelAutoConfiguration.class)
@Conditional(HealthCheckRoutesAutoConfiguration.Condition.class)
@EnableConfigurationProperties(HealthCheckRoutesConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
index 18eeaa0..2855dfc 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/health/HealthCheckServiceAutoConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(HealthCheckServiceAutoConfiguration.Condition.class)
@EnableConfigurationProperties(HealthCheckServiceConfiguration.class)
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
index b547183..931398d 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class})
@AutoConfigureAfter(CamelAutoConfiguration.class)
@EnableConfigurationProperties({PropertiesComponentConfiguration.class})
diff --git a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
index 75387dc..7407828 100644
--- a/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
+++ b/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.type.AnnotatedTypeMetadata;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelAutoConfiguration.class)
@EnableConfigurationProperties(CamelSSLConfigurationProperties.class)
@Conditional(CamelSSLAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java b/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
index 870b4af..d7af0fd 100644
--- a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
+++ b/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ConsulServerToServiceDefinitionAutoConfiguration.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.converter.Converter;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelSpringCloudServiceLoadBalancerAutoConfiguration.class)
@ConditionalOnConsulEnabled
@Conditional(ConsulServerToServiceDefinitionAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java b/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
index ee14f2f..27e0aae 100644
--- a/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
+++ b/camel-spring-cloud-consul/src/main/java/org/apache/camel/spring/cloud/consul/ServiceDefinitionToConsulRegistrationAutoConfiguration.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.converter.Converter;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelSpringCloudServiceRegistryAutoConfiguration.class)
@ConditionalOnConsulEnabled
@Conditional(ServiceDefinitionToConsulRegistrationAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java b/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
index b89b628..4df614a 100644
--- a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
+++ b/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixAutoConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(CamelAutoConfiguration.class)
@AutoConfigureAfter({ CamelAutoConfiguration.class, CamelCloudAutoConfiguration.class, RibbonAutoConfiguration.class })
@Conditional(CamelCloudNetflixAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java b/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
index 1022884..1357bcf 100644
--- a/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
+++ b/camel-spring-cloud-netflix/src/main/java/org/apache/camel/spring/cloud/netflix/CamelCloudNetflixServiceLoadBalancerAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.ConversionService;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(RibbonAutoConfiguration.class)
@AutoConfigureBefore(CamelSpringCloudServiceRegistryAutoConfiguration.class)
@Conditional(CamelCloudNetflixServiceLoadBalancerAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java b/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
index 32a5b39..4199524 100644
--- a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
+++ b/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ServiceDefinitionToZookeeperRegistrationAutoConfiguration.java
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.converter.Converter;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelSpringCloudServiceRegistryAutoConfiguration.class)
@ConditionalOnZookeeperEnabled
@Conditional(ServiceDefinitionToZookeeperRegistrationAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java b/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
index e51e67f..30969be 100644
--- a/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
+++ b/camel-spring-cloud-zookeeper/src/main/java/org/apache/camel/spring/cloud/zookeeper/ZookeeperToServiceDefinitionAutoConfiguration.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.converter.Converter;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureBefore(CamelSpringCloudServiceLoadBalancerAutoConfiguration.class)
@ConditionalOnZookeeperEnabled
@Conditional(ZookeeperToServiceDefinitionAutoConfiguration.Condition.class)
diff --git a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
index 6805ead..7f397fc 100644
--- a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
+++ b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudDiscoveryClientAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean({ CamelCloudAutoConfiguration.class, LoadBalancerClient.class })
@AutoConfigureAfter({ LoadBalancerAutoConfiguration.class, CamelCloudServiceDiscoveryAutoConfiguration.class })
@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
diff --git a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
index 5f90da6..a18a8fd 100644
--- a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
+++ b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceDiscoveryAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean({ CamelCloudAutoConfiguration.class, DiscoveryClient.class })
@AutoConfigureAfter(CompositeDiscoveryClientAutoConfiguration.class)
@AutoConfigureBefore(CamelCloudServiceDiscoveryAutoConfiguration.class)
diff --git a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
index 39f02bf..bf5a445 100644
--- a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
+++ b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceLoadBalancerAutoConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@ConditionalOnBean({ CamelCloudAutoConfiguration.class, LoadBalancerClient.class })
@AutoConfigureAfter({ LoadBalancerAutoConfiguration.class, CamelCloudServiceDiscoveryAutoConfiguration.class })
@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
diff --git a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
index c92f472..6219697 100644
--- a/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
+++ b/camel-spring-cloud/src/main/java/org/apache/camel/spring/cloud/CamelSpringCloudServiceRegistryAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
-@Configuration
+@Configuration(proxyBeanMethods = false)
@AutoConfigureAfter(ServiceRegistryAutoConfiguration.class)
@AutoConfigureBefore(CamelAutoConfiguration.class)
@ConditionalOnBean(org.springframework.cloud.client.serviceregistry.ServiceRegistry.class)
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index a202cdd..2fd5b26 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -476,7 +476,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
javaClass.getJavaDoc().setFullText(doc);
javaClass.addAnnotation(Generated.class).setStringValue("value", SpringBootAutoConfigurationMojo.class.getName());
- javaClass.addAnnotation(Configuration.class);
+ javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
javaClass.addAnnotation(ConditionalOnBean.class).setStringValue("type", "org.apache.camel.spring.boot.CamelAutoConfiguration");
javaClass.addAnnotation(ConditionalOnProperty.class).setStringValue("name", "camel.rest.enabled").setLiteralValue("matchIfMissing", "true");
javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name", "org.apache.camel.spring.boot.CamelAutoConfiguration");
@@ -1532,7 +1532,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
javaClass.setName(name);
javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
javaClass.addAnnotation(Generated.class).setStringValue("value", SpringBootAutoConfigurationMojo.class.getName());
- javaClass.addAnnotation(Configuration.class);
+ javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
javaClass.addAnnotation(Conditional.class).setLiteralValue("{ConditionalOnCamelContextAndAutoConfigurationBeans.class,\n " + name + ".GroupConditions.class}");
javaClass.addAnnotation(AutoConfigureAfter.class).setLiteralValue("CamelAutoConfiguration.class");
javaClass.addAnnotation(EnableConfigurationProperties.class).setLiteralValue("{ComponentConfigurationProperties.class,\n " + configurationName + ".class}");
@@ -1606,7 +1606,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
javaClass.setName(name);
javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
javaClass.addAnnotation(Generated.class).setStringValue("value", SpringBootAutoConfigurationMojo.class.getName());
- javaClass.addAnnotation(Configuration.class);
+ javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
javaClass.addAnnotation(Conditional.class).setLiteralValue("{ConditionalOnCamelContextAndAutoConfigurationBeans.class,\n " + name + ".GroupConditions.class}");
javaClass.addAnnotation(AutoConfigureAfter.class).setStringValue("name", "org.apache.camel.spring.boot.CamelAutoConfiguration");
javaClass.addAnnotation(EnableConfigurationProperties.class).setLiteralValue("{DataFormatConfigurationProperties.class,\n " + configurationName + ".class}");
@@ -1682,7 +1682,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
javaClass.setName(name);
javaClass.getJavaDoc().setFullText("Generated by camel-package-maven-plugin - do not edit this file!");
javaClass.addAnnotation(Generated.class).setStringValue("value", SpringBootAutoConfigurationMojo.class.getName());
- javaClass.addAnnotation(Configuration.class);
+ javaClass.addAnnotation(Configuration.class).setLiteralValue("proxyBeanMethods", "false");
javaClass.addAnnotation(Conditional.class).setLiteralValue("{ConditionalOnCamelContextAndAutoConfigurationBeans.class,\n " + name + ".GroupConditions.class}");
javaClass.addAnnotation(AutoConfigureAfter.class).setLiteralValue("CamelAutoConfiguration.class");
javaClass.addAnnotation(EnableConfigurationProperties.class).setLiteralValue("{LanguageConfigurationProperties.class,\n " + configurationName + ".class}");