From 6f116a0b6a699510bcd7527203a6294f1b7d4302 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 10 Oct 2016 17:29:03 +0200 Subject: [PATCH] Fixing the conditional on class without this change if one doesn't have spring integration java dsl on classpath and uses Stream the app will break on boot with this change the wrong class on the conditional on class gets fixed fixes #100 --- .../messaging/stream/StubRunnerStreamConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 27cc33d2fc..8259c5e160 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 @@ -32,7 +32,6 @@ import org.springframework.cloud.contract.spec.Contract; 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.contract.stubrunner.messaging.stream.StubRunnerStreamConfiguration.FlowRegistrar; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.binding.BinderAwareChannelResolver; import org.springframework.cloud.stream.config.BindingProperties; @@ -56,7 +55,7 @@ import org.springframework.util.StringUtils; * @author Marcin Grzejszczak */ @Configuration -@ConditionalOnClass({FlowRegistrar.class, EnableBinding.class}) +@ConditionalOnClass({IntegrationFlows.class, EnableBinding.class}) @ConditionalOnProperty(name="stubrunner.stream.enabled", havingValue="true", matchIfMissing=true) @AutoConfigureBefore(StubRunnerIntegrationConfiguration.class) public class StubRunnerStreamConfiguration {