diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index f7acd72c99..b617001c4a 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -70,12 +70,6 @@ true provided - - com.google.code.findbugs - jsr305 - 3.0.2 - true - org.eclipse.sisu org.eclipse.sisu.plexus @@ -162,8 +156,6 @@ org/slf4j/ - org/apache/commons/lang3/ - com/google/common/base/ diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerMessageRouter.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerMessageRouter.java index 5755a9e8fa..501c627795 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerMessageRouter.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerMessageRouter.java @@ -51,8 +51,8 @@ class StubRunnerMessageRouter extends AbstractMessageRouter { return Collections .singleton((MessageChannel) this.beanFactory.getBean(channelName)); } - return Collections.singleton((MessageChannel) this.beanFactory - .getBean(StubRunnerStreamConfiguration.DummyMessageHandler.CHANNEL_NAME)); + return Collections + .singleton((MessageChannel) this.beanFactory.getBean("nullChannel")); } } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java index 58f32a3357..6fd18be7bc 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamConfiguration.java @@ -48,7 +48,6 @@ import org.springframework.integration.dsl.GenericEndpointSpec; import org.springframework.integration.dsl.IntegrationFlowBuilder; import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.transformer.MessageTransformingHandler; -import org.springframework.messaging.Message; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; @@ -96,11 +95,6 @@ public class StubRunnerStreamConfiguration { BatchStubRunner batchStubRunner) { Map> contracts = batchStubRunner .getContracts(); - IntegrationFlowBuilder dummyBuilder = IntegrationFlows - .from(DummyMessageHandler.CHANNEL_NAME) - .handle(new DummyMessageHandler(), "handle"); - beanFactory.initializeBean(dummyBuilder.get(), - DummyMessageHandler.CHANNEL_NAME + ".flow"); for (Entry> entry : contracts .entrySet()) { StubConfiguration key = entry.getKey(); @@ -158,15 +152,6 @@ public class StubRunnerStreamConfiguration { return new FlowRegistrar(); } - static class DummyMessageHandler { - - static String CHANNEL_NAME = "stub_runner_dummy_channel"; - - public void handle(Message message) { - } - - } - static class FlowRegistrar { } diff --git a/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy b/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy index 5c2dcfce20..bb5ba8b377 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy @@ -38,7 +38,6 @@ import org.springframework.cloud.stream.messaging.Source import org.springframework.context.annotation.Configuration import org.springframework.messaging.Message import org.springframework.test.context.ContextConfiguration - /** * @author Marcin Grzejszczak */ @@ -145,7 +144,7 @@ class StreamStubRunnerSpec extends Specification { assertJsons(receivedMessage.payload) receivedMessage.headers.get('BOOK-NAME') == 'foo' } - + def 'should trigger a label with no output message'() { when: // tag::trigger_no_output[]