Add json support

src/test/groovy/pl/touk/mockserver/client/AddMockRequestData.groovy

@@ -1,7 +1,11 @@
 package pl.touk.mockserver.client
 
+import groovy.transform.CompileStatic
+import groovy.transform.TypeChecked
 import org.apache.commons.lang3.StringEscapeUtils
 
+@CompileStatic
+@TypeChecked
 class AddMockRequestData {
     String name
     String path
@@ -12,8 +16,6 @@ class AddMockRequestData {
     Integer statusCode
     Method method
     String responseHeaders
-    String requestHeaders
-    String queryParams
 
     void setPredicate(String predicate) {
         this.predicate = StringEscapeUtils.escapeXml11(predicate)
@@ -27,14 +29,6 @@ class AddMockRequestData {
         this.responseHeaders = StringEscapeUtils.escapeXml11(responseHeaders)
     }
 
-    void setRequestHeaders(String requestHeaders) {
-        this.requestHeaders = StringEscapeUtils.escapeXml11(requestHeaders)
-    }
-
-    void setQueryParams(String queryParams) {
-        this.queryParams = StringEscapeUtils.escapeXml11(queryParams)
-    }
-
     enum Method {
         POST,
         GET,

src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy

@@ -61,8 +61,6 @@ class ControlServerClient {
                 ${data.statusCode ? "<statusCode>${data.statusCode}</statusCode>" : ''}
                 ${data.method ? "<method>${data.method}</method>" : ''}
                 ${data.responseHeaders ? "<responseHeaders>${data.responseHeaders}</responseHeaders>" : ''}
-                ${data.requestHeaders ? "<requestHeaders>${data.requestHeaders}</requestHeaders>" : ''}
-                ${data.queryParams ? "<queryParams>${data.queryParams}</queryParams>" : ''}
             </addMock>
         """, ContentType.create("text/xml", "UTF-8"))
     }

src/test/groovy/pl/touk/mockserver/client/Util.groovy

@@ -1,5 +1,6 @@
 package pl.touk.mockserver.client
 
+import groovy.json.JsonSlurper
 import groovy.transform.PackageScope
 import groovy.util.slurpersupport.GPathResult
 import org.apache.http.HttpEntity
@@ -7,7 +8,6 @@ import org.apache.http.client.methods.CloseableHttpResponse
 import org.apache.http.util.EntityUtils
 
 class Util {
-    @PackageScope
     static GPathResult extractXmlResponse(CloseableHttpResponse response){
         HttpEntity entity = response.entity
         GPathResult xml = new XmlSlurper().parseText(EntityUtils.toString(entity))
@@ -22,4 +22,10 @@ class Util {
             </soap-env:Envelope>"""
     }
 
+    static Object extractJsonResponse(CloseableHttpResponse response) {
+        HttpEntity entity = response.entity
+        Object json = new JsonSlurper().parseText(EntityUtils.toString(entity))
+        EntityUtils.consumeQuietly(entity)
+        return json
+    }
 }