From 472c6d38821e2f1db42ba25f0c750d0ebf2c2e93 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 18 Jul 2016 10:54:45 +0100 Subject: [PATCH] Add messaging automatically to stub runner autoconfig --- .../com/example/StreamMessagingApplicationSpec.groovy | 2 ++ .../stubrunner/messaging/camel/CamelStubRunnerSpec.groovy | 6 +++--- .../messaging/integration/IntegrationStubRunnerSpec.groovy | 1 - .../stubrunner/messaging/stream/StreamStubRunnerSpec.groovy | 1 - .../contract/stubrunner/spring/AutoConfigureStubRunner.java | 2 ++ .../integration/ContractVerifierIntegrationMessaging.java | 5 ++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy index b6c730a03b..97baf99445 100644 --- a/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy @@ -19,6 +19,7 @@ package com.example import javax.inject.Inject import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage @@ -39,6 +40,7 @@ import com.toomuchcoding.jsonassert.JsonAssertion // Context configuration would end up in base class @ContextConfiguration(classes = [StreamMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext +@IntegrationTest("debug=true") @AutoConfigureContractVerifierMessaging public class StreamMessagingApplicationSpec extends Specification { diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy index 3363fd956b..fa6a8a5922 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy @@ -18,6 +18,7 @@ package org.springframework.cloud.contract.stubrunner.messaging.camel import groovy.json.JsonOutput import groovy.json.JsonSlurper + import org.apache.activemq.camel.component.ActiveMQComponent import org.apache.activemq.spring.ActiveMQConnectionFactory import org.apache.camel.CamelContext @@ -26,16 +27,16 @@ import org.apache.camel.component.jms.JmsConfiguration import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.IntegrationTest import org.springframework.boot.test.context.SpringBootContextLoader 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.boot.AutoConfigureContractVerifierMessaging; import org.springframework.context.annotation.Bean import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration import org.springframework.test.context.ContextConfiguration + import spock.lang.Specification /** @@ -44,7 +45,6 @@ import spock.lang.Specification @ContextConfiguration(classes = Config, loader = SpringBootContextLoader) @IntegrationTest("debug=true") @AutoConfigureStubRunner -@AutoConfigureContractVerifierMessaging class CamelStubRunnerSpec extends Specification { @Autowired StubFinder stubFinder diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy index fe89351d31..29e98020df 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy @@ -44,7 +44,6 @@ import java.util.concurrent.TimeUnit @ContextConfiguration(classes = IntegrationStubRunnerSpec, loader = SpringBootContextLoader) @ImportResource("classpath*:integration-context.xml") @AutoConfigureStubRunner -@AutoConfigureContractVerifierMessaging class IntegrationStubRunnerSpec extends Specification { @Autowired StubFinder stubFinder diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy index f385ed588a..7329d3c7d3 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy @@ -46,7 +46,6 @@ import java.util.concurrent.TimeUnit @ContextConfiguration(classes = StreamStubRunnerSpec, loader = SpringBootContextLoader) @EnableBinding([Sink, Source]) @AutoConfigureStubRunner -@AutoConfigureContractVerifierMessaging class StreamStubRunnerSpec extends Specification { @Autowired StubFinder stubFinder diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java index c5eb9af52a..d34595ea88 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java @@ -23,6 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging; /** * @author Dave Syer @@ -32,6 +33,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @Retention(RetentionPolicy.RUNTIME) @Documented @ImportAutoConfiguration +@AutoConfigureContractVerifierMessaging public @interface AutoConfigureStubRunner { } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java index c7a197042a..7572c70522 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java @@ -22,16 +22,15 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; +import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging; import org.springframework.context.ApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.stereotype.Component; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage; - /** * @author Marcin Grzejszczak */