SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consolidate messaging interface names (StubMessages)

Browse Source
This commit is contained in:
Dave Syer
2016-07-19 11:09:01 +01:00
parent df5902fabd
commit ca95b7f53b
32 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/src/main/asciidoc/verifier/messaging.adoc
View File

@@ -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;
...
}
----

8
samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy
View File

@@ -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<Message> contractVerifierMessaging
@Inject StubMessages<Message> contractVerifierMessaging
ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
@BeforeClass

8
samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy
View File

@@ -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<Message<?>> contractVerifierMessaging
@Inject StubMessages<Message<?>> contractVerifierMessaging
ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
def "should work for triggered based messaging"() {

8
samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy
View File

@@ -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<Message<?>> contractVerifierMessaging
@Inject StubMessages<Message<?>> contractVerifierMessaging
ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
@BeforeClass

8
samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy
View File

@@ -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<Message<?>> contractVerifierMessaging
@Inject StubMessages<Message<?>> contractVerifierMessaging
ContractVerifierObjectMapper contractVerifierObjectMapper = new ContractVerifierObjectMapper()
def "should work for triggered based messaging"() {

4
samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
View File

@@ -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

4
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-integration/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy
View File

@@ -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

8
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy
View File

@@ -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<Message<?>> messaging
@Autowired StubMessages<Message<?>> messaging
def setup() {
// ensure that message were taken from the queue

14
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java
View File

@@ -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;

8
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java
View File

@@ -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));

10
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.java
View File

@@ -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,

6
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java
View File

@@ -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;

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

@@ -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<Object> contractVerifierMessaging(
ContractVerifierMessageExchange<Object> exchange) {
StubMessages<Object> exchange) {
return new ContractVerifierMessaging<Object>(exchange);
}

4
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java
View File

@@ -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 {
}

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

@@ -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;

2
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutorSpec.groovy
View File

@@ -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

2
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactorySpec.groovy
View File

@@ -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 {

12
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 → 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
View File

@@ -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<Message> {
public class CamelStubMessages implements
StubMessages<Message> {
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 <T> void send(T payload, Map<String, Object> 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();

10
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
View File

@@ -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<Message> contractVerifierMessageExchange(
StubMessages<Message> contractVerifierMessageExchange(
CamelContext context) {
return new ContractVerifierCamelMessaging(context);
return new CamelStubMessages(context);
}
@Bean
public ContractVerifierMessaging<Message> contractVerifierMessaging(
ContractVerifierMessageExchange<Message> exchange) {
StubMessages<Message> exchange) {
return new ContractVerifierCamelHelper(exchange);
}
}
@@ -49,7 +49,7 @@ public class ContractVerifierCamelConfiguration {
class ContractVerifierCamelHelper extends ContractVerifierMessaging<Message> {
public ContractVerifierCamelHelper(
ContractVerifierMessageExchange<Message> exchange) {
StubMessages<Message> exchange) {
super(exchange);
}

2
spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/resources/META-INF/spring.factories
View File

@@ -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

10
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
View File

@@ -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<T> {
@Bean
public ContractVerifierMessageExchange<Message<?>> contractVerifierMessageExchange(
public StubMessages<Message<?>> contractVerifierMessageExchange(
ApplicationContext applicationContext) {
return new ContractVerifierIntegrationMessaging(applicationContext);
return new SpringIntegrationStubMessages(applicationContext);
}
@Bean
public ContractVerifierMessaging<Message<?>> contractVerifierMessaging(
ContractVerifierMessageExchange<Message<?>> exchange) {
StubMessages<Message<?>> exchange) {
return new ContractVerifierHelper(exchange);
}
}
class ContractVerifierHelper extends ContractVerifierMessaging<Message<?>> {
public ContractVerifierHelper(ContractVerifierMessageExchange<Message<?>> exchange) {
public ContractVerifierHelper(StubMessages<Message<?>> exchange) {
super(exchange);
}

10
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 → 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
View File

@@ -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<Message<?>> {
public class SpringIntegrationStubMessages implements
StubMessages<Message<?>> {
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;
}

2
spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/resources/META-INF/spring.factories
View File

@@ -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

2
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 → 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
View File

@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
*
* @author Marcin Grzejszczak
*/
public interface ContractVerifierMessageExchange<M> {
public interface StubMessages<M> {
/**
* Sends the {@link ContractVerifierMessage} to the given destination.
*/

2
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 → 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
View File

@@ -32,6 +32,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@ImportAutoConfiguration
public @interface AutoConfigureContractVerifierMessaging {
public @interface AutoConfigureStubMessages {
}

6
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
View File

@@ -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<M> {
private ContractVerifierMessageExchange<M> exchange;
private StubMessages<M> exchange;
public ContractVerifierMessaging(ContractVerifierMessageExchange<M> exchange) {
public ContractVerifierMessaging(StubMessages<M> exchange) {
this.exchange = exchange;
}

8
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
View File

@@ -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<Object> exchange) {
StubMessages<Object> exchange) {
return new ContractVerifierMessaging<Object>(exchange);
}

4
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 → 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
View File

@@ -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<Object> {
public class NoOpStubMessages implements StubMessages<Object> {
@Override
public void send(Object message, String destination) {
}

2
spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/resources/META-INF/spring.factories
View File

@@ -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

10
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
View File

@@ -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<Message<?>> contractVerifierMessageExchange(
StubMessages<Message<?>> contractVerifierMessageExchange(
ApplicationContext applicationContext) {
return new ContractVerifierStreamMessaging(applicationContext);
return new StreamStubMessages(applicationContext);
}
@Bean
public ContractVerifierMessaging<?> contractVerifierMessagingConverter(
ContractVerifierMessageExchange<Message<?>> exchange) {
StubMessages<Message<?>> exchange) {
return new ContractVerifierHelper(exchange);
}
}
@@ -51,7 +51,7 @@ public class ContractVerifierStreamAutoConfiguration {
class ContractVerifierHelper extends ContractVerifierMessaging<Message<?>> {
public ContractVerifierHelper(
ContractVerifierMessageExchange<Message<?>> exchange) {
StubMessages<Message<?>> exchange) {
super(exchange);
}

10
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 → 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
View File

@@ -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<Message<?>> {
public class StreamStubMessages implements StubMessages<Message<?>> {
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);
}

2
spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/resources/META-INF/spring.factories
View File

@@ -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