From ff7cb6364a6ce6209d22da8cad9b24f8c60e0f34 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 18 Nov 2022 22:26:43 +0100 Subject: [PATCH] Fixed --- .../java/contracts/ContractTestsBase.java | 4 ++-- .../java/contracts/MessagingAutoConfig.java | 19 ++++--------------- .../StubRunnerStubsPerConsumerSpec.groovy | 1 - .../SpringIntegrationStubMessages.java | 5 +++-- .../IntegrationStubRunnerSpec.groovy | 4 ++-- .../stream/StreamStubRunnerSpec.groovy | 5 ++--- 6 files changed, 13 insertions(+), 25 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java index a2a49e9fef..7606736283 100644 --- a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java +++ b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/ContractTestsBase.java @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cloud.contract.verifier.converter.YamlContract; -import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; +import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver; import org.springframework.cloud.contract.verifier.messaging.amqp.AmqpMetadata; import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier; import org.springframework.cloud.contract.verifier.messaging.camel.StandaloneMetadata; @@ -88,7 +88,7 @@ public abstract class ContractTestsBase { String messagingType; @Autowired - MessageVerifier messageVerifier; + MessageVerifierReceiver messageVerifier; @BeforeEach public void setup(TestInfo testInfo) { diff --git a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java index 5495907605..0a8692bbd9 100644 --- a/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java +++ b/docker/spring-cloud-contract-docker/project/src/test/java/contracts/MessagingAutoConfig.java @@ -29,7 +29,6 @@ import org.springframework.amqp.core.MessageProperties; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.contract.verifier.converter.YamlContract; -import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver; import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender; import org.springframework.cloud.contract.verifier.messaging.amqp.AmqpMetadata; @@ -69,14 +68,13 @@ public class MessagingAutoConfig { String springKafkaBootstrapServers; @Bean - public ContractVerifierMessaging contractVerifierMessaging( - MessageVerifierSender sender, MessageVerifierReceiver receiver) { - return new ContractVerifierCamelHelper(sender, receiver); + public ContractVerifierMessaging contractVerifierMessaging(MessageVerifierReceiver receiver) { + return new ContractVerifierCamelHelper(new NoOpStubMessages(), receiver); } @Bean - MessageVerifier manualMessageVerifier(ConsumerTemplate consumerTemplate) { - return new MessageVerifier() { + MessageVerifierReceiver manualMessageVerifier(ConsumerTemplate consumerTemplate) { + return new MessageVerifierReceiver() { private final Logger log = LoggerFactory.getLogger(MessageVerifier.class); @@ -171,15 +169,6 @@ public class MessagingAutoConfig { return receive(destination, 5, TimeUnit.SECONDS, yamlContract); } - @Override - public void send(Message message, String destination, YamlContract yamlContract) { - throw new UnsupportedOperationException("Currently supports only receiving"); - } - - @Override - public void send(Object payload, Map headers, String destination, YamlContract yamlContract) { - throw new UnsupportedOperationException("Currently supports only receiving"); - } }; } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy index eed4c8cf0b..912c607f43 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy @@ -30,7 +30,6 @@ import org.springframework.cloud.contract.stubrunner.StubFinder import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver -import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java index af1312b748..927a10fe15 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java @@ -23,6 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.contract.verifier.converter.YamlContract; +import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver; +import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender; import org.springframework.context.ApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -32,8 +34,7 @@ import org.springframework.messaging.PollableChannel; * @author Marcin Grzejszczak */ public class SpringIntegrationStubMessages - implements org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender>, - org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver> { + implements MessageVerifierSender>, MessageVerifierReceiver> { private static final Log log = LogFactory.getLog(SpringIntegrationStubMessages.class); diff --git a/tests/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy b/tests/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy index d26936df1e..6754cd08c7 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy @@ -32,7 +32,7 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.stubrunner.StubFinder import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner -import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.ImportResource @@ -49,7 +49,7 @@ class IntegrationStubRunnerSpec { @Autowired StubFinder stubFinder @Autowired - ContractVerifierMessaging messaging + MessageVerifierReceiver> messaging @BeforeEach void setup() { diff --git a/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy b/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy index 98b956ac1d..20167646a0 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy @@ -32,14 +32,13 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.stubrunner.StubFinder import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner +import org.springframework.cloud.contract.verifier.messaging.MessageVerifierReceiver import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier -import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.messaging.Message import org.springframework.test.context.ContextConfiguration - /** * @author Marcin Grzejszczak */ @@ -52,7 +51,7 @@ class StreamStubRunnerSpec { @Autowired StubFinder stubFinder @Autowired - ContractVerifierMessaging> messaging + MessageVerifierReceiver> messaging @Test void 'should trigger a message by label'() {