From d7a9b93f68046a8b3f1385528a987dc60cfbf870 Mon Sep 17 00:00:00 2001
From: Ronald Holshausen <uglyog@dius.com.au>
Date: Thu, 18 Jun 2020 09:05:07 +1000
Subject: [PATCH] refactor: more some more Groovy code to Kotlin

---
 ...aseBuilder.groovy => GroovyBuilder.groovy} |   5 +-
 .../consumer/groovy/PactBodyBuilder.groovy    |   8 +--
 .../pact/consumer/groovy/PactBuilder.groovy   |  31 +----------
 .../messaging/PactMessageBuilder.groovy       |   4 +-
 .../dius/pact/consumer/groovy/BaseBuilder.kt  |  51 ++++++++++++++++++
 .../consumer/groovy/BinaryFileSpec.groovy     |  40 ++++++++++++++
 consumer/groovy/src/test/resources/sample.pdf | Bin 0 -> 7498 bytes
 .../junit5/BinaryFileProviderTest.groovy      |   6 +++
 8 files changed, 103 insertions(+), 42 deletions(-)
 rename consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/{BaseBuilder.groovy => GroovyBuilder.groovy} (69%)
 create mode 100644 consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt
 create mode 100644 consumer/groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/BinaryFileSpec.groovy
 create mode 100644 consumer/groovy/src/test/resources/sample.pdf

diff --git a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/BaseBuilder.groovy b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/GroovyBuilder.groovy
similarity index 69%
rename from consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/BaseBuilder.groovy
rename to consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/GroovyBuilder.groovy
index db6c6adc60..4009785092 100644
--- a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/BaseBuilder.groovy
+++ b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/GroovyBuilder.groovy
@@ -3,9 +3,7 @@ package au.com.dius.pact.consumer.groovy
 /**
  * Base class for builders
  */
-class BaseBuilder extends Matchers {
-  public static final List COMPACT_MIME_TYPES = ['application/x-thrift+json']
-
+class GroovyBuilder extends BaseBuilder {
   def call(Closure closure) {
     build(closure)
   }
@@ -15,5 +13,4 @@ class BaseBuilder extends Matchers {
     closure.resolveStrategy = Closure.DELEGATE_FIRST
     closure.call()
   }
-
 }
diff --git a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBodyBuilder.groovy b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBodyBuilder.groovy
index c7334420db..d1024dd4fc 100755
--- a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBodyBuilder.groovy
+++ b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBodyBuilder.groovy
@@ -18,7 +18,7 @@ import static au.com.dius.pact.core.model.PathExpressionsKt.PATH_SPECIAL_CHARS
 /**
  * DSL Builder for constructing JSON bodies
  */
-class PactBodyBuilder extends BaseBuilder {
+class PactBodyBuilder extends GroovyBuilder {
 
   public static final String PATH_SEP = '.'
   public static final String START_LIST = '['
@@ -45,11 +45,7 @@ class PactBodyBuilder extends BaseBuilder {
   }
 
   private boolean shouldPrettyPrint() {
-    prettyPrintBody == null && !compactMimeType() || prettyPrintBody
-  }
-
-  private boolean compactMimeType() {
-    mimetype in COMPACT_MIME_TYPES
+    prettyPrintBody == null && (mimetype != null && !isCompactMimeType(mimetype) || mimetype == null) || prettyPrintBody
   }
 
   def methodMissing(String name, args) {
diff --git a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy
index 6dfdaad46b..d3ab9c7cef 100644
--- a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy
+++ b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/PactBuilder.groovy
@@ -23,7 +23,6 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules
 import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl
 import au.com.dius.pact.core.model.matchingrules.RegexMatcher
 import au.com.dius.pact.core.support.expressions.DataType
-import groovy.json.JsonBuilder
 import groovy.transform.CompileStatic
 import org.apache.http.entity.ContentType
 import org.apache.http.entity.mime.HttpMultipartMode
@@ -37,13 +36,7 @@ import static au.com.dius.pact.consumer.ConsumerPactRunnerKt.runConsumerTest
  * Builder DSL for Pact tests
  */
 @SuppressWarnings('PropertyName')
-class PactBuilder extends BaseBuilder {
-
-  private static final String CONTENT_TYPE = 'Content-Type'
-  private static final String JSON = 'application/json'
-  private static final String BODY = 'body'
-  private static final String LOCALHOST = 'localhost'
-  public static final String HEADER = 'header'
+class PactBuilder extends GroovyBuilder {
 
   Consumer consumer
   Provider provider
@@ -232,24 +225,6 @@ class PactBuilder extends BaseBuilder {
     this
   }
 
-  private setupBody(Map requestData, Map request) {
-    if (requestData.containsKey(BODY)) {
-      def body = requestData.body
-      if (body instanceof PactBodyBuilder) {
-        request.body = body.body
-        request.matchers.addCategory(body.matchers)
-        request.generators.addGenerators(body.generators)
-      } else if (body != null && !(body instanceof String)) {
-
-        if (requestData.prettyPrint == null && !compactMimeTypes(requestData) || requestData.prettyPrint) {
-          request.body = new JsonBuilder(body).toPrettyString()
-        } else {
-          request.body = new JsonBuilder(body).toString()
-        }
-      }
-    }
-  }
-
   /**
    * Defines the response attributes (body, headers, etc.) that are returned for the request
    * @param responseData Map of attributes
@@ -264,10 +239,6 @@ class PactBuilder extends BaseBuilder {
     this
   }
 
-  private static boolean compactMimeTypes(Map reqResData) {
-    reqResData.headers && reqResData.headers[CONTENT_TYPE] in COMPACT_MIME_TYPES
-  }
-
   /**
    * Allows the body to be defined using a Groovy builder pattern
    * @param options The following options are available:
diff --git a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/messaging/PactMessageBuilder.groovy b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/messaging/PactMessageBuilder.groovy
index 3754c35182..20513b57e9 100644
--- a/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/messaging/PactMessageBuilder.groovy
+++ b/consumer/groovy/src/main/groovy/au/com/dius/pact/consumer/groovy/messaging/PactMessageBuilder.groovy
@@ -1,7 +1,7 @@
 package au.com.dius.pact.consumer.groovy.messaging
 
 import au.com.dius.pact.consumer.PactConsumerConfig
-import au.com.dius.pact.consumer.groovy.BaseBuilder
+import au.com.dius.pact.consumer.groovy.GroovyBuilder
 import au.com.dius.pact.consumer.groovy.Matcher
 import au.com.dius.pact.consumer.groovy.PactBodyBuilder
 import au.com.dius.pact.core.model.Consumer
@@ -17,7 +17,7 @@ import au.com.dius.pact.core.model.messaging.MessagePact
 /**
  * Pact builder for consumer tests for messaging
  */
-class PactMessageBuilder extends BaseBuilder {
+class PactMessageBuilder extends GroovyBuilder {
   Consumer consumer
   Provider provider
   List<ProviderState> providerStates = []
diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt
new file mode 100644
index 0000000000..d8f39a3c73
--- /dev/null
+++ b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt
@@ -0,0 +1,51 @@
+package au.com.dius.pact.consumer.groovy
+
+import au.com.dius.pact.core.model.generators.Generators
+import au.com.dius.pact.core.model.matchingrules.Category
+import au.com.dius.pact.core.model.matchingrules.MatchingRules
+import au.com.dius.pact.core.support.property
+import groovy.json.JsonBuilder
+import mu.KLogging
+
+open class BaseBuilder : Matchers() {
+  protected fun setupBody(requestData: Map<String, Any>, request: MutableMap<String, Any>) {
+    if (requestData.containsKey(BODY)) {
+      val body = requestData[BODY]
+      if (body != null && body::class.qualifiedName == "au.com.dius.pact.consumer.groovy.PactBodyBuilder") {
+        request[BODY] = body::class.property(BODY)?.get(body) as Any
+        val matchers = request["matchers"] as MatchingRules
+        matchers.addCategory(body::class.property("matchers")?.get(body) as Category)
+        val generators = request["generators"] as Generators
+        generators.addGenerators(body::class.property("generators")?.get(body) as Generators)
+      } else if (body != null && body !is String) {
+        val prettyPrint = requestData["prettyPrint"] as Boolean?
+        if (prettyPrint == null && !compactMimeTypes(requestData) || prettyPrint == true) {
+          request[BODY] = JsonBuilder(body).toPrettyString()
+        } else {
+          request[BODY] = JsonBuilder(body).toString()
+        }
+      }
+    }
+  }
+
+  companion object : KLogging() {
+    const val CONTENT_TYPE = "Content-Type"
+    const val JSON = "application/json"
+    const val BODY = "body"
+    const val LOCALHOST = "localhost"
+    const val HEADER = "header"
+
+    val COMPACT_MIME_TYPES = listOf("application/x-thrift+json")
+
+    @JvmStatic
+    fun compactMimeTypes(reqResData: Map<String, Any>): Boolean {
+      return if (reqResData.containsKey("headers")) {
+        val headers = reqResData["headers"] as Map<String, String>
+        headers.entries.find { it.key == CONTENT_TYPE }?.value in COMPACT_MIME_TYPES
+      } else false
+    }
+
+    @JvmStatic
+    fun isCompactMimeType(mimetype: String) = mimetype in COMPACT_MIME_TYPES
+  }
+}
diff --git a/consumer/groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/BinaryFileSpec.groovy b/consumer/groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/BinaryFileSpec.groovy
new file mode 100644
index 0000000000..bf76007afd
--- /dev/null
+++ b/consumer/groovy/src/test/groovy/au/com/dius/pact/consumer/groovy/BinaryFileSpec.groovy
@@ -0,0 +1,40 @@
+package au.com.dius.pact.consumer.groovy
+
+import au.com.dius.pact.consumer.MockServer
+import au.com.dius.pact.consumer.PactVerificationResult
+import org.apache.http.client.methods.RequestBuilder
+import org.apache.http.impl.client.CloseableHttpClient
+import org.apache.http.impl.client.HttpClients
+import spock.lang.Ignore
+import spock.lang.Specification
+
+@Ignore
+class BinaryFileSpec extends Specification {
+
+  def 'handles bodies from form posts'() {
+    given:
+    def pdf = BinaryFileSpec.getResourceAsStream('/sample.pdf').bytes
+    def service = new PactBuilder()
+    service {
+      serviceConsumer 'Consumer'
+      hasPactWith 'File Service'
+      uponReceiving('a multipart file POST')
+      withAttributes(path: '/get-doco')
+      willRespondWith(status: 200, body: pdf, headers: ['Content-Type': 'application/pdf'])
+    }
+
+    when:
+    def result = service.runTest { MockServer mockServer, context ->
+      CloseableHttpClient httpclient = HttpClients.createDefault()
+      def response = httpclient.withCloseable {
+        def request = RequestBuilder.get(mockServer.url + '/get-doco').build()
+        httpclient.execute(request)
+      }
+      assert response.statusLine.statusCode == 200
+      assert response.entity.contentLength == pdf.size()
+    }
+
+    then:
+    result instanceof PactVerificationResult.Ok
+  }
+}
diff --git a/consumer/groovy/src/test/resources/sample.pdf b/consumer/groovy/src/test/resources/sample.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..aac7901f4e16ba286a0e60a7d1fbe0297194c41e
GIT binary patch
literal 7498
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

literal 0
HcmV?d00001

diff --git a/provider/junit5/src/test/groovy/au/com/dius/pact/provider/junit5/BinaryFileProviderTest.groovy b/provider/junit5/src/test/groovy/au/com/dius/pact/provider/junit5/BinaryFileProviderTest.groovy
index d56131e004..078bea87ae 100644
--- a/provider/junit5/src/test/groovy/au/com/dius/pact/provider/junit5/BinaryFileProviderTest.groovy
+++ b/provider/junit5/src/test/groovy/au/com/dius/pact/provider/junit5/BinaryFileProviderTest.groovy
@@ -4,6 +4,7 @@ import au.com.dius.pact.provider.junitsupport.Provider
 import au.com.dius.pact.provider.junitsupport.loader.PactFolder
 import com.github.tomakehurst.wiremock.WireMockServer
 import groovy.util.logging.Slf4j
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.TestTemplate
@@ -35,6 +36,11 @@ class BinaryFileProviderTest {
     System.setProperty('pact.content_type.override.application.pdf', 'text')
   }
 
+  @AfterAll
+  static void afterAll() {
+    System.clearProperty('pact.content_type.override.application.pdf')
+  }
+
   @BeforeEach
   void before(PactVerificationContext context, @WiremockResolver.Wiremock WireMockServer server,
               @WiremockUriResolver.WiremockUri String uri) throws MalformedURLException {