Update auto-configuration to use @Configuration(proxyBeanMethods=false)

fixes gh-1245

samples/wiremock/src/main/java/com/example/WiremockTestsApplication.java

@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableAutoConfiguration
 @Import({ Service.class, Controller.class })
 public class WiremockTestsApplication {

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/StubRunnerStreamsIntegrationAutoConfiguration.java

@@ -33,10 +33,10 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Biju Kunjummen
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class StubRunnerStreamsIntegrationAutoConfiguration {
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(TestSupportBinderAutoConfiguration.class)
 	@ConditionalOnBean(TestSupportBinder.class)
 	@ImportAutoConfiguration(classes = { TestSupportBinderAutoConfiguration.class,
@@ -45,7 +45,7 @@ public class StubRunnerStreamsIntegrationAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(IntegrationAutoConfiguration.class)
 	@ImportAutoConfiguration(classes = { IntegrationAutoConfiguration.class })
 	static class IntegrationRelatedAutoConfiguration {

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java

@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RoutesBuilder.class)
 @ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java

@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(IntegrationFlowBuilder.class)
 @ConditionalOnProperty(name = "stubrunner.integration.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/jms/StubRunnerJmsConfiguration.java

@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(JmsTemplate.class)
 @ConditionalOnProperty(name = "stubrunner.jms.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/kafka/StubRunnerKafkaConfiguration.java

@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ KafkaTemplate.class, EmbeddedKafkaBroker.class })
 @ConditionalOnProperty(name = "stubrunner.kafka.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java

@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ IntegrationFlows.class, EnableBinding.class })
 @ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class StubRunnerBackupAutoConfiguration {
 
 	@Bean

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java

@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(StubRunnerProperties.class)
 @ConditionalOnMissingBean(
 		type = "org.springframework.cloud.contract.wiremock.WiremockServerConfiguration")

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfiguration.java

@@ -38,7 +38,7 @@ import org.springframework.core.env.Environment;
  * @since 1.0.0
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(StubMapperProperties.class)
 @ConditionalOnClass(DiscoveryClient.class)
 @ConditionalOnProperty(value = "stubrunner.cloud.enabled", matchIfMissing = true)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfiguration.java

@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter({ StubRunnerConfiguration.class,
 		ConsulServiceRegistryAutoConfiguration.class })
 @ConditionalOnClass(ConsulClient.class)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java

@@ -50,7 +50,7 @@ import org.springframework.core.env.Environment;
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter({ StubRunnerConfiguration.class,
 		EurekaClientAutoConfiguration.class })
 @ConditionalOnClass(CloudEurekaClient.class)
@@ -60,7 +60,7 @@ import org.springframework.core.env.Environment;
 public class StubRunnerSpringCloudEurekaAutoConfiguration {
 
 	@Profile("!cloud")
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class NonCloudConfig {
 
 		@Bean(initMethod = "registerStubs")
@@ -77,7 +77,7 @@ public class StubRunnerSpringCloudEurekaAutoConfiguration {
 	}
 
 	@Profile("cloud")
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	protected static class CloudConfig {
 
 		private static final int DEFAULT_PORT = 80;

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(ServerList.class)
 @ConditionalOnBean(StubMapperProperties.class)
 @AutoConfigureAfter(RibbonAutoConfiguration.class)

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java

@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 class StubRunnerRibbonConfiguration {
 

spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java

@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter({ StubRunnerConfiguration.class,
 		CuratorServiceDiscoveryAutoConfiguration.class })
 @ConditionalOnClass(org.apache.curator.x.discovery.ServiceInstance.class)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/ContractVerifierAmqpAutoConfiguration.java

@@ -51,7 +51,7 @@ import static java.util.Collections.emptyList;
  * @author Mathias Düsterhöft
  * @since 1.0.2
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RabbitTemplate.class)
 @ConditionalOnProperty(name = "stubrunner.amqp.enabled", havingValue = "true")
 @AutoConfigureBefore(ContractVerifierIntegrationConfiguration.class)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/RabbitMockConnectionFactoryAutoConfiguration.java

@@ -42,7 +42,7 @@ import static org.mockito.Mockito.when;
  * @author Mathias Düsterhöft
  * @since 1.0.2
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(ContractVerifierAmqpAutoConfiguration.class)
 @ConditionalOnProperty(value = "stubrunner.amqp.mockConnection", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Message.class)
 @Import(CamelAutoConfiguration.class)
 @ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true",

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.messaging.Message;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(Message.class)
 @AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class)
 @AutoConfigureAfter(ContractVerifierStreamAutoConfiguration.class)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java

@@ -46,7 +46,7 @@ import org.springframework.jms.core.JmsTemplate;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(JmsTemplate.class)
 @ConditionalOnProperty(name = "stubrunner.jms.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaConfiguration.java

@@ -39,7 +39,7 @@ import org.springframework.messaging.Message;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ KafkaTemplate.class, EmbeddedKafkaBroker.class })
 @ConditionalOnProperty(name = "stubrunner.kafka.enabled", havingValue = "true",
 		matchIfMissing = true)

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java

@@ -33,7 +33,7 @@ import org.springframework.core.Ordered;
  *
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @AutoConfigureOrder(Ordered.LOWEST_PRECEDENCE)
 public class NoOpContractVerifierAutoConfiguration {
 

spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java

@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(EnableBinding.class)
 @ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true",
 		matchIfMissing = true)
@@ -50,7 +50,7 @@ public class ContractVerifierStreamAutoConfiguration {
 		return new ContractVerifierHelper(exchange);
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(MessageCollector.class)
 	static class MessageCollectorConfiguration {
 
@@ -66,7 +66,7 @@ public class ContractVerifierStreamAutoConfiguration {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingClass("org.springframework.cloud.stream.test.binder.MessageCollector")
 	static class NoMessageCollectorClassConfiguration {
 

spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java

@@ -58,7 +58,7 @@ import org.springframework.util.StringUtils;
  * @author Matt Garner
  *
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(WireMockProperties.class)
 public class WireMockConfiguration implements SmartLifecycle {
 

spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestTemplateConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.web.client.RestTemplate;
  * @author Dave Syer
  *
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class WireMockRestTemplateConfiguration {
 
 	@Bean

spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestAssuredConfiguration.java

@@ -32,7 +32,7 @@ import org.springframework.restdocs.restassured3.RestAssuredRestDocumentationCon
  * stub behaviour
  * @author Eddú Meléndez
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RestAssuredRestDocumentationConfigurer.class)
 public class WireMockRestAssuredConfiguration
 		implements RestDocsRestAssuredConfigurationCustomizer {

spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockRestDocsConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.restdocs.mockmvc.MockMvcRestDocumentationConfigurer;
  * @author Dave Syer
  *
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(MockMvcRestDocumentationConfigurer.class)
 public class WireMockRestDocsConfiguration
 		implements RestDocsMockMvcConfigurationCustomizer {

spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/WireMockWebTestClientConfiguration.java

@@ -34,7 +34,7 @@ import org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation
  * @author Dave Syer
  *
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(WebTestClientRestDocumentationConfigurer.class)
 public class WireMockWebTestClientConfiguration
 		implements RestDocsWebTestClientConfigurationCustomizer {

tests/samples-messaging-amqp/src/main/java/com/example/Issue178ListenerConfiguration.java

@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class Issue178ListenerConfiguration {
 
 	@Bean

tests/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * @author Marcin Grzejszczak
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class BookRouteConfiguration {
 
 	@Bean

tests/spring-cloud-contract-stub-runner-amqp/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/amqp/AmqpMessagingApplication.java

@@ -65,7 +65,7 @@ public class AmqpMessagingApplication {
 		return rabbitTemplate;
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@Profile("!listener")
 	static class MessageListenerAdapterConfig {
 
@@ -105,7 +105,7 @@ public class AmqpMessagingApplication {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@EnableRabbit
 	@Profile("listener")
 	static class RabbitListenerConfig {