diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMessagingMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMessagingMethodBodyBuilder.groovy index 62f96f3fab..12d62ae555 100644 --- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMessagingMethodBodyBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/JUnitMessagingMethodBodyBuilder.groovy @@ -68,7 +68,7 @@ class JUnitMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder { @Override protected void validateResponseHeadersBlock(BlockBuilder bb) { - bb.addLine("""AccurestMessage response = accurestMessaging.receiveMessage("${outputMessage.sentTo}");""") + bb.addLine("""AccurestMessage response = accurestMessaging.receiveMessage("${outputMessage.sentTo.serverValue}");""") bb.addLine("""assertThat(response).isNotNull();""") outputMessage.headers?.collect { Header header ->\ processHeaderElement(bb, header.name, header.serverValue) diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMessagingMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMessagingMethodBodyBuilder.groovy index 583acc9c73..c5fba9da10 100644 --- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMessagingMethodBodyBuilder.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMessagingMethodBodyBuilder.groovy @@ -62,7 +62,7 @@ class SpockMessagingMethodBodyBuilder extends MessagingMethodBodyBuilder { @Override protected void validateResponseCodeBlock(BlockBuilder bb) { if (outputMessage) { - bb.addLine("""def response = accurestMessaging.receiveMessage('${outputMessage.sentTo}')""") + bb.addLine("""def response = accurestMessaging.receiveMessage('${outputMessage.sentTo.serverValue}')""") bb.addLine("""assert response != null""") } else { bb.addLine('noExceptionThrown()') diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/OutputMessage.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/OutputMessage.groovy index 2a8c96249f..10bc07fd17 100644 --- a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/OutputMessage.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/OutputMessage.groovy @@ -10,7 +10,7 @@ import groovy.transform.TypeChecked @ToString(includePackage = false, includeNames = true) class OutputMessage extends Common { - String sentTo + DslProperty sentTo Headers headers DslProperty body ExecutionProperty assertThat @@ -24,6 +24,10 @@ class OutputMessage extends Common { } void sentTo(String sentTo) { + this.sentTo = new DslProperty(sentTo) + } + + void sentTo(DslProperty sentTo) { this.sentTo = sentTo } diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/src/main/groovy/io/codearte/accurest/stubrunner/messaging/camel/StubRunnerCamelConfiguration.groovy b/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/src/main/groovy/io/codearte/accurest/stubrunner/messaging/camel/StubRunnerCamelConfiguration.groovy index 8941d4984e..d27329f5d3 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/src/main/groovy/io/codearte/accurest/stubrunner/messaging/camel/StubRunnerCamelConfiguration.groovy +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-camel/src/main/groovy/io/codearte/accurest/stubrunner/messaging/camel/StubRunnerCamelConfiguration.groovy @@ -27,7 +27,7 @@ class StubRunnerCamelConfiguration { from(it.input.messageFrom) .filter(new StubRunnerCamelPredicate(it)) .process(new StubRunnerCamelProcessor(it)) - .to(it.outputMessage.sentTo) + .to(it.outputMessage.sentTo.clientValue) } } }; diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy index a5e7159611..b5205afa30 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-integration/src/main/groovy/io/codearte/accurest/stubrunner/messaging/integration/StubRunnerIntegrationConfiguration.groovy @@ -38,7 +38,7 @@ class StubRunnerIntegrationConfiguration { .filter(new StubRunnerIntegrationMessageSelector(dsl), { FilterEndpointSpec e -> e.id("${flowName}.filter") } ) .transform(new StubRunnerIntegrationTransformer(dsl), { GenericEndpointSpec e -> e.id("${flowName}.transformer") }) if (dsl.outputMessage) { - builder = builder.channel(dsl.outputMessage.sentTo) + builder = builder.channel(dsl.outputMessage.sentTo.clientValue) } else { builder = builder.handle(new DummyMessageHandler(), "handle") } diff --git a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy index bd41ea07bf..b188cf8562 100644 --- a/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy +++ b/stub-runner/stub-runner-messaging/stub-runner-messaging-stream/src/main/groovy/io/codearte/accurest/stubrunner/messaging/stream/StubRunnerStreamConfiguration.groovy @@ -42,7 +42,7 @@ class StubRunnerStreamConfiguration { .filter(new StubRunnerStreamMessageSelector(dsl), { FilterEndpointSpec e -> e.id("${flowName}.filter") } ) .transform(new StubRunnerStreamTransformer(dsl), { GenericEndpointSpec e -> e.id("${flowName}.transformer") }) if (dsl.outputMessage) { - builder = builder.channel(dsl.outputMessage.sentTo) + builder = builder.channel(dsl.outputMessage.sentTo.clientValue) } else { builder = builder.handle(new DummyMessageHandler(), "handle") } @@ -51,7 +51,7 @@ class StubRunnerStreamConfiguration { beanFactory.getBean("${flowName}.transformer", Lifecycle.class).start(); channelBindingService.bindConsumer(beanFactory.getBean(dsl.input.messageFrom, MessageChannel.class), dsl.input.messageFrom) if (dsl.outputMessage) { - channelBindingService.bindProducer(beanFactory.getBean(dsl.outputMessage.sentTo, MessageChannel.class), dsl.outputMessage.sentTo) + channelBindingService.bindProducer(beanFactory.getBean(dsl.outputMessage.sentTo.clientValue, MessageChannel.class), dsl.outputMessage.sentTo.clientValue) } } } diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerExecutor.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerExecutor.groovy index 98f18aab2f..f558a82bd8 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerExecutor.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubRunnerExecutor.groovy @@ -100,7 +100,7 @@ class StubRunnerExecutor implements StubFinder { } AccurestMessage message = accurestMessaging.create(groovyDsl.outputMessage.body.clientValue, groovyDsl.outputMessage.headers.asStubSideMap()) - accurestMessaging.send(message, groovyDsl.outputMessage.sentTo) + accurestMessaging.send(message, groovyDsl.outputMessage.sentTo.clientValue) } private URL returnStubUrlIfMatches(boolean condition) {