diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/ContractVerifierAmqpAutoConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/ContractVerifierAmqpAutoConfiguration.java index bf2f52d94b..ef16517998 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/ContractVerifierAmqpAutoConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/ContractVerifierAmqpAutoConfiguration.java @@ -56,7 +56,6 @@ import static java.util.Collections.emptyList; @ConditionalOnProperty(name = "stubrunner.amqp.enabled", havingValue = "true") @AutoConfigureBefore(ContractVerifierIntegrationConfiguration.class) @AutoConfigureAfter(ContractVerifierStreamAutoConfiguration.class) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierAmqpAutoConfiguration { @SpyBean diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java index f5728e91d1..005c3b62f3 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java @@ -43,7 +43,6 @@ import org.springframework.context.annotation.Import; @Import(CamelAutoConfiguration.class) @ConditionalOnProperty(name = "stubrunner.camel.enabled", havingValue = "true", matchIfMissing = true) @AutoConfigureBefore({ NoOpContractVerifierAutoConfiguration.class, ContractVerifierJmsConfiguration.class }) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierCamelConfiguration { @Bean diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java index 5c67e851fa..a439ec94ae 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java @@ -37,7 +37,6 @@ import org.springframework.messaging.Message; @ConditionalOnClass(Message.class) @AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class) @AutoConfigureAfter(ContractVerifierStreamAutoConfiguration.class) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierIntegrationConfiguration { @Bean diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java index 5973d75fdb..c67d48e168 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/jms/ContractVerifierJmsConfiguration.java @@ -50,7 +50,6 @@ import org.springframework.jms.core.JmsTemplate; @ConditionalOnClass(JmsTemplate.class) @ConditionalOnProperty(name = "stubrunner.jms.enabled", havingValue = "true", matchIfMissing = true) @AutoConfigureBefore({ ContractVerifierIntegrationConfiguration.class, NoOpContractVerifierAutoConfiguration.class }) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierJmsConfiguration { @Bean diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaConfiguration.java index 0e8f6eb98e..959533fd80 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaConfiguration.java @@ -44,7 +44,6 @@ import org.springframework.messaging.Message; @ConditionalOnProperty(name = "stubrunner.kafka.enabled", havingValue = "true", matchIfMissing = true) @AutoConfigureBefore({ ContractVerifierIntegrationConfiguration.class, NoOpContractVerifierAutoConfiguration.class }) @ConditionalOnBean(EmbeddedKafkaBroker.class) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierKafkaConfiguration { private static final Log log = LogFactory.getLog(ContractVerifierKafkaConfiguration.class); diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java index 4c56e259b7..cc5d8b6bd4 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java @@ -40,7 +40,6 @@ import org.springframework.util.Assert; @ConditionalOnClass(EnableBinding.class) @ConditionalOnProperty(name = "stubrunner.stream.enabled", havingValue = "true", matchIfMissing = true) @AutoConfigureBefore(NoOpContractVerifierAutoConfiguration.class) -@ConditionalOnMissingBean({ ContractVerifierMessaging.class, MessageVerifier.class }) public class ContractVerifierStreamAutoConfiguration { @Bean