feat: update the general verifier to support verification via plugins

provider/build.gradle

@@ -12,12 +12,12 @@ dependencies {
   api project(':core:pactbroker')
   api 'org.apache.httpcomponents.client5:httpclient5'
   api 'io.github.classgraph:classgraph:4.8.129'
+  api('io.pact.plugin.driver:core') {
+    exclude group: 'au.com.dius.pact.core'
+  }
 
   implementation 'commons-io:commons-io:2.11.0'
   implementation 'org.slf4j:slf4j-api'
-  implementation('io.pact.plugin.driver:core') {
-    exclude group: 'au.com.dius.pact.core'
-  }
   implementation 'org.apache.commons:commons-lang3'
   implementation 'org.apache.commons:commons-collections4'
   implementation 'com.github.ajalt:mordant:1.2.1'

provider/gradle/src/main/kotlin/au/com/dius/pact/provider/gradle/GradleProviderInfo.kt

@@ -10,6 +10,8 @@ import au.com.dius.pact.provider.PactVerification
 import au.com.dius.pact.provider.ProviderInfo
 import au.com.dius.pact.provider.gradle.PactPluginBase.Companion.PACT_VERIFY
 import groovy.lang.Closure
+import io.pact.plugins.jvm.core.CatalogueEntry
+import io.pact.plugins.jvm.core.CatalogueManager
 import mu.KLogging
 import org.gradle.api.GradleScriptException
 import org.gradle.api.Project
@@ -51,6 +53,9 @@ open class GradleProviderInfo @Inject constructor(
   var terminateProviderTask: Any? by provider::terminateProviderTask
   var isDependencyForPactVerify: Boolean by provider::isDependencyForPactVerify
 
+  override val transportEntry: CatalogueEntry?
+    get() = CatalogueManager.lookupEntry("transport/$protocol")
+
   open fun hasPactWith(consumer: String, closure: Closure<GradleConsumerInfo>): IConsumerInfo {
     val consumerInfo = objectFactory.newInstance(GradleConsumerInfo::class.java, consumer)
     consumerInfo.name = consumer

provider/junit5/src/main/kotlin/au/com/dius/pact/provider/junit5/PluginTestTarget.kt

@@ -55,6 +55,9 @@ data class PluginProvider(
       config["port"] = value
     }
 
+  override val transportEntry: CatalogueEntry?
+    get() = CatalogueManager.lookupEntry("transport/${config.getOrDefault("transport", "http")}")
+
   override var verificationType: PactVerification? = PactVerification.PLUGIN
 
   override var path: String = ""

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

@@ -16,6 +16,7 @@ import au.com.dius.pact.core.support.json.JsonValue
 import groovy.lang.Binding
 import groovy.lang.Closure
 import groovy.lang.GroovyShell
+import io.pact.plugins.jvm.core.CatalogueEntry
 import mu.KLogging
 import org.apache.hc.client5.http.classic.methods.HttpDelete
 import org.apache.hc.client5.http.classic.methods.HttpGet
@@ -56,6 +57,7 @@ interface IProviderInfo {
   var port: Any?
   var path: String
   var name: String
+  val transportEntry: CatalogueEntry?
 
   val requestFilter: Any?
   val stateChangeRequestFilter: Any?

provider/src/main/kotlin/au/com/dius/pact/provider/ProviderInfo.kt

@@ -9,6 +9,8 @@ import au.com.dius.pact.core.pactbroker.PactBrokerClientConfig
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.Utils
 import au.com.dius.pact.core.support.mapOk
+import io.pact.plugins.jvm.core.CatalogueEntry
+import io.pact.plugins.jvm.core.CatalogueManager
 import mu.KLogging
 import org.apache.commons.lang3.builder.HashCodeBuilder
 import org.apache.commons.lang3.builder.ToStringBuilder
@@ -172,6 +174,9 @@ open class ProviderInfo @JvmOverloads constructor (
     return consumers
   }
 
+  override val transportEntry: CatalogueEntry?
+    get() = CatalogueManager.lookupEntry("transport/$protocol")
+
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (javaClass != other?.javaClass) return false

provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt

@@ -42,7 +42,6 @@ import groovy.lang.Closure
 import io.github.classgraph.ClassGraph
 import io.pact.plugins.jvm.core.CatalogueEntry
 import io.pact.plugins.jvm.core.DefaultPluginManager
-import io.pact.plugins.jvm.core.InteractionVerificationData
 import io.pact.plugins.jvm.core.InteractionVerificationDetails
 import mu.KLogging
 import java.io.File
@@ -227,6 +226,7 @@ interface IProviderVerifier {
   /**
    * Verifies the response from the provider against the interaction
    */
+  @Suppress("LongParameterList")
   fun verifyResponseFromProvider(
     provider: IProviderInfo,
     interaction: SynchronousRequestResponse,
@@ -240,6 +240,7 @@ interface IProviderVerifier {
   /**
    * Verifies the interaction by invoking a method on a provider test class
    */
+  @Suppress("LongParameterList")
   fun verifyResponseByInvokingProviderMethods(
     providerInfo: IProviderInfo,
     consumer: IConsumerInfo,
@@ -249,6 +250,7 @@ interface IProviderVerifier {
     pending: Boolean
   ): VerificationResult
 
+  @Suppress("LongParameterList")
   fun verifyResponseByFactory(
     providerInfo: IProviderInfo,
     consumer: IConsumerInfo,
@@ -261,6 +263,7 @@ interface IProviderVerifier {
   /**
    * Compares the expected and actual responses
    */
+  @Suppress("LongParameterList")
   fun verifyRequestResponsePact(
     expectedResponse: IResponse,
     actualResponse: ProviderResponse,
@@ -326,6 +329,7 @@ open class ProviderVerifier @JvmOverloads constructor (
   override var providerVersion: Supplier<String> = ProviderVersion {
     SystemPropertyResolver.resolveValue(PACT_PROVIDER_VERSION, "")
   },
+  @Deprecated("Use version that returns multiple tags", replaceWith = ReplaceWith("providerTags"))
   override var providerTag: Supplier<String?>? = Supplier {
     SystemPropertyResolver.resolveValue(PACT_PROVIDER_TAG, "")
   },
@@ -357,7 +361,7 @@ open class ProviderVerifier @JvmOverloads constructor (
     return when {
       !projectHasProperty.apply(PACT_VERIFIER_PUBLISH_RESULTS) ->
         verificationReporter.publishingResultsDisabled(SystemPropertyResolver)
-      else -> projectGetProperty.apply(PACT_VERIFIER_PUBLISH_RESULTS)?.toLowerCase() != "true"
+      else -> projectGetProperty.apply(PACT_VERIFIER_PUBLISH_RESULTS)?.lowercase() != "true"
     }
   }
 
@@ -653,12 +657,26 @@ open class ProviderVerifier @JvmOverloads constructor (
     reporters.forEach { it.finaliseReport() }
   }
 
+  @JvmOverloads
+  @Deprecated("Use the version of verifyInteraction that passes in the full Pact and transport entry",
+    ReplaceWith("verifyInteraction(provider, consumer, failures, interaction, pact, transportEntry, providerClient)")
+  )
+  fun verifyInteraction(
+    provider: IProviderInfo,
+    consumer: IConsumerInfo,
+    failures: MutableMap<String, Any>,
+    interaction: Interaction,
+    providerClient: ProviderClient = ProviderClient(provider, HttpClientFactory())
+  ): VerificationResult = verifyInteraction(provider, consumer, failures, interaction, null, null, providerClient)
+
   @JvmOverloads
   fun verifyInteraction(
     provider: IProviderInfo,
     consumer: IConsumerInfo,
     failures: MutableMap<String, Any>,
     interaction: Interaction,
+    pact: Pact?,
+    transportEntry: CatalogueEntry?,
     providerClient: ProviderClient = ProviderClient(provider, HttpClientFactory())
   ): VerificationResult {
     Metrics.sendMetrics(MetricEvent.ProviderVerificationRan(1, verificationSource.ifNullOrEmpty { "unknown" }!!))
@@ -701,13 +719,28 @@ open class ProviderVerifier @JvmOverloads constructor (
         }
         PactVerification.PLUGIN -> {
           logger.debug { "Verifying via plugin" }
-//          when (val result = DefaultPluginManager.prepareValidationForInteraction(transportEntry, v4pact.value,
-//            interaction.asV4Interaction(), config)) {
-//            is Ok -> result.value to null
-//            is Err -> throw RuntimeException("Failed to configure the interaction for verification - ${result.error}")
-//          }
-//          verifyInteractionViaPlugin(provider, consumer, interaction, providerClient, )
-          TODO("Not yet implemented")
+          if (pact != null && pact.isV4Pact() && transportEntry != null) {
+            val v4pact = pact.asV4Pact().unwrap()
+            val v4Interaction = interaction.asV4Interaction()
+            val config = mutableMapOf(
+              "host" to provider.host.toString(),
+              "port" to provider.port
+            )
+
+            for ((k, v) in stateChangeResult.stateChangeResult.value) {
+              config[k] = v
+            }
+
+            val request = when (val result = DefaultPluginManager.prepareValidationForInteraction(transportEntry,
+              v4pact, v4Interaction, config)) {
+              is Ok -> result.value
+              is Err -> throw RuntimeException("Failed to configure the interaction for verification - ${result.error}")
+            }
+            verifyInteractionViaPlugin(provider, consumer, v4pact, v4Interaction, providerClient, request, context)
+          } else {
+            throw RuntimeException("INTERNAL ERROR: Verification via a plugin requires the version of " +
+              "verifyInteraction to be called with the full V4 Pact model")
+          }
         }
         else -> {
           logger.debug { "Verifying via provider methods" }
@@ -827,7 +860,7 @@ open class ProviderVerifier @JvmOverloads constructor (
     client: ProviderClient
   ) = verifyResponseFromProvider(provider, interaction, interactionMessage, failures, client, mutableMapOf(), false)
 
-  @Suppress("TooGenericExceptionCaught")
+  @Suppress("TooGenericExceptionCaught", "LongParameterList")
   override fun verifyResponseFromProvider(
     provider: IProviderInfo,
     interaction: SynchronousRequestResponse,
@@ -893,7 +926,7 @@ open class ProviderVerifier @JvmOverloads constructor (
       VerificationResult.Ok()
     } else {
       val result = pact.interactions.map {
-        verifyInteraction(provider, consumer, failures, it)
+        verifyInteraction(provider, consumer, failures, it, pact, provider.transportEntry)
       }.reduce { acc, result -> acc.merge(result) }
       result.merge(when {
         pact.isFiltered() -> {