refactor!: Upgrade dependencies to Exposed v1.3.0, Kotlin v2.3.0

.gitignore

@@ -5,10 +5,7 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/
 *.iws
 *.iml
 *.ipr

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
-kotlin = "2.1.20"
+kotlin = "2.3.0"
 kotlinxDatetime = "0.6.1"
 kotlinxSerialization = "1.7.3"
 kotlinxCoroutines = "1.10.2"
 kurrentClient = "1.0.1"
 orgReactiveStream = "1.0.4"
 mongoDriver = "5.5.0"
-testContainers = "1.21.4"
-exposed = "0.59.0"
-postgresql = "42.7.3"
+testContainers = "1.21.0"
+exposed = "1.3.0"
+postgresql = "42.7.11"
 slf4j = "2.0.9"
 redisson = "3.52.0"
 

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedCheckpointStorage.kt

@@ -3,8 +3,11 @@ package dev.helight.krescent.exposed
 import dev.helight.krescent.checkpoint.CheckpointBucket
 import dev.helight.krescent.checkpoint.CheckpointStorage
 import dev.helight.krescent.checkpoint.StoredCheckpoint
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import kotlinx.datetime.toDeprecatedInstant
+import kotlinx.datetime.toStdlibInstant
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.*
+import kotlin.time.ExperimentalTime
 
 class ExposedCheckpointStorage(
     val database: Database,
@@ -15,23 +18,25 @@ class ExposedCheckpointStorage(
         table.create(database)
     }
 
+    @OptIn(ExperimentalTime::class)
     override suspend fun storeCheckpoint(checkpoint: StoredCheckpoint): Unit = jdbcSuspendTransaction(database) {
         table.upsert(keys = arrayOf(table.namespace)) {
             it[namespace] = checkpoint.namespace
             it[position] = checkpoint.position
-            it[timestamp] = checkpoint.timestamp
+            it[timestamp] = checkpoint.timestamp.toStdlibInstant()
             it[version] = checkpoint.version
             it[data] = checkpoint.data.encodeToByteArray()
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     override suspend fun getLatestCheckpoint(namespace: String): StoredCheckpoint? = jdbcSuspendTransaction(database) {
         table.selectAll().where { table.namespace eq namespace }.firstOrNull()?.let {
             StoredCheckpoint(
                 namespace = it[table.namespace],
                 position = it[table.position],
                 version = it[table.version],
-                timestamp = it[table.timestamp],
+                timestamp = it[table.timestamp].toDeprecatedInstant(),
                 data = CheckpointBucket.fromByteArray(it[table.data])
             )
         }

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedEventPublisher.kt

@@ -2,24 +2,26 @@ package dev.helight.krescent.exposed
 
 import dev.helight.krescent.event.EventMessage
 import dev.helight.krescent.source.EventPublisher
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.insert
-import java.util.*
+import kotlinx.datetime.toStdlibInstant
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.insert
 import kotlin.time.ExperimentalTime
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 class ExposedEventPublisher(
     val database: Database,
     val streamId: String,
     val table: KrescentEventLogTable = KrescentEventLogTable(),
 ) : EventPublisher {
-    @OptIn(ExperimentalTime::class)
+    @OptIn(ExperimentalTime::class, ExperimentalUuidApi::class)
     override suspend fun publish(event: EventMessage) {
         jdbcSuspendTransaction(database) {
             table.insert {
-                it[uid] = UUID.fromString(event.id)
+                it[uid] = Uuid.parse(event.id)
                 it[streamId] = this@ExposedEventPublisher.streamId
                 it[type] = event.type
-                it[timestamp] = event.timestamp
+                it[timestamp] = event.timestamp.toStdlibInstant()
                 it[data] = event.payload
             }
         }

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedEventSource.kt

@@ -5,13 +5,21 @@ import dev.helight.krescent.source.StoredEventSource
 import dev.helight.krescent.source.StreamingToken
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
-import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.sql.SqlExpressionBuilder.regexp
-import org.jetbrains.exposed.sql.json.contains
+import kotlinx.datetime.toDeprecatedInstant
+import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.v1.core.regexp
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.Query
+import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.v1.json.contains
 import kotlin.math.min
 import kotlin.time.ExperimentalTime
+import kotlin.uuid.ExperimentalUuidApi
 
 @OptIn(ExperimentalTime::class)
 class ExposedEventSource(
@@ -67,12 +75,13 @@ class ExposedEventSource(
         }
     }
 
+    @OptIn(ExperimentalUuidApi::class)
     private fun mapRowToPair(row: ResultRow): Pair<EventMessage, ExposedStreamingToken> {
         val event = EventMessage(
             id = row[table.uid].toString(),
             type = row[table.type],
-            timestamp = row[table.timestamp],
-            payload = row[table.data],
+            timestamp = row[table.timestamp].toDeprecatedInstant(),
+            payload = row[table.data] ,
         )
         val token = ExposedStreamingToken.PositionToken(row[table.id].value)
         return event to token

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedStreamingToken.kt

@@ -1,9 +1,10 @@
 package dev.helight.krescent.exposed
 
 import dev.helight.krescent.source.StreamingToken
-import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.sql.selectAll
+import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.v1.jdbc.Query
+import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.v1.jdbc.selectAll
 
 sealed class ExposedStreamingToken : StreamingToken<ExposedStreamingToken> {
 

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/ExposedTableProjector.kt

@@ -13,7 +13,11 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
-import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.v1.core.Table
+import org.jetbrains.exposed.v1.core.Transaction
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.SchemaUtils
+import org.jetbrains.exposed.v1.jdbc.exists
 import java.util.logging.Logger
 
 class ExposedTableProjector(

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/KrescentEventLogTable.kt

@@ -4,22 +4,27 @@ package dev.helight.krescent.exposed
 
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
-import org.jetbrains.exposed.dao.id.LongIdTable
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.SchemaUtils
-import org.jetbrains.exposed.sql.Table
-import org.jetbrains.exposed.sql.json.json
-import org.jetbrains.exposed.sql.json.jsonb
-import org.jetbrains.exposed.sql.kotlin.datetime.KotlinInstantColumnType
-import org.jetbrains.exposed.sql.upsert
+import org.jetbrains.exposed.v1.core.Table
+import org.jetbrains.exposed.v1.core.dao.id.LongIdTable
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.datetime.KotlinInstantColumnType
+import org.jetbrains.exposed.v1.datetime.timestamp
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.SchemaUtils
+import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.v1.jdbc.upsert
+import org.jetbrains.exposed.v1.json.json
+import org.jetbrains.exposed.v1.json.jsonb
 import kotlin.time.ExperimentalTime
+import kotlin.uuid.ExperimentalUuidApi
 
 @OptIn(ExperimentalTime::class)
 class KrescentEventLogTable(tableName: String = "krescent") : LongIdTable(tableName) {
+    @OptIn(ExperimentalUuidApi::class)
     val uid = uuid("uuid").uniqueIndex()
     val streamId = text("streamId").index()
     val type = text("type").index()
-    val timestamp = registerColumn("timestamp", KotlinInstantColumnType()).index()
+    val timestamp = timestamp("timestamp").index()
 
     val data = jsonb("data", {
         Json.encodeToString(it)

krescent-exposed/src/main/kotlin/dev/helight/krescent/exposed/Utils.kt

@@ -1,10 +1,10 @@
 package dev.helight.krescent.exposed
 
 import kotlinx.coroutines.coroutineScope
-import org.jetbrains.exposed.sql.Database
-import org.jetbrains.exposed.sql.Transaction
-import org.jetbrains.exposed.sql.transactions.TransactionManager
-import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
+import org.jetbrains.exposed.v1.core.Transaction
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager
+import org.jetbrains.exposed.v1.jdbc.transactions.suspendTransaction
 
 internal suspend fun <T> jdbcSuspendTransaction(
     database: Database,
@@ -16,7 +16,7 @@ internal suspend fun <T> jdbcSuspendTransaction(
             ?.takeIf { it.db == database }
             ?.let { return@coroutineScope statement.invoke(it) }
 
-        return@coroutineScope newSuspendedTransaction(db = database) {
-            statement.invoke(this@newSuspendedTransaction)
+        return@coroutineScope suspendTransaction(db = database) {
+            statement.invoke(this@suspendTransaction)
         }
     }