Merge pull request #144 from Codearte/wiremock-two
Migration to wiremock 2.0
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
package io.codearte.accurest.dsl
|
||||
|
||||
import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder
|
||||
import com.github.tomakehurst.wiremock.http.HttpHeader
|
||||
import com.github.tomakehurst.wiremock.http.HttpHeaders
|
||||
import com.github.tomakehurst.wiremock.http.ResponseDefinition
|
||||
@@ -25,30 +27,30 @@ class WireMockResponseStubStrategy extends BaseWireMockStubStrategy {
|
||||
|
||||
@PackageScope
|
||||
ResponseDefinition buildClientResponseContent() {
|
||||
ResponseDefinition responseDefinition = new ResponseDefinition()
|
||||
responseDefinition.setStatus(response.status.clientValue as Integer)
|
||||
appendHeaders(responseDefinition)
|
||||
appendBody(responseDefinition)
|
||||
return responseDefinition
|
||||
ResponseDefinitionBuilder builder = new ResponseDefinitionBuilder()
|
||||
.withStatus(response.status.clientValue as Integer)
|
||||
appendHeaders(builder)
|
||||
appendBody(builder)
|
||||
return builder.build()
|
||||
}
|
||||
|
||||
private void appendHeaders(ResponseDefinition responseDefinition) {
|
||||
if(!(response.headers)) {
|
||||
return
|
||||
private void appendHeaders(ResponseDefinitionBuilder builder) {
|
||||
if (response.headers) {
|
||||
builder.withHeaders(new HttpHeaders(response.headers.entries?.collect {
|
||||
new HttpHeader(it.name, it.clientValue.toString())
|
||||
}))
|
||||
}
|
||||
responseDefinition.setHeaders(new HttpHeaders(response.headers.entries?.collect { new HttpHeader(it.name, it.clientValue.toString()) }))
|
||||
}
|
||||
|
||||
private void appendBody(ResponseDefinition responseDefinition) {
|
||||
if (!response.body) {
|
||||
return
|
||||
private void appendBody(ResponseDefinitionBuilder builder) {
|
||||
if (response.body) {
|
||||
Object body = response.body.clientValue
|
||||
ContentType contentType = recognizeContentTypeFromHeader(response.headers)
|
||||
if (contentType == ContentType.UNKNOWN) {
|
||||
contentType = recognizeContentTypeFromContent(body)
|
||||
}
|
||||
builder.withBody(parseBody(body, contentType))
|
||||
}
|
||||
Object body = response.body.clientValue
|
||||
ContentType contentType = recognizeContentTypeFromHeader(response.headers)
|
||||
if (contentType == ContentType.UNKNOWN) {
|
||||
contentType = recognizeContentTypeFromContent(body)
|
||||
}
|
||||
responseDefinition.setBody(parseBody(body, contentType))
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ project(':accurest-core') {
|
||||
compile 'com.google.code.gson:gson:2.3.1'
|
||||
compile 'com.fasterxml.jackson.core:jackson-databind:2.4.5'
|
||||
compile 'asm:asm:3.3.1'
|
||||
compile 'com.blogspot.toomuchcoding:wiremock:0.0.1'
|
||||
compile 'com.github.tomakehurst:wiremock:2.0.2-beta'
|
||||
testCompile 'cglib:cglib-nodep:2.2'
|
||||
testCompile 'org.objenesis:objenesis:2.1'
|
||||
testCompile project(':accurest-testing-utils')
|
||||
@@ -93,7 +93,7 @@ project(':accurest-converters') {
|
||||
compile 'org.apache.commons:commons-lang3:[3.0,)'
|
||||
compile 'commons-io:commons-io:[2.0,)'
|
||||
compile 'dk.brics.automaton:automaton:1.11-8' // needed for Xeger
|
||||
testCompile 'com.blogspot.toomuchcoding:wiremock:0.0.1'
|
||||
testCompile 'com.github.tomakehurst:wiremock:2.0.2-beta'
|
||||
testCompile 'org.hamcrest:hamcrest-all:1.3'
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user