Fix the gradle plugun to work with scala 2.11

pact-foundation · Oct 2, 2014 · 6165b71 · 6165b71
1 parent be586bb
commit 6165b71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/...vider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/PactVerificationTask.groovy b/...vider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/PactVerificationTask.groovy
@@ -38,7 +38,7 @@ class PactVerificationTask extends DefaultTask {
                 throw new RuntimeException('You must specify the pactfile to execute (use pactFile = ...)')
             }
 
-            def interactions = JavaConverters$.MODULE$.asJavaIteratorConverter(pact.interactions().iterator())
+            def interactions = JavaConverters$.MODULE$.seqAsJavaListConverter(pact.interactions())
             interactions.asJava().each { Interaction interaction ->
                 def interactionMessage = "Verifying a pact between ${consumer.name} and ${providerToVerify.name} - ${interaction.description()}"
 
@@ -143,7 +143,7 @@ class PactVerificationTask extends DefaultTask {
     void displayHeadersResult(Map failures, def expected, Map comparison, String comparisonDescription) {
         if (!comparison.isEmpty()) {
             AnsiConsole.out().println('      includes headers')
-            Map expectedHeaders = JavaConverters$.MODULE$.asJavaMapConverter(expected.get()).asJava()
+            Map expectedHeaders = JavaConverters$.MODULE$.mapAsJavaMapConverter(expected.get()).asJava()
             comparison.each { key, headerComparison ->
                 def expectedHeaderValue = expectedHeaders[key]
                 def ansi = Ansi.ansi().a('        "').bold().a(key).boldOff().a('" with value "').bold()

diff --git a/...vm-provider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/ProviderClient.groovy b/...vm-provider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/ProviderClient.groovy
@@ -17,7 +17,7 @@ class ProviderClient {
         def requestMap = [path: request.path()]
         requestMap.headers = [:]
         if (request.headers().defined) {
-            requestMap.headers = JavaConverters$.MODULE$.asJavaMapConverter(request.headers().get()).asJava()
+            requestMap.headers = JavaConverters$.MODULE$.mapAsJavaMapConverter(request.headers().get()).asJava()
         }
 
         if (requestMap.headers['Content-Type']) {

diff --git a/...rovider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/ResponseComparison.groovy b/...rovider-gradle/src/main/groovy/au/com/dius/pact/provider/gradle/ResponseComparison.groovy
@@ -43,12 +43,7 @@ class ResponseComparison {
     Map headerResult = [:]
 
     if (expected.headers().defined) {
-      def headers
-      if (JavaConverters$.MODULE$.metaClass.respondsTo('asJavaMapConverter')) {
-          headers = JavaConverters$.MODULE$.asJavaMapConverter(expected.headers().get()).asJava()
-      } else {
-          headers = JavaConverters$.MODULE$.mapAsJavaMapConverter(expected.headers().get()).asJava()
-      }
+      def headers = JavaConverters$.MODULE$.mapAsJavaMapConverter(expected.headers().get()).asJava()
       headers.each { headerKey, value ->
         try {
           assert actualHeaders[headerKey.toUpperCase()] == value