fix: default to text/plain content type if no content type header is provided #1013

Author: Ronald Holshausen

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

@@ -294,7 +294,7 @@ open class ProviderClient(
     }
 
     if (!method.containsHeader(CONTENT_TYPE) && request.body.isPresent()) {
-      method.addHeader(CONTENT_TYPE, "application/json")
+      method.addHeader(CONTENT_TYPE, "text/plain; charset=ISO-8859-1")
     }
   }
 
@@ -374,7 +374,7 @@ open class ProviderClient(
       val contentType = if (entity.contentType != null) {
         ContentType.parse(entity.contentType.value)
       } else {
-        ContentType.APPLICATION_JSON
+        ContentType.TEXT_PLAIN
       }
       response["contentType"] = contentType
       response["data"] = EntityUtils.toString(entity, contentType.charset?.name() ?: UTF8)

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

@@ -88,7 +88,7 @@ class ResponseComparison(
       var actualBodyString = ""
       if (actual.isNotEmpty()) {
         actualBodyString = if (mimeType.matches(Regex("application/.*json"))) {
-          Json.gsonPretty.toJson(JsonParser().parse(actual))
+          Json.gsonPretty.toJson(JsonParser.parseString(actual))
         } else {
           actual
         }
@@ -97,7 +97,7 @@ class ResponseComparison(
       var expectedBodyString = ""
       if (response.isNotEmpty()) {
         expectedBodyString = if (jsonBody) {
-          Json.gsonPretty.toJson(JsonParser().parse(response))
+          Json.gsonPretty.toJson(JsonParser.parseString(response))
         } else {
           response
         }

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

@@ -21,6 +21,7 @@ import org.apache.http.entity.StringEntity
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.message.BasicHeader
 import org.apache.http.message.BasicStatusLine
+import spock.lang.Issue
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -83,7 +84,7 @@ class ProviderClientSpec extends Specification {
     0 * httpRequest._
   }
 
-  def 'setting up headers adds an JSON content type if none was provided and there is a body'() {
+  def 'setting up headers adds an TEXT content type if none was provided and there is a body'() {
     given:
     def headers = [
       A: ['a'],
@@ -100,12 +101,12 @@ class ProviderClientSpec extends Specification {
     headers.each {
       1 * httpRequest.addHeader(it.key, it.value[0])
     }
-    1 * httpRequest.addHeader('Content-Type', 'application/json')
+    1 * httpRequest.addHeader('Content-Type', 'text/plain; charset=ISO-8859-1')
 
     0 * httpRequest._
   }
 
-  def 'setting up headers does not add an JSON content type if there is no body'() {
+  def 'setting up headers does not add an TEXT content type if there is no body'() {
     given:
     def headers = [
       A: ['a'],
@@ -122,12 +123,12 @@ class ProviderClientSpec extends Specification {
     headers.each {
       1 * httpRequest.addHeader(it.key, it.value[0])
     }
-    0 * httpRequest.addHeader('Content-Type', 'application/json')
+    0 * httpRequest.addHeader('Content-Type', 'text/plain')
 
     0 * httpRequest._
   }
 
-  def 'setting up headers does not add an JSON content type if there is already one'() {
+  def 'setting up headers does not add an TEXT content type if there is already one'() {
     given:
     def headers = [
       A: ['a'],
@@ -144,7 +145,7 @@ class ProviderClientSpec extends Specification {
     headers.each {
       1 * httpRequest.addHeader(it.key, it.value[0])
     }
-    0 * httpRequest.addHeader('Content-Type', 'application/json')
+    0 * httpRequest.addHeader('Content-Type', 'text/plain')
 
     0 * httpRequest._
   }
@@ -626,4 +627,22 @@ class ProviderClientSpec extends Specification {
     ]
   }
 
+  @Issue('#1013')
+  def 'If no content type header is present, defaults to text/plain'() {
+    given:
+    StatusLine statusLine = new BasicStatusLine(new ProtocolVersion('http', 1, 1), 200, 'OK')
+    Header[] headers = [] as Header[]
+    HttpResponse response = Mock(HttpResponse) {
+      getStatusLine() >> statusLine
+      getAllHeaders() >> headers
+      getEntity() >> new StringEntity('HELLO', null as ContentType)
+    }
+
+    when:
+    def result = client.handleResponse(response)
+
+    then:
+    result.contentType.toString() == 'text/plain; charset=ISO-8859-1'
+  }
+
 }