From 0f2c01148c4a122c4d198d05e9af2ce0010a75b7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 21 Jun 2019 12:52:35 +0200 Subject: [PATCH] Fixing stream and itegration issus --- .../StubRunnerIntegrationConfiguration.java | 12 +----------- .../StubRunnerIntegrationTransformer.java | 5 +---- .../stream/StubRunnerStreamConfiguration.java | 13 +------------ .../stream/StubRunnerStreamTransformer.java | 4 +--- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java index 602f800f90..1069243a9e 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.java @@ -33,10 +33,8 @@ import org.springframework.context.Lifecycle; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.FilterEndpointSpec; -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; @@ -95,19 +93,11 @@ public class StubRunnerIntegrationConfiguration { } }) .transform( - new StubRunnerIntegrationTransformer(entries.getValue()), - new Consumer>() { - @Override - public void accept( - GenericEndpointSpec e) { - e.id(flowName + ".transformer"); - } - }) + new StubRunnerIntegrationTransformer(entries.getValue())) .route(new StubRunnerIntegrationRouter(entries.getValue(), beanFactory)); beanFactory.initializeBean(builder.get(), flowName); beanFactory.getBean(flowName + ".filter", Lifecycle.class).start(); - beanFactory.getBean(flowName + ".transformer", Lifecycle.class).start(); } } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java index 0e42f31169..56f7bdcfd8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/integration/StubRunnerIntegrationTransformer.java @@ -23,7 +23,6 @@ import java.util.Map; import org.springframework.cloud.contract.spec.Contract; import org.springframework.cloud.contract.spec.internal.FromFileProperty; import org.springframework.cloud.contract.verifier.util.BodyExtractor; -import org.springframework.integration.transformer.GenericTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; @@ -33,8 +32,7 @@ import org.springframework.messaging.support.MessageBuilder; * * @author Marcin Grzejszczak */ -class StubRunnerIntegrationTransformer - implements GenericTransformer, Message> { +class StubRunnerIntegrationTransformer { private final StubRunnerIntegrationMessageSelector selector; @@ -46,7 +44,6 @@ class StubRunnerIntegrationTransformer this.selector = new StubRunnerIntegrationMessageSelector(groovyDsls); } - @Override public Message transform(Message source) { Contract groovyDsl = matchingContract(source); if (groovyDsl == null || groovyDsl.getOutputMessage() == null) { 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 e609b17342..c7bb4a00f6 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 @@ -37,17 +37,14 @@ import org.springframework.cloud.contract.stubrunner.BatchStubRunner; import org.springframework.cloud.contract.stubrunner.StubConfiguration; import org.springframework.cloud.contract.stubrunner.messaging.integration.StubRunnerIntegrationConfiguration; import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.binding.BinderAwareChannelResolver; import org.springframework.cloud.stream.config.BindingProperties; import org.springframework.cloud.stream.config.BindingServiceProperties; import org.springframework.context.Lifecycle; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.FilterEndpointSpec; -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; @@ -130,19 +127,11 @@ public class StubRunnerStreamConfiguration { e.id(flowName + ".filter"); } }) - .transform(new StubRunnerStreamTransformer(entries.getValue()), - new Consumer>() { - @Override - public void accept( - GenericEndpointSpec e) { - e.id(flowName + ".transformer"); - } - }) + .transform(new StubRunnerStreamTransformer(entries.getValue())) .route(new StubRunnerMessageRouter(entries.getValue(), beanFactory)); beanFactory.initializeBean(builder.get(), flowName); beanFactory.getBean(flowName + ".filter", Lifecycle.class).start(); - beanFactory.getBean(flowName + ".transformer", Lifecycle.class).start(); } } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java index e581a95698..25188f47b5 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.java @@ -23,7 +23,6 @@ import java.util.Map; import org.springframework.cloud.contract.spec.Contract; import org.springframework.cloud.contract.spec.internal.FromFileProperty; import org.springframework.cloud.contract.verifier.util.BodyExtractor; -import org.springframework.integration.transformer.GenericTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; @@ -33,7 +32,7 @@ import org.springframework.messaging.support.MessageBuilder; * * @author Marcin Grzejszczak */ -class StubRunnerStreamTransformer implements GenericTransformer, Message> { +class StubRunnerStreamTransformer { private final StubRunnerStreamMessageSelector selector; @@ -45,7 +44,6 @@ class StubRunnerStreamTransformer implements GenericTransformer, Mess this.selector = new StubRunnerStreamMessageSelector(groovyDsls); } - @Override public Message transform(Message source) { Contract groovyDsl = matchingContract(source); if (groovyDsl == null || groovyDsl.getOutputMessage() == null) {