Merge pull request #12 from nomisRev/update-to-ktor-3

Update to ktor 3

Author: nomisRev

gradle/libs.versions.toml

@@ -1,18 +1,17 @@
 [versions]
-coroutines = "1.7.0"
-dokka = "1.8.10"
-kotlin = "1.9.10"
-kotest = "5.5.4"
-kotest-plugin = "5.5.5"
+coroutines = "1.10.1"
+dokka = "2.0.0"
+kotlin = "2.1.10"
+kotest = "5.9.1"
 kover = "0.9.1"
 detekt = "1.23.8"
 kotlinx-knit="0.5.0"
-ktor = "2.3.0"
+ktor = "3.1.0"
 pubsub = "1.123.6"
 gcloud = "1.20.5"
 publish="0.25.3"
-knit="0.4.0"
-spotless="6.22.0"
+knit="0.5.0"
+spotless="7.0.2"
 google-api="2.17.1"
 logback = "1.4.11"
 
@@ -33,7 +32,7 @@ logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest-plugin" }
+kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotest" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 publish = { id = "com.vanniktech.maven.publish", version.ref="publish" }

pubsub-kotlinx-serialization-json/src/main/kotlin/io/github/nomisrev/gcp/pubsub/serialization/KotlinXSerialization.kt

@@ -24,7 +24,7 @@ import kotlinx.serialization.serializer
 public class KotlinXJsonEncoder<A>(
   private val stringFormat: StringFormat,
   private val serializer: KSerializer<A>,
-  private val configure: PubsubMessage.Builder.() -> Unit
+  private val configure: PubsubMessage.Builder.() -> Unit,
 ) : MessageEncoder<A> {
   override suspend fun encode(value: A): PubsubMessage =
     PubsubMessage.newBuilder()
@@ -39,7 +39,7 @@ public class KotlinXJsonEncoder<A>(
  */
 public class KotlinXJsonDecoder<A>(
   private val stringFormat: StringFormat,
-  private val serializer: KSerializer<A>
+  private val serializer: KSerializer<A>,
 ) : MessageDecoder<A> {
   override suspend fun decode(message: PubsubMessage): A =
     stringFormat.decodeFromString(serializer, message.data.toStringUtf8())
@@ -60,7 +60,7 @@ public suspend inline fun <reified A> GcpPublisher.publish(
   message: A,
   json: Json = Json,
   serializer: KSerializer<A> = serializer(),
-  noinline configure: PubsubMessage.Builder.() -> Unit = {}
+  noinline configure: PubsubMessage.Builder.() -> Unit = {},
 ): String = publish(topicId, message, KotlinXJsonEncoder(json, serializer, configure))
 
 /**
@@ -78,7 +78,7 @@ public suspend inline fun <reified A> GcpPublisher.publish(
   messages: Iterable<A>,
   json: Json = Json,
   serializer: KSerializer<A> = serializer(),
-  noinline configure: PubsubMessage.Builder.() -> Unit = {}
+  noinline configure: PubsubMessage.Builder.() -> Unit = {},
 ): List<String> = publish(topicId, messages, KotlinXJsonEncoder(json, serializer, configure))
 
 /**
@@ -103,7 +103,7 @@ public suspend inline fun <reified A> GcpPublisher.publish(
  */
 public inline fun <reified A> PubsubRecord.deserialized(
   json: Json = Json,
-  serializer: KSerializer<A> = serializer()
+  serializer: KSerializer<A> = serializer(),
 ): A = json.decodeFromString(serializer, data.toStringUtf8())
 
 /**

pubsub-ktor-kotlinx-serialization-json/src/main/kotlin/io/github/nomisrev/gcp/pubsub/ktor/serialization/KotlinXSerialization.kt

@@ -49,7 +49,7 @@ public inline fun <reified A> GcpPubSubSyntax.subscribe(
   json: Json = Json,
   serializer: KSerializer<A> = serializer(),
   noinline configure: Subscriber.Builder.() -> Unit = {},
-  noinline handler: suspend (AcknowledgeableValue<A>) -> Unit
+  noinline handler: suspend (AcknowledgeableValue<A>) -> Unit,
 ): Job =
   subscriber
     .subscribe(subscriptionId) { configure() }
@@ -59,7 +59,7 @@ public inline fun <reified A> GcpPubSubSyntax.subscribe(
           handler(
             AcknowledgeableValue(
               json.decodeFromString(serializer, record.message.data.toStringUtf8()),
-              record
+              record,
             )
           )
         )
@@ -75,5 +75,5 @@ public inline fun <reified A> GcpPubSubSyntax.subscribeDeserialized(
   json: Json = Json,
   serializer: KSerializer<A> = serializer(),
   noinline configure: Subscriber.Builder.() -> Unit = {},
-  noinline handler: suspend (AcknowledgeableValue<A>) -> Unit
+  noinline handler: suspend (AcknowledgeableValue<A>) -> Unit,
 ): Job = subscribe(subscriptionId, concurrency, context, json, serializer, configure, handler)

pubsub-ktor/src/main/kotlin/io/github/nomisrev/gcp/pubsub/ktor/GcpPubSub.kt

@@ -15,15 +15,14 @@ import io.github.nomisrev.gcp.pubsub.PubsubRecord
 import io.github.nomisrev.gcp.pubsub.SubscriptionId
 import io.github.nomisrev.gcp.pubsub.TopicId
 import io.ktor.server.application.Application
-import io.ktor.server.application.ApplicationCall
 import io.ktor.server.application.ApplicationStopped
 import io.ktor.server.application.BaseApplicationPlugin
 import io.ktor.server.application.application
 import io.ktor.server.application.install
 import io.ktor.server.application.pluginOrNull
+import io.ktor.server.routing.RoutingContext
 import io.ktor.util.AttributeKey
-import io.ktor.util.KtorDsl
-import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.KtorDsl
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
@@ -74,7 +73,7 @@ public class GcpPubSub(internal val application: Application, configuration: Con
                   this@GcpPubSub.credentialsProvider?.let { setCredentialsProvider(it) }
                 }
                 .build()
-            )
+            ),
           )
           .also { admin ->
             application.environment.monitor.subscribe(ApplicationStopped) { admin.close() }
@@ -108,7 +107,7 @@ public class GcpPubSub(internal val application: Application, configuration: Con
         concurrency: Int,
         context: CoroutineContext,
         configure: Subscriber.Builder.() -> Unit,
-        handler: suspend (PubsubRecord) -> Unit
+        handler: suspend (PubsubRecord) -> Unit,
       ): Job =
         subscriber
           .subscribe(subscriptionId) { configure() }
@@ -192,7 +191,7 @@ public class GcpPubSub(internal val application: Application, configuration: Con
 
     public override fun install(
       pipeline: Application,
-      configure: Configuration.() -> Unit
+      configure: Configuration.() -> Unit,
     ): GcpPubSub = GcpPubSub(pipeline, Configuration().apply(configure))
   }
 }
@@ -221,7 +220,7 @@ public class GcpPubSub(internal val application: Application, configuration: Con
  */
 public fun Application.pubSub(
   projectId: ProjectId,
-  block: suspend GcpPubSubSyntax.() -> Unit
+  block: suspend GcpPubSubSyntax.() -> Unit,
 ): Job {
   val plugin = pubSub()
   return launch { block(plugin.gcpPubSub(projectId, this)) }
@@ -248,6 +247,6 @@ public fun Application.pubSub(
  *   }
  * ```
  */
-public fun PipelineContext<Unit, ApplicationCall>.pubSub(): GcpPubSub = application.pubSub()
+public fun RoutingContext.pubSub(): GcpPubSub = call.application.pubSub()
 
 private fun Application.pubSub(): GcpPubSub = pluginOrNull(GcpPubSub) ?: install(GcpPubSub)

pubsub-ktor/src/main/kotlin/io/github/nomisrev/gcp/pubsub/ktor/GcpPubSubSyntax.kt

@@ -45,6 +45,6 @@ public interface GcpPubSubSyntax : GcpPubsSubAdmin, GcpPublisher, CoroutineScope
     concurrency: Int = DEFAULT_CONCURRENCY,
     context: CoroutineContext = Dispatchers.Default,
     configure: Subscriber.Builder.() -> Unit = {},
-    handler: suspend (PubsubRecord) -> Unit
+    handler: suspend (PubsubRecord) -> Unit,
   ): Job
 }

pubsub-test/src/main/kotlin/io/github/nomisrev/gcp/pubsub/test/PubSubEmulator.kt

@@ -36,7 +36,7 @@ import org.testcontainers.utility.DockerImageName
 public class PubSubEmulator(
   imageName: DockerImageName =
     DockerImageName.parse("gcr.io/google.com/cloudsdktool/cloud-sdk:316.0.0-emulators"),
-  private val credentials: CredentialsProvider = NoCredentialsProvider.create()
+  private val credentials: CredentialsProvider = NoCredentialsProvider.create(),
 ) : ExternalResource(), Startable, AutoCloseable, BaseApplicationPlugin<Application, Unit, Unit> {
 
   override val key: AttributeKey<Unit> = AttributeKey("PubSubEmulatorExtension")
@@ -86,7 +86,7 @@ public class PubSubEmulator(
   /** Create [TopicAdminSettings] that is by default linked to test channel. */
   public fun topicAdminSettings(
     transportChannelProvider: TransportChannelProvider = channel,
-    credentialsProvider: CredentialsProvider = credentials
+    credentialsProvider: CredentialsProvider = credentials,
   ): TopicAdminSettings =
     TopicAdminSettings.newBuilder()
       .setTransportChannelProvider(transportChannelProvider)
@@ -96,7 +96,7 @@ public class PubSubEmulator(
   /** Create [SubscriptionAdminSettings] that is by default linked to test channel. */
   public fun subscriptionAdminSettings(
     transportChannelProvider: TransportChannelProvider = channel,
-    credentialsProvider: CredentialsProvider = credentials
+    credentialsProvider: CredentialsProvider = credentials,
   ): SubscriptionAdminSettings =
     SubscriptionAdminSettings.newBuilder()
       .setTransportChannelProvider(transportChannelProvider)
@@ -112,7 +112,7 @@ public class PubSubEmulator(
 
   public fun subscriber(
     projectId: ProjectId,
-    configure: Subscriber.Builder.(subscriptionId: SubscriptionId) -> Unit = {}
+    configure: Subscriber.Builder.(subscriptionId: SubscriptionId) -> Unit = {},
   ): GcpSubscriber =
     GcpSubscriber(projectId) {
       configure(it)
@@ -122,7 +122,7 @@ public class PubSubEmulator(
 
   public fun publisher(
     projectId: ProjectId,
-    configure: Publisher.Builder.(topicId: TopicId) -> Unit = {}
+    configure: Publisher.Builder.(topicId: TopicId) -> Unit = {},
   ): GcpPublisher =
     GcpPublisher(projectId) {
       configure(it)
@@ -144,7 +144,7 @@ public class PubSubEmulator(
           .setTransportChannelProvider(channel)
           .setCredentialsProvider(credentials)
           .build()
-      )
+      ),
     )
 
   override fun before() {

pubsub/src/main/kotlin/io/github/nomisrev/gcp/pubsub/GcpPublisher.kt

@@ -14,7 +14,7 @@ public interface MessageEncoder<A> {
 
 public fun GcpPublisher(
   projectId: ProjectId,
-  configure: Publisher.Builder.(topicId: TopicId) -> Unit = {}
+  configure: Publisher.Builder.(topicId: TopicId) -> Unit = {},
 ): GcpPublisher = DefaultGcpPublisher(projectId, configure)
 
 public interface GcpPublisher : AutoCloseable {
@@ -25,43 +25,43 @@ public interface GcpPublisher : AutoCloseable {
   public suspend fun <A> publish(
     topicId: TopicId,
     messages: Iterable<A>,
-    encoder: MessageEncoder<A>
+    encoder: MessageEncoder<A>,
   ): List<String> = publish(topicId, messages.map { encoder.encode(it) })
 
   public suspend fun publish(
     topicId: TopicId,
     message: ByteString,
-    configure: PubsubMessage.Builder.() -> Unit = {}
+    configure: PubsubMessage.Builder.() -> Unit = {},
   ): String = publish(topicId, PubsubMessage.newBuilder().setData(message).apply(configure).build())
 
   public suspend fun publish(
     topicId: TopicId,
     message: String,
-    configure: PubsubMessage.Builder.() -> Unit = {}
+    configure: PubsubMessage.Builder.() -> Unit = {},
   ): String =
     publish(
       topicId,
-      PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8(message)).apply(configure).build()
+      PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8(message)).apply(configure).build(),
     )
 
   public suspend fun publish(
     topicId: TopicId,
     message: ByteBuffer,
-    configure: PubsubMessage.Builder.() -> Unit = {}
+    configure: PubsubMessage.Builder.() -> Unit = {},
   ): String =
     publish(
       topicId,
-      PubsubMessage.newBuilder().setData(ByteString.copyFrom(message)).apply(configure).build()
+      PubsubMessage.newBuilder().setData(ByteString.copyFrom(message)).apply(configure).build(),
     )
 
   public suspend fun publish(
     topicId: TopicId,
     message: ByteArray,
-    configure: PubsubMessage.Builder.() -> Unit = {}
+    configure: PubsubMessage.Builder.() -> Unit = {},
   ): String =
     publish(
       topicId,
-      PubsubMessage.newBuilder().setData(ByteString.copyFrom(message)).apply(configure).build()
+      PubsubMessage.newBuilder().setData(ByteString.copyFrom(message)).apply(configure).build(),
     )
 
   public suspend fun <A> publish(topicId: TopicId, message: A, encoder: MessageEncoder<A>): String =
@@ -72,52 +72,52 @@ public interface GcpPublisher : AutoCloseable {
 public suspend fun GcpPublisher.publish(
   topicId: TopicId,
   messages: Iterable<ByteString>,
-  configure: PubsubMessage.Builder.() -> Unit = {}
+  configure: PubsubMessage.Builder.() -> Unit = {},
 ): List<String> =
   publish(topicId, messages.map { PubsubMessage.newBuilder().setData(it).apply(configure).build() })
 
 @JvmName("publishString")
 public suspend fun GcpPublisher.publish(
   topicId: TopicId,
   messages: Iterable<String>,
-  configure: PubsubMessage.Builder.() -> Unit = {}
+  configure: PubsubMessage.Builder.() -> Unit = {},
 ): List<String> =
   publish(
     topicId,
     messages.map {
       PubsubMessage.newBuilder().setData(ByteString.copyFromUtf8(it)).apply(configure).build()
-    }
+    },
   )
 
 @JvmName("publishByteBuffer")
 public suspend fun GcpPublisher.publish(
   topicId: TopicId,
   messages: Iterable<ByteBuffer>,
-  configure: PubsubMessage.Builder.() -> Unit = {}
+  configure: PubsubMessage.Builder.() -> Unit = {},
 ): List<String> =
   publish(
     topicId,
     messages.map {
       PubsubMessage.newBuilder().setData(ByteString.copyFrom(it)).apply(configure).build()
-    }
+    },
   )
 
 @JvmName("publishByteArray")
 public suspend fun GcpPublisher.publish(
   topicId: TopicId,
   messages: Iterable<ByteArray>,
-  configure: PubsubMessage.Builder.() -> Unit = {}
+  configure: PubsubMessage.Builder.() -> Unit = {},
 ): List<String> =
   publish(
     topicId,
     messages.map {
       PubsubMessage.newBuilder().setData(ByteString.copyFrom(it)).apply(configure).build()
-    }
+    },
   )
 
 private class DefaultGcpPublisher(
   val projectId: ProjectId,
-  val configure: Publisher.Builder.(topicId: TopicId) -> Unit
+  val configure: Publisher.Builder.(topicId: TopicId) -> Unit,
 ) : GcpPublisher {
   val publisherCache = ConcurrentHashMap<TopicId, Publisher>()
 

pubsub/src/main/kotlin/io/github/nomisrev/gcp/pubsub/GcpPubsSubAdmin.kt

@@ -22,7 +22,7 @@ import io.github.nomisrev.gcp.core.await
 public fun GcpPubsSubAdmin(
   projectId: ProjectId,
   configureSubscriptionAdmin: SubscriptionAdminSettings.Builder.() -> Unit,
-  configureTopicAdmin: TopicAdminSettings.Builder.() -> Unit
+  configureTopicAdmin: TopicAdminSettings.Builder.() -> Unit,
 ): GcpPubsSubAdmin {
   val topicAdminClient =
     TopicAdminClient.create(TopicAdminSettings.newBuilder().apply(configureTopicAdmin).build())
@@ -99,7 +99,7 @@ public interface GcpPubsSubAdmin : AutoCloseable {
   public suspend fun createSubscription(
     subscriptionId: SubscriptionId,
     topicId: TopicId,
-    configure: Subscription.Builder.() -> Unit = {}
+    configure: Subscription.Builder.() -> Unit = {},
   ): Subscription
 
   /** Throws [NotFoundException] when subscription not found */
@@ -120,7 +120,7 @@ public interface GcpPubsSubAdmin : AutoCloseable {
 private class DefaultPubSubAdmin(
   val projectId: ProjectId,
   val topicAdminClient: TopicAdminClient,
-  val subscriptionAdminClient: SubscriptionAdminClient
+  val subscriptionAdminClient: SubscriptionAdminClient,
 ) : GcpPubsSubAdmin {
 
   override suspend fun createTopic(topicId: TopicId): Topic {
@@ -162,7 +162,7 @@ private class DefaultPubSubAdmin(
   override suspend fun createSubscription(
     subscriptionId: SubscriptionId,
     topicId: TopicId,
-    configure: Subscription.Builder.() -> Unit
+    configure: Subscription.Builder.() -> Unit,
   ): Subscription =
     subscriptionAdminClient
       .createSubscriptionCallable()