fix ContainerFactory

Author: stephane-airbyte

airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties

@@ -1 +1 @@
-version=0.28.17
+version=0.28.18

airbyte-cdk/java/airbyte-cdk/core/src/testFixtures/kotlin/io/airbyte/cdk/extensions/LoggingInvocationInterceptor.kt

@@ -106,8 +106,8 @@ class LoggingInvocationInterceptor : InvocationInterceptor {
                 if (timeoutTask.wasTriggered) {
                     t1 =
                         TimeoutException(
-                            "Execution was cancelled after %s. If you think your test should be given more time to complete, you can use the @Timeout annotation. If all the test of a connector are slow, " +
-                                " you can override the property 'JunitMethodExecutionTimeout' in your gradle.properties.".formatted(
+                                ("Execution was cancelled after %s. If you think your test should be given more time to complete, you can use the @Timeout annotation. If all the test of a connector are slow, " +
+                                " you can override the property 'JunitMethodExecutionTimeout' in your gradle.properties.").formatted(
                                     DurationFormatUtils.formatDurationWords(elapsedMs, true, true)
                                 )
                         )

airbyte-cdk/java/airbyte-cdk/core/src/testFixtures/kotlin/io/airbyte/cdk/testutils/ContainerFactory.kt

@@ -30,9 +30,9 @@ import org.testcontainers.utility.DockerImageName
 abstract class ContainerFactory<C : GenericContainer<*>> {
     @JvmRecord
     private data class ContainerKey<C : GenericContainer<*>>(
-        val clazz: Class<out ContainerFactory<*>?>?,
-        val imageName: DockerImageName?,
-        val methods: MutableList<out NamedContainerModifier<C>>
+            val clazz: Class<out ContainerFactory<*>>,
+            val imageName: DockerImageName,
+            val methods: kotlin.collections.List<String>
     )
 
     private class ContainerOrException(
@@ -110,7 +110,7 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
         namedContainerModifiers: MutableList<out NamedContainerModifier<C>> = ArrayList()
     ): C {
         val containerKey =
-            ContainerKey<C>(javaClass, DockerImageName.parse(imageName), namedContainerModifiers)
+            ContainerKey<C>(javaClass, DockerImageName.parse(imageName), namedContainerModifiers.map { it.name() }.toList())
         // We deliberately avoid creating the container itself eagerly during the evaluation of the
         // map
         // value.
@@ -119,7 +119,7 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
         val containerOrError =
             SHARED_CONTAINERS!!.computeIfAbsent(containerKey) { key: ContainerKey<*>? ->
                 ContainerOrException {
-                    createAndStartContainer(key!!.imageName, (key as ContainerKey<C>)!!.methods)
+                    createAndStartContainer(key!!.imageName, namedContainerModifiers)
                 }
             }
         // Instead, the container creation (if applicable) is deferred to here.