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

Fixed the bug with bad sent msgs

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-06-28 22:57:45 +02:00
parent 845002bc78
commit 68559b2577
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-camel/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelProcessor.groovy
View File

@@ -17,7 +17,7 @@
package org.springframework.cloud.contract.stubrunner.messaging.camel
import groovy.transform.PackageScope
import org.springframework.cloud.contract.verifier.util.BodyAsStringUtil
import org.springframework.cloud.contract.verifier.util.BodyExtractor
import org.apache.camel.Exchange
import org.apache.camel.Message
import org.apache.camel.Processor
@@ -47,7 +47,7 @@ class StubRunnerCamelProcessor implements Processor {
if (!groovyDsl.outputMessage) {
return
}
input.body = BodyAsStringUtil.extractStubValueFrom(groovyDsl.outputMessage.body)
input.body = BodyExtractor.extractStubValueFrom(groovyDsl.outputMessage.body)
groovyDsl.outputMessage.headers?.entries?.each {
input.setHeader(it.name, it.clientValue)
}

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

@@ -17,7 +17,7 @@
package org.springframework.cloud.contract.stubrunner.messaging.integration
import org.springframework.cloud.contract.verifier.dsl.Contract
import org.springframework.cloud.contract.verifier.util.BodyAsStringUtil
import org.springframework.cloud.contract.verifier.util.BodyExtractor
import org.springframework.integration.transformer.GenericTransformer
import org.springframework.messaging.Message
import org.springframework.messaging.MessageHeaders
@@ -41,7 +41,7 @@ class StubRunnerIntegrationTransformer implements GenericTransformer<Message<?>,
if (!groovyDsl.outputMessage) {
return source
}
String payload = BodyAsStringUtil.extractStubValueFrom(groovyDsl.outputMessage.body)
String payload = BodyExtractor.extractStubValueFrom(groovyDsl.outputMessage.body)
Map<String, Object> headers = groovyDsl.outputMessage.headers.asStubSideMap()
return MessageBuilder.createMessage(payload, new MessageHeaders(headers))
}

4
spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner-messaging/spring-cloud-contract-stub-runner-stream/src/main/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StubRunnerStreamTransformer.groovy
View File

@@ -16,7 +16,7 @@
package org.springframework.cloud.contract.stubrunner.messaging.stream
import org.springframework.cloud.contract.verifier.util.BodyAsStringUtil
import org.springframework.cloud.contract.verifier.util.BodyExtractor
import org.springframework.cloud.contract.verifier.dsl.Contract
import org.springframework.integration.transformer.GenericTransformer
import org.springframework.messaging.Message
@@ -41,7 +41,7 @@ class StubRunnerStreamTransformer implements GenericTransformer<Message<?>, Mess
if (!groovyDsl.outputMessage) {
return source
}
String payload = BodyAsStringUtil.extractStubValueFrom(groovyDsl.outputMessage.body)
String payload = BodyExtractor.extractStubValueFrom(groovyDsl.outputMessage.body)
Map<String, Object> headers = groovyDsl.outputMessage.headers.asStubSideMap()
return MessageBuilder.createMessage(payload, new MessageHeaders(headers))
}

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

@@ -22,6 +22,7 @@ import org.springframework.cloud.contract.verifier.dsl.Contract
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging
import org.springframework.cloud.contract.verifier.util.BodyExtractor
/**
* Runs stubs for a particular {@link StubServer}
@@ -127,7 +128,8 @@ class StubRunnerExecutor implements StubFinder {
if (!groovyDsl.outputMessage) {
return
}
ContractVerifierMessage message = contractVerifierMessaging.create(groovyDsl.outputMessage?.body?.clientValue,
ContractVerifierMessage message = contractVerifierMessaging.create(
BodyExtractor.extractClientValueFromBody(groovyDsl.outputMessage?.body?.clientValue),
groovyDsl.outputMessage?.headers?.asStubSideMap())
contractVerifierMessaging.send(message, groovyDsl.outputMessage.sentTo.clientValue)
}

8
spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyAsStringUtil.groovy → spring-cloud-contract-verifier/spring-cloud-contract-verifier-core/src/main/groovy/org/springframework/cloud/contract/verifier/util/BodyExtractor.groovy
View File

@@ -31,9 +31,9 @@ import static ContentUtils.extractValue
* @since 1.0.0
*/
@CompileStatic
class BodyAsStringUtil {
class BodyExtractor {
private BodyAsStringUtil() {}
private BodyExtractor() {}
/**
* Returns the string representation of the body for the server side.
@@ -63,7 +63,7 @@ class BodyAsStringUtil {
return toTrim.startsWith('"') ? toTrim.replaceAll('"', '') : toTrim
}
private static Object extractServerValueFromBody(bodyValue) {
static Object extractServerValueFromBody(bodyValue) {
if (bodyValue instanceof GString) {
bodyValue = extractValue(bodyValue, { DslProperty dslProperty -> dslProperty.serverValue })
} else {
@@ -72,7 +72,7 @@ class BodyAsStringUtil {
return bodyValue
}
private static Object extractClientValueFromBody(bodyValue) {
static Object extractClientValueFromBody(bodyValue) {
if (bodyValue instanceof GString) {
return extractValue(bodyValue, { DslProperty dslProperty -> dslProperty.clientValue })
} else if (bodyValue instanceof DslProperty) {