chore: correct static code issues and failing tests from PR #1605

provider/junit5spring/src/test/java/au/com/dius/pact/provider/spring/junit5/PactBrokerLoaderTest.java

@@ -56,7 +56,7 @@ private static SelectorBuilder cvs() {
         }
     }
 
-    class Test4 extends Test4Super {}
+    static class Test4 extends Test4Super {}
 
     static class Test4Super {
         @PactBrokerConsumerVersionSelectors
@@ -65,7 +65,7 @@ protected static SelectorBuilder cvs() {
         }
     }
 
-    class Test5 extends Test5Super {}
+    static class Test5 extends Test5Super {}
 
     static class Test5Super {
         @PactBrokerConsumerVersionSelectors

provider/junit5spring/src/test/kotlin/au/com/dius/pact/provider/spring/junit5/PactBrokerLoaderKtTest.kt

@@ -7,6 +7,7 @@ import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 
+@Suppress("UnnecessaryAbstractClass", "UnusedPrivateMember")
 class PactBrokerLoaderKtTest {
 
     @Test
@@ -68,7 +69,6 @@ class PactBrokerLoaderKtTest {
 
     class Test4 : Test4Super()
 
-    @Suppress("UnnecessaryAbstractClass")
     abstract class Test4Super {
 
         @PactBrokerConsumerVersionSelectors
@@ -79,7 +79,6 @@ class PactBrokerLoaderKtTest {
 
     class Test5 : Test5Super()
 
-    @Suppress("UnnecessaryAbstractClass")
     abstract class Test5Super {
         @PactBrokerConsumerVersionSelectors
         fun cvs(): SelectorBuilder {
@@ -90,12 +89,12 @@ class PactBrokerLoaderKtTest {
     class Test6 : Test6Super()
 
     @Suppress("UnnecessaryAbstractClass")
-    abstract class Test6Super() {
+    abstract class Test6Super {
         companion object {
             @PactBrokerConsumerVersionSelectors
             fun cvs(): SelectorBuilder {
                 return SelectorBuilder()
             }
         }
     }
-}
+}

provider/src/main/kotlin/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoader.kt

@@ -31,9 +31,11 @@ import java.net.URISyntaxException
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.companionObject
+import kotlin.reflect.full.companionObjectInstance
 import kotlin.reflect.full.declaredFunctions
 import kotlin.reflect.full.hasAnnotation
 import kotlin.reflect.full.isSubtypeOf
+import kotlin.reflect.full.memberFunctions
 import kotlin.reflect.full.starProjectedType
 import kotlin.reflect.jvm.javaMethod
 import kotlin.reflect.jvm.kotlinFunction
@@ -139,7 +141,10 @@ open class PactBrokerLoader(
     val tags = pactBrokerTags.orEmpty().flatMap { parseListExpression(it, resolver) }
     val selectorsMethod = testClassHasSelectorsMethod(this.testClass)
     return if (selectorsMethod != null) {
-      invokeSelectorsMethod(this.testInstance, selectorsMethod)
+      val (method, methodClass) = selectorsMethod
+      val instance = if (methodClass.isCompanion) methodClass.objectInstance
+        else this.testInstance
+      invokeSelectorsMethod(instance, methodClass.java, method)
     } else if (shouldFallBackToTags(tags, pactBrokerConsumerVersionSelectors, resolver)) {
       permutations(tags, pactBrokerConsumers.flatMap { parseListExpression(it, resolver) })
         .map { ConsumerVersionSelectors.Selector(it.first, true, it.second) }
@@ -353,32 +358,52 @@ open class PactBrokerLoader(
 
   companion object : KLogging() {
     @JvmStatic
-    fun invokeSelectorsMethod(testInstance: Any?, selectorsMethod: KFunction<*>): List<ConsumerVersionSelectors> {
+    fun invokeSelectorsMethod(
+      testInstance: Any?,
+      testClass: Class<*>?,
+      method: Method
+    ): List<ConsumerVersionSelectors> {
       val projectedType = SelectorBuilder::class.starProjectedType
+      val selectorsMethod = method.kotlinFunction!!
       return when (selectorsMethod.parameters.size) {
         0 -> if (selectorsMethod.returnType.isSubtypeOf(projectedType)) {
-          val builder = selectorsMethod.call() as SelectorBuilder
+          val builder = method.invoke(null) as SelectorBuilder
           builder.build()
         } else {
-          selectorsMethod.call() as List<ConsumerVersionSelectors>
+          method.invoke(null) as List<ConsumerVersionSelectors>
         }
-        1 -> if (selectorsMethod.returnType.isSubtypeOf(projectedType)) {
-          val builder = selectorsMethod.call(testInstance) as SelectorBuilder
-          builder.build()
-        } else {
-          selectorsMethod.call(testInstance) as List<ConsumerVersionSelectors>
+        1 -> {
+          val instance = instanceForMethod(testInstance, testClass, method)
+          if (selectorsMethod.returnType.isSubtypeOf(projectedType)) {
+            val builder = method.invoke(instance) as SelectorBuilder
+            builder.build()
+          } else {
+            method.invoke(instance) as List<ConsumerVersionSelectors>
+          }
         }
         else -> throw java.lang.IllegalArgumentException(
           "Consumer version selector method should not take any parameters and return an instance of SelectorBuilder")
       }
     }
 
+    private fun instanceForMethod(testInstance: Any?, testClass: Class<*>?, selectorsMethod: Method): Any? {
+      return if (testInstance == null) {
+        val declaringClass = testClass?.kotlin ?: selectorsMethod.declaringClass.kotlin
+        if (declaringClass.isCompanion) {
+          declaringClass.companionObjectInstance
+        } else {
+          declaringClass.java.newInstance()
+        }
+      } else testInstance
+    }
+
     @JvmStatic
     @Suppress("ThrowsCount")
-    fun testClassHasSelectorsMethod(testClass: Class<*>?): KFunction<*>? {
-      val method = findConsumerVersionSelectorAnnotatedMethod(testClass)
+    fun testClassHasSelectorsMethod(testClass: Class<*>?): Pair<Method, KClass<*>>? {
+      val result = findConsumerVersionSelectorAnnotatedMethod(testClass)
 
-      if (method != null) {
+      if (result != null) {
+        val (method, _) = result;
         if (method.parameterCount > 0) {
           throw IllegalAccessException("Consumer version selector methods must not have any parameters. " +
             "Method ${method.name} has ${method.parameterCount}.")
@@ -402,11 +427,11 @@ open class PactBrokerLoader(
         }
       }
 
-      return method?.kotlinFunction
+      return result
     }
 
     @OptIn(ExperimentalStdlibApi::class)
-    private fun findConsumerVersionSelectorAnnotatedMethod(testClass: Class<*>?) : Method? {
+    private fun findConsumerVersionSelectorAnnotatedMethod(testClass: Class<*>?) : Pair<Method, KClass<*>>? {
       if (testClass == null) {
         return null
       }
@@ -416,16 +441,16 @@ open class PactBrokerLoader(
 
         for (declaredMethod in klass.declaredMethods) {
           if (declaredMethod.isAnnotationPresent(PactBrokerConsumerVersionSelectors::class.java)) {
-            return declaredMethod
+            return declaredMethod to testClass.kotlin
           }
+        }
 
-          val method = klass.kotlin.companionObject?.declaredFunctions?.firstOrNull {
-            it.hasAnnotation<PactBrokerConsumerVersionSelectors>()
-          }
+        val method = klass.kotlin.companionObject?.declaredFunctions?.firstOrNull {
+          it.hasAnnotation<PactBrokerConsumerVersionSelectors>()
+        }
 
-          if (method != null) {
-            return method.javaMethod
-          }
+        if (method != null) {
+          return method.javaMethod!! to klass.kotlin.companionObject!!
         }
 
         klass = klass.superclass

provider/src/test/groovy/au/com/dius/pact/provider/junitsupport/loader/PactBrokerLoaderSpec.groovy

@@ -1465,7 +1465,7 @@ class PactBrokerLoaderSpec extends Specification {
   @Unroll
   def 'Invoke Selectors Method'() {
     expect:
-    PactBrokerLoader.invokeSelectorsMethod(instance, PactBrokerLoader.testClassHasSelectorsMethod(clazz)) == result
+    PactBrokerLoader.invokeSelectorsMethod(instance, clazz, PactBrokerLoader.testClassHasSelectorsMethod(clazz).first) == result
 
     where: