From ca95b7f53b39177c97e3b291a4e4bd7c007bbede Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 19 Jul 2016 11:09:01 +0100 Subject: [PATCH] Consolidate messaging interface names (StubMessages) --- docs/src/main/asciidoc/verifier/messaging.adoc | 6 +++--- .../example/CamelMessagingApplicationSpec.groovy | 8 ++++---- .../IntegrationMessagingApplicationSpec.groovy | 8 ++++---- .../com/example/SpringApplicationSpec.groovy | 8 ++++---- .../example/StreamMessagingApplicationSpec.groovy | 8 ++++---- .../com/example/source/SensorSourceTestBase.java | 4 ++-- .../integration/IntegrationStubRunnerSpec.groovy | 4 ++-- .../messaging/stream/StreamStubRunnerSpec.groovy | 8 ++++---- .../stubrunner/BatchStubRunnerFactory.java | 14 +++++++------- .../cloud/contract/stubrunner/StubRunner.java | 8 ++++---- .../contract/stubrunner/StubRunnerExecutor.java | 10 +++++----- .../contract/stubrunner/StubRunnerFactory.java | 6 +++--- .../server/StubRunnerBackupAutoConfiguration.java | 10 +++++----- .../stubrunner/spring/AutoConfigureStubRunner.java | 4 ++-- .../stubrunner/spring/StubRunnerConfiguration.java | 8 ++++---- .../stubrunner/StubRunnerExecutorSpec.groovy | 2 +- .../stubrunner/StubRunnerFactorySpec.groovy | 2 +- ...rCamelMessaging.java => CamelStubMessages.java} | 12 +++++------- .../camel/ContractVerifierCamelConfiguration.java | 10 +++++----- .../src/main/resources/META-INF/spring.factories | 2 +- .../ContractVerifierIntegrationConfiguration.java | 10 +++++----- ...ing.java => SpringIntegrationStubMessages.java} | 10 +++++----- .../src/main/resources/META-INF/spring.factories | 2 +- ...ifierMessageExchange.java => StubMessages.java} | 2 +- ...ssaging.java => AutoConfigureStubMessages.java} | 2 +- .../internal/ContractVerifierMessaging.java | 6 +++--- .../NoOpContractVerifierAutoConfiguration.java | 8 ++++---- ...erifierMessaging.java => NoOpStubMessages.java} | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- .../ContractVerifierStreamAutoConfiguration.java | 10 +++++----- ...treamMessaging.java => StreamStubMessages.java} | 10 ++++------ .../src/main/resources/META-INF/spring.factories | 2 +- 32 files changed, 103 insertions(+), 107 deletions(-) rename spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/{ContractVerifierCamelMessaging.java => CamelStubMessages.java} (88%) rename 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 => SpringIntegrationStubMessages.java} (88%) rename spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/{ContractVerifierMessageExchange.java => StubMessages.java} (96%) rename spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/{AutoConfigureContractVerifierMessaging.java => AutoConfigureStubMessages.java} (94%) rename spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/{NoOpContractVerifierMessaging.java => NoOpStubMessages.java} (85%) rename spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/{ContractVerifierStreamMessaging.java => StreamStubMessages.java} (90%) diff --git a/docs/src/main/asciidoc/verifier/messaging.adoc b/docs/src/main/asciidoc/verifier/messaging.adoc index 6eaac6af19..dc53aa4385 100644 --- a/docs/src/main/asciidoc/verifier/messaging.adoc +++ b/docs/src/main/asciidoc/verifier/messaging.adoc @@ -39,17 +39,17 @@ You have to provide as a dependency the messaging module that matches your provi testCompile "org.springframework.cloud:spring-cloud-contract-verifier-integration" ---- -and then add `@AutoConfigureContractVerifierMessaging` to your test, e.g. +and then add `@AutoConfigureStubMessages` to your test, e.g. [source,java,indent=0] ---- @RunWith(SpringTestRunner.class) @SpringBootTest -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public static class MessagingContractTests { @Autowired - private ContractVerifierMessageExchange exchange; + private StubMessages exchange; ... } ---- diff --git a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy index b85edc8aa8..88fdb3eabb 100644 --- a/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy @@ -24,8 +24,8 @@ import org.junit.BeforeClass import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.cloud.contract.spec.Contract -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.StubMessages +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper; import org.springframework.test.annotation.DirtiesContext import org.springframework.test.context.ContextConfiguration @@ -42,11 +42,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion // Context configuration would end up in base class @ContextConfiguration(classes = [CamelMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public class CamelMessagingApplicationSpec extends Specification { // ALL CASES - @Inject ContractVerifierMessageExchange contractVerifierMessaging + @Inject StubMessages contractVerifierMessaging ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() @BeforeClass diff --git a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy index e43f9c71d9..4769814661 100644 --- a/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy +++ b/samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy @@ -21,8 +21,8 @@ import javax.inject.Inject import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.cloud.contract.spec.Contract -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.StubMessages +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper; import org.springframework.messaging.Message import org.springframework.test.annotation.DirtiesContext @@ -36,11 +36,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion // Context configuration would end up in base class @ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public class IntegrationMessagingApplicationSpec extends Specification { // ALL CASES - @Inject ContractVerifierMessageExchange> contractVerifierMessaging + @Inject StubMessages> contractVerifierMessaging ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() def "should work for triggered based messaging"() { diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy index b8e36045f7..1543be8826 100644 --- a/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy +++ b/samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy @@ -22,8 +22,8 @@ import org.junit.BeforeClass import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.cloud.contract.spec.Contract -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.StubMessages +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper; import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext @@ -41,11 +41,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion // Context configuration would end up in base class @ContextConfiguration(classes = [SpringMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public class SpringApplicationSpec extends Specification { // ALL CASES - @Inject ContractVerifierMessageExchange> contractVerifierMessaging + @Inject StubMessages> contractVerifierMessaging ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() @BeforeClass 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 774d208187..9abf9335d2 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 @@ -22,8 +22,8 @@ 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.ContractVerifierMessageExchange -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.StubMessages +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierObjectMapper; import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext @@ -41,11 +41,11 @@ import com.toomuchcoding.jsonassert.JsonAssertion @ContextConfiguration(classes = [StreamMessagingApplication], loader = SpringBootContextLoader) @DirtiesContext @IntegrationTest("debug=true") -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public class StreamMessagingApplicationSpec extends Specification { // ALL CASES - @Inject ContractVerifierMessageExchange> contractVerifierMessaging + @Inject StubMessages> contractVerifierMessaging ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper() def "should work for triggered based messaging"() { diff --git a/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java index 2a533e4d44..ad87d741d8 100644 --- a/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java +++ b/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java @@ -19,7 +19,7 @@ package com.example.source; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = ContractVerifierSampleStreamSourceApplication.class, properties="spring.cloud.stream.bindings.output.destination=sensor-data") -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public abstract class SensorSourceTestBase { @Autowired 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 1a6e734424..bfa4a2c3be 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 @@ -27,7 +27,7 @@ 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.integration.ContractVerifierIntegrationMessaging +import org.springframework.cloud.contract.verifier.messaging.integration.SpringIntegrationStubMessages import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.ImportResource @@ -48,7 +48,7 @@ import spock.lang.Specification class IntegrationStubRunnerSpec extends Specification { @Autowired StubFinder stubFinder - @Autowired ContractVerifierIntegrationMessaging messaging + @Autowired SpringIntegrationStubMessages messaging def setup() { // ensure that message were taken from the queue 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 af4151b750..55abe810fd 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 @@ -28,8 +28,8 @@ 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.ContractVerifierMessageExchange -import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.StubMessages +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages; import org.springframework.cloud.stream.annotation.EnableBinding import org.springframework.cloud.stream.messaging.Sink import org.springframework.cloud.stream.messaging.Source @@ -46,11 +46,11 @@ import spock.lang.Specification @ContextConfiguration(classes = Config, loader = SpringBootContextLoader) @IntegrationTest("debug=true") @AutoConfigureStubRunner -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages class StreamStubRunnerSpec extends Specification { @Autowired StubFinder stubFinder - @Autowired ContractVerifierMessageExchange> messaging + @Autowired StubMessages> messaging def setup() { // ensure that message were taken from the queue diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java index e2fc2c4a2f..9e0d0e6844 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java @@ -16,8 +16,8 @@ package org.springframework.cloud.contract.stubrunner; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; /** * Manages lifecycle of multiple {@link StubRunner} instances. @@ -29,21 +29,21 @@ public class BatchStubRunnerFactory { private final StubRunnerOptions stubRunnerOptions; private final StubDownloader stubDownloader; - private final ContractVerifierMessageExchange contractVerifierMessaging; + private final StubMessages contractVerifierMessaging; public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions) { - this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), new NoOpContractVerifierMessaging()); + this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), new NoOpStubMessages()); } - public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, ContractVerifierMessageExchange contractVerifierMessaging) { + public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubMessages contractVerifierMessaging) { this(stubRunnerOptions, new AetherStubDownloader(stubRunnerOptions), contractVerifierMessaging); } public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader) { - this(stubRunnerOptions, stubDownloader, new NoOpContractVerifierMessaging()); + this(stubRunnerOptions, stubDownloader, new NoOpStubMessages()); } - public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, ContractVerifierMessageExchange contractVerifierMessaging) { + public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, StubMessages contractVerifierMessaging) { this.stubRunnerOptions = stubRunnerOptions; this.stubDownloader = stubDownloader; this.contractVerifierMessaging = contractVerifierMessaging; diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java index 429f286196..99f7fcfb0a 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java @@ -23,8 +23,8 @@ import java.util.Collection; import java.util.Map; import org.springframework.cloud.contract.spec.Contract; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; /** * Represents a single instance of ready-to-run stubs. Can run the stubs and then will @@ -47,12 +47,12 @@ public class StubRunner implements StubRunning { public StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath, StubConfiguration stubsConfiguration) { this(stubRunnerOptions, repositoryPath, stubsConfiguration, - new NoOpContractVerifierMessaging()); + new NoOpStubMessages()); } public StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath, StubConfiguration stubsConfiguration, - ContractVerifierMessageExchange contractVerifierMessaging) { + StubMessages contractVerifierMessaging) { this.stubsConfiguration = stubsConfiguration; this.stubRunnerOptions = stubRunnerOptions; this.stubRepository = new StubRepository(new File(repositoryPath)); diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java index b772ba099e..ce5bd424f5 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java @@ -32,8 +32,8 @@ import org.springframework.cloud.contract.spec.internal.DslProperty; import org.springframework.cloud.contract.spec.internal.Headers; import org.springframework.cloud.contract.spec.internal.OutputMessage; import org.springframework.cloud.contract.stubrunner.AvailablePortScanner.PortCallback; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; import org.springframework.cloud.contract.verifier.util.BodyExtractor; import groovy.json.JsonOutput; @@ -45,17 +45,17 @@ public class StubRunnerExecutor implements StubFinder { private static final Logger log = LoggerFactory.getLogger(StubRunnerExecutor.class); private final AvailablePortScanner portScanner; - private final ContractVerifierMessageExchange contractVerifierMessaging; + private final StubMessages contractVerifierMessaging; private StubServer stubServer; public StubRunnerExecutor(AvailablePortScanner portScanner, - ContractVerifierMessageExchange contractVerifierMessaging) { + StubMessages contractVerifierMessaging) { this.portScanner = portScanner; this.contractVerifierMessaging = contractVerifierMessaging; } public StubRunnerExecutor(AvailablePortScanner portScanner) { - this(portScanner, new NoOpContractVerifierMessaging()); + this(portScanner, new NoOpStubMessages()); } public RunningStubs runStubs(StubRunnerOptions stubRunnerOptions, diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java index 253bf825e8..f775420b5e 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; /** * Factory of StubRunners. Basing on the options and passed collaborators downloads the @@ -31,11 +31,11 @@ public class StubRunnerFactory { private final StubRunnerOptions stubRunnerOptions; private final StubDownloader stubDownloader; - private final ContractVerifierMessageExchange contractVerifierMessaging; + private final StubMessages contractVerifierMessaging; public StubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, - ContractVerifierMessageExchange contractVerifierMessaging) { + StubMessages contractVerifierMessaging) { this.stubRunnerOptions = stubRunnerOptions; this.stubDownloader = stubDownloader; this.contractVerifierMessaging = contractVerifierMessaging; diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java index 77457c7674..bc7e4bc014 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java @@ -17,9 +17,9 @@ package org.springframework.cloud.contract.stubrunner.server; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,13 +31,13 @@ public class StubRunnerBackupAutoConfiguration { @Bean @ConditionalOnMissingBean - public ContractVerifierMessageExchange contractVerifierMessageExchange() { - return new NoOpContractVerifierMessaging(); + public StubMessages contractVerifierMessageExchange() { + return new NoOpStubMessages(); } @Bean public ContractVerifierMessaging contractVerifierMessaging( - ContractVerifierMessageExchange exchange) { + StubMessages exchange) { return new ContractVerifierMessaging(exchange); } 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 d34595ea88..0b35faa477 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,7 +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; +import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages; /** * @author Dave Syer @@ -33,7 +33,7 @@ import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureC @Retention(RetentionPolicy.RUNTIME) @Documented @ImportAutoConfiguration -@AutoConfigureContractVerifierMessaging +@AutoConfigureStubMessages public @interface AutoConfigureStubRunner { } diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java index 51fdbe00a1..2976d26cc9 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/StubRunnerConfiguration.java @@ -28,8 +28,8 @@ import org.springframework.cloud.contract.stubrunner.StubDownloader; import org.springframework.cloud.contract.stubrunner.StubRunner; import org.springframework.cloud.contract.stubrunner.StubRunnerOptions; import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; @@ -44,7 +44,7 @@ import org.springframework.core.io.Resource; public class StubRunnerConfiguration { @Autowired(required = false) - private ContractVerifierMessageExchange contractVerifierMessaging; + private StubMessages contractVerifierMessaging; @Autowired(required = false) private StubDownloader stubDownloader; @Autowired @@ -77,7 +77,7 @@ public class StubRunnerConfiguration { stubDownloader != null ? stubDownloader : new AetherStubDownloader(stubRunnerOptions), contractVerifierMessaging != null ? contractVerifierMessaging - : new NoOpContractVerifierMessaging()).buildBatchStubRunner(); + : new NoOpStubMessages()).buildBatchStubRunner(); // TODO: Consider running it in a separate thread batchStubRunner.runStubs(); return batchStubRunner; diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy index 3b50085f4b..8041b5ca40 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import org.springframework.cloud.contract.stubrunner.util.StubsParser -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactorySpec.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactorySpec.groovy index ced2a5f713..118bce8a73 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactorySpec.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactorySpec.groovy @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.stubrunner import org.junit.Rule import org.junit.rules.TemporaryFolder -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging +import org.springframework.cloud.contract.verifier.messaging.noop.NoOpStubMessages import spock.lang.Specification class StubRunnerFactorySpec extends Specification { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java similarity index 88% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java index fc62ae221c..1a2f47edfc 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java @@ -28,24 +28,24 @@ import org.apache.camel.impl.DefaultExchange; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.stereotype.Component; /** * @author Marcin Grzejszczak */ @Component -public class ContractVerifierCamelMessaging implements - ContractVerifierMessageExchange { +public class CamelStubMessages implements + StubMessages { private static final Logger log = LoggerFactory.getLogger( - ContractVerifierCamelMessaging.class); + CamelStubMessages.class); private final CamelContext context; private final ContractVerifierCamelMessageBuilder builder = new ContractVerifierCamelMessageBuilder(); @Autowired - public ContractVerifierCamelMessaging(CamelContext context) { + public CamelStubMessages(CamelContext context) { this.context = context; } @@ -64,13 +64,11 @@ public class ContractVerifierCamelMessaging implements } @Override - @SuppressWarnings("unchecked") public void send(T payload, Map headers, String destination) { send(builder.create(payload, headers), destination); } @Override - @SuppressWarnings("unchecked") public Message receive(String destination, long timeout, TimeUnit timeUnit) { try { ConsumerTemplate consumerTemplate = context.createConsumerTemplate(); diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java index 9e73958645..313e2a71b3 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java @@ -19,7 +19,7 @@ package org.springframework.cloud.contract.verifier.messaging.camel; import org.apache.camel.CamelContext; import org.apache.camel.Message; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration; @@ -34,14 +34,14 @@ import org.springframework.context.annotation.Configuration; public class ContractVerifierCamelConfiguration { @Bean - ContractVerifierMessageExchange contractVerifierMessageExchange( + StubMessages contractVerifierMessageExchange( CamelContext context) { - return new ContractVerifierCamelMessaging(context); + return new CamelStubMessages(context); } @Bean public ContractVerifierMessaging contractVerifierMessaging( - ContractVerifierMessageExchange exchange) { + StubMessages exchange) { return new ContractVerifierCamelHelper(exchange); } } @@ -49,7 +49,7 @@ public class ContractVerifierCamelConfiguration { class ContractVerifierCamelHelper extends ContractVerifierMessaging { public ContractVerifierCamelHelper( - ContractVerifierMessageExchange exchange) { + StubMessages exchange) { super(exchange); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories index ee9445b62d..fe3b7e036a 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Auto Configuration -org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging=\ +org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\ org.springframework.cloud.contract.verifier.messaging.camel.ContractVerifierCamelConfiguration 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/ContractVerifierIntegrationConfiguration.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/ContractVerifierIntegrationConfiguration.java index 2a55cc6872..3d225fc743 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/ContractVerifierIntegrationConfiguration.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/ContractVerifierIntegrationConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.cloud.contract.verifier.messaging.integration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration; @@ -34,21 +34,21 @@ import org.springframework.messaging.Message; public class ContractVerifierIntegrationConfiguration { @Bean - public ContractVerifierMessageExchange> contractVerifierMessageExchange( + public StubMessages> contractVerifierMessageExchange( ApplicationContext applicationContext) { - return new ContractVerifierIntegrationMessaging(applicationContext); + return new SpringIntegrationStubMessages(applicationContext); } @Bean public ContractVerifierMessaging> contractVerifierMessaging( - ContractVerifierMessageExchange> exchange) { + StubMessages> exchange) { return new ContractVerifierHelper(exchange); } } class ContractVerifierHelper extends ContractVerifierMessaging> { - public ContractVerifierHelper(ContractVerifierMessageExchange> exchange) { + public ContractVerifierHelper(StubMessages> exchange) { super(exchange); } 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/SpringIntegrationStubMessages.java similarity index 88% rename from 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 rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/SpringIntegrationStubMessages.java index 0e30e6680b..f7cf7ed8d1 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/SpringIntegrationStubMessages.java @@ -22,7 +22,7 @@ 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.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.context.ApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -33,17 +33,17 @@ import org.springframework.stereotype.Component; * @author Marcin Grzejszczak */ @Component -public class ContractVerifierIntegrationMessaging implements - ContractVerifierMessageExchange> { +public class SpringIntegrationStubMessages implements + StubMessages> { private static final Logger log = LoggerFactory.getLogger( - ContractVerifierIntegrationMessaging.class); + SpringIntegrationStubMessages.class); private final ApplicationContext context; private final ContractVerifierIntegrationMessageBuilder builder = new ContractVerifierIntegrationMessageBuilder(); @Autowired - public ContractVerifierIntegrationMessaging(ApplicationContext context) { + public SpringIntegrationStubMessages(ApplicationContext context) { this.context = context; } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories index 4ef29caa56..a47c11428b 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Auto Configuration -org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging=\ +org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\ org.springframework.cloud.contract.verifier.messaging.integration.ContractVerifierIntegrationConfiguration diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageExchange.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java similarity index 96% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageExchange.java rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java index 981e043ab0..fb45d9689b 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageExchange.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/StubMessages.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; * * @author Marcin Grzejszczak */ -public interface ContractVerifierMessageExchange { +public interface StubMessages { /** * Sends the {@link ContractVerifierMessage} to the given destination. */ diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureContractVerifierMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java similarity index 94% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureContractVerifierMessaging.java rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java index 42d94c55bd..634262ffdd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureContractVerifierMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/boot/AutoConfigureStubMessages.java @@ -32,6 +32,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @Retention(RetentionPolicy.RUNTIME) @Documented @ImportAutoConfiguration -public @interface AutoConfigureContractVerifierMessaging { +public @interface AutoConfigureStubMessages { } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java index 19fdbf04c3..c9722d1421 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/internal/ContractVerifierMessaging.java @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.internal; import java.util.Map; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; /** * @author Dave Syer @@ -26,9 +26,9 @@ import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMes */ public class ContractVerifierMessaging { - private ContractVerifierMessageExchange exchange; + private StubMessages exchange; - public ContractVerifierMessaging(ContractVerifierMessageExchange exchange) { + public ContractVerifierMessaging(StubMessages exchange) { this.exchange = exchange; } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java index 5517204f18..428e755b02 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.noop; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,14 +33,14 @@ public class NoOpContractVerifierAutoConfiguration { @Bean @ConditionalOnMissingBean - public ContractVerifierMessageExchange contractVerifierMessageExchange() { - return new NoOpContractVerifierMessaging(); + public StubMessages contractVerifierMessageExchange() { + return new NoOpStubMessages(); } @Bean @ConditionalOnMissingBean public ContractVerifierMessaging contractVerifierMessaging( - ContractVerifierMessageExchange exchange) { + StubMessages exchange) { return new ContractVerifierMessaging(exchange); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java similarity index 85% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessaging.java rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java index 189a29458d..97295aee84 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java @@ -19,12 +19,12 @@ package org.springframework.cloud.contract.verifier.messaging.noop; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; /** * @author Marcin Grzejszczak */ -public class NoOpContractVerifierMessaging implements ContractVerifierMessageExchange { +public class NoOpStubMessages implements StubMessages { @Override public void send(Object message, String destination) { } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/resources/META-INF/spring.factories index a9589fd118..2dd881e788 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Auto Configuration -org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging=\ +org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\ org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java index 17ddef43e5..a53db37396 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java @@ -18,7 +18,7 @@ package org.springframework.cloud.contract.verifier.messaging.stream; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration; @@ -36,14 +36,14 @@ import org.springframework.messaging.Message; public class ContractVerifierStreamAutoConfiguration { @Bean - ContractVerifierMessageExchange> contractVerifierMessageExchange( + StubMessages> contractVerifierMessageExchange( ApplicationContext applicationContext) { - return new ContractVerifierStreamMessaging(applicationContext); + return new StreamStubMessages(applicationContext); } @Bean public ContractVerifierMessaging contractVerifierMessagingConverter( - ContractVerifierMessageExchange> exchange) { + StubMessages> exchange) { return new ContractVerifierHelper(exchange); } } @@ -51,7 +51,7 @@ public class ContractVerifierStreamAutoConfiguration { class ContractVerifierHelper extends ContractVerifierMessaging> { public ContractVerifierHelper( - ContractVerifierMessageExchange> exchange) { + StubMessages> exchange) { super(exchange); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java similarity index 90% rename from spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java rename to spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java index fed3e7d089..6a78e023dd 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessages.java @@ -22,7 +22,7 @@ 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.ContractVerifierMessageExchange; +import org.springframework.cloud.contract.verifier.messaging.StubMessages; import org.springframework.cloud.stream.config.BindingProperties; import org.springframework.cloud.stream.config.ChannelBindingServiceProperties; import org.springframework.cloud.stream.test.binder.MessageCollector; @@ -33,18 +33,16 @@ import org.springframework.messaging.MessageChannel; /** * @author Marcin Grzejszczak */ -public class ContractVerifierStreamMessaging - implements ContractVerifierMessageExchange> { +public class StreamStubMessages implements StubMessages> { - private static final Logger log = LoggerFactory - .getLogger(ContractVerifierStreamMessaging.class); + private static final Logger log = LoggerFactory.getLogger(StreamStubMessages.class); private final ApplicationContext context; private final MessageCollector messageCollector; private final ContractVerifierStreamMessageBuilder builder = new ContractVerifierStreamMessageBuilder(); @Autowired - public ContractVerifierStreamMessaging(ApplicationContext context) { + public StreamStubMessages(ApplicationContext context) { this.context = context; this.messageCollector = context.getBean(MessageCollector.class); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories index 6869891e2c..b23a58d146 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Auto Configuration -org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureContractVerifierMessaging=\ +org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureStubMessages=\ org.springframework.cloud.contract.verifier.messaging.stream.ContractVerifierStreamAutoConfiguration