Merge pull request #1012 from BenVercammen/provider-client-request-body-encoding

The request body should be encoded according to the request header

Author: Ronald Holshausen

provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt

@@ -39,6 +39,7 @@ import java.lang.Boolean.getBoolean
 import java.net.URI
 import java.net.URL
 import java.net.URLDecoder
+import java.nio.charset.UnsupportedCharsetException
 import java.util.concurrent.Callable
 import java.util.function.Consumer
 import java.util.function.Function
@@ -270,7 +271,17 @@ open class ProviderClient(
 
   open fun setupBody(request: Request, method: HttpRequest) {
     if (method is HttpEntityEnclosingRequest && request.body.isPresent()) {
-      method.entity = StringEntity(request.body.valueAsString())
+      val contentTypeHeader = request.contentTypeHeader()
+      if (null != contentTypeHeader) {
+        try {
+          val contentType = ContentType.parse(contentTypeHeader)
+          method.entity = StringEntity(request.body.valueAsString(), contentType)
+        } catch (e: UnsupportedCharsetException) {
+          method.entity = StringEntity(request.body.valueAsString())
+        }
+      } else {
+        method.entity = StringEntity(request.body.valueAsString())
+      }
     }
   }
 

provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy

@@ -12,6 +12,7 @@ import org.apache.http.client.methods.CloseableHttpResponse
 import org.apache.http.client.methods.HttpUriRequest
 import org.apache.http.entity.ContentType
 import org.apache.http.impl.client.CloseableHttpClient
+import org.apache.http.message.BasicHttpEntityEnclosingRequest
 import org.junit.Before
 import org.junit.Test
 import org.mockito.invocation.InvocationOnMock
@@ -42,7 +43,7 @@ class ProviderClientTest {
     httpClientFactory = [newClient: { provider -> mockHttpClient } ] as IHttpClientFactory
     client = new ProviderClient(provider, httpClientFactory)
     when(mockHttpClient.execute(any())).thenAnswer { InvocationOnMock invocation ->
-      args = invocation.arguments.first()
+      args = invocation.arguments.first() as HttpUriRequest
       [
         getStatusLine: { [getStatusCode: { 200 } ] as StatusLine },
         getAllHeaders: { [] as Header[] },
@@ -69,4 +70,39 @@ class ProviderClientTest {
     assert args.entity.content.text == 'A=B'
   }
 
+  @Test
+  void 'setupBody() needs to take Content-Type headegr into account (UTF-8)'() {
+    def contentType = 'text/plain; charset=UTF-8'
+    def headers = ['Content-Type': [contentType]]
+    def body = 'ÄÉÌÕÛ'
+    def request = new Request('PUT', '/', [:], headers, OptionalBody.body(body.bytes))
+    def method = new BasicHttpEntityEnclosingRequest('PUT', '/')
+    client.setupBody(request, method)
+    assert method.entity.contentType.value == contentType
+    assert method.entity.content.getText('UTF-8') == body
+  }
+
+  @Test
+  void 'setupBody() needs to take Content-Type header into account (ISO-8859-1)'() {
+    def contentType = 'text/plain; charset=ISO-8859-1'
+    def headers = ['Content-Type': [contentType]]
+    def body = 'ÄÉÌÕÛ'
+    def request = new Request('PUT', '/', [:], headers, OptionalBody.body(body.bytes))
+    def method = new BasicHttpEntityEnclosingRequest('PUT', '/')
+    client.setupBody(request, method)
+    assert method.entity.contentType.value == contentType
+    assert method.entity.content.getText('ISO-8859-1') == body
+  }
+
+  @Test
+  void 'setupBody() Content-Type defaults to plain text without encoding'() {
+    def contentType = 'text/plain'
+    def body = 'ÄÉÌÕÛ'
+    def request = new Request('PUT', '/', [:], [:], OptionalBody.body(body.bytes))
+    def method = new BasicHttpEntityEnclosingRequest('PUT', '/')
+    client.setupBody(request, method)
+    assert method.entity.contentType.value == contentType
+    assert method.entity.content.getText('ISO-8859-1') == body
+  }
+
 }