Re-add exposed

Author: alexstaeding

api/build.gradle.kts

@@ -5,4 +5,8 @@ plugins {
 
 dependencies {
     implementation(libs.anvil.core)
+
+    compileOnlyApi(platform(libs.adventure.bom))
+    compileOnlyApi("net.kyori:adventure-text-serializer-legacy")
+    compileOnlyApi("net.kyori:adventure-text-serializer-plain")
 }

api/src/main/kotlin/org/anvilpowered/ontime/api/user/OnTimeUserRepository.kt

@@ -1,7 +1,7 @@
 package org.anvilpowered.ontime.api.user
 
 import org.anvilpowered.anvil.core.db.MutableRepository
-import org.jetbrains.exposed.sql.SizedIterable
+import org.anvilpowered.anvil.core.db.SizedIterable
 import java.util.UUID
 
 interface OnTimeUserRepository : MutableRepository<OnTimeUser, OnTimeUser.CreateDto> {

core/build.gradle.kts

@@ -1,7 +1,16 @@
 dependencies {
     api(project(":ontime-api"))
     api(libs.anvil.core)
+
+    api(platform(libs.exposed.bom))
+    api(libs.bundles.exposed) {
+        exclude(group = "org.slf4j")
+    }
+
     compileOnlyApi(libs.luckperms)
-    runtimeOnly(libs.driver.mariadb)
+
+    runtimeOnly(libs.driver.mariadb) {
+        exclude(group = "org.slf4j")
+    }
     runtimeOnly(libs.driver.postgresql)
 }

core/src/main/kotlin/org/anvilpowered/ontime/core/command/OnTimeUserCommand.kt

@@ -87,7 +87,7 @@ suspend fun CommandExecutionScope<CommandSource>.extractOnTimeUserSource(
     playerProvider: suspend () -> Player = { extractPlayerSource() },
 ): OnTimeUser {
     val player = playerProvider()
-    val user = onTimeUserRepository.getById(player.id)
+    val user = onTimeUserRepository.findById(player.id)
     if (user == null) {
         context.source.sendMessage(
             Component.text()

core/src/main/kotlin/org/anvilpowered/ontime/core/db/OnTimeUserRepositoryImpl.kt

@@ -19,13 +19,13 @@
 package org.anvilpowered.ontime.core.db
 
 import org.anvilpowered.anvil.core.db.MutableRepository
+import org.anvilpowered.anvil.core.db.SizedIterable
 import org.anvilpowered.ontime.api.user.OnTimeUser
 import org.anvilpowered.ontime.api.user.OnTimeUserRepository
 import org.anvilpowered.ontime.api.user.bonusTimeFormatted
 import org.anvilpowered.ontime.api.user.playTimeFormatted
 import org.anvilpowered.ontime.api.user.totalTimeFormatted
 import org.apache.logging.log4j.Logger
-import org.jetbrains.exposed.sql.SizedIterable
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.lowerCase
@@ -35,9 +35,7 @@ import java.time.LocalDateTime
 import java.time.ZoneId
 import java.util.UUID
 
-class OnTimeUserRepositoryImpl(
-    private val logger: Logger,
-) : OnTimeUserRepository {
+class OnTimeUserRepositoryImpl(private val logger: Logger) : OnTimeUserRepository {
     override suspend fun create(item: OnTimeUser.CreateDto): OnTimeUser = newSuspendedTransaction {
         val user = DBOnTimeUser.new(item.id) {
             username = item.username
@@ -50,7 +48,7 @@ class OnTimeUserRepositoryImpl(
     }
 
     override suspend fun put(item: OnTimeUser.CreateDto): MutableRepository.PutResult<OnTimeUser> = newSuspendedTransaction {
-        val existingUser = getById(item.id)
+        val existingUser = findById(item.id)
         if (existingUser == null) {
             // create a new OnTimeUser
             val newUser = DBOnTimeUser.new(item.id) {
@@ -74,7 +72,7 @@ class OnTimeUserRepositoryImpl(
 
     override suspend fun getAllUsernames(contains: String): SizedIterable<String> = newSuspendedTransaction {
         DBOnTimeUser.find { OnTimeUsers.username.lowerCase() like "%${contains.lowercase()}%" }.mapLazy { it.username }
-    }
+    }.wrap()
 
     override suspend fun getByUsername(username: String): OnTimeUser? = newSuspendedTransaction {
         DBOnTimeUser.find { OnTimeUsers.username eq username }.firstOrNull()
@@ -131,7 +129,7 @@ class OnTimeUserRepositoryImpl(
         DBOnTimeUser.find { OnTimeUsers.username eq username }.firstOrNull()?.setBonusTime(duration) != null
     }
 
-    override suspend fun getById(id: UUID): OnTimeUser? = newSuspendedTransaction {
+    override suspend fun findById(id: UUID): OnTimeUser? = newSuspendedTransaction {
         DBOnTimeUser.findById(id)
     }
 

core/src/main/kotlin/org/anvilpowered/ontime/core/db/SizedIterableWrapper.kt

@@ -0,0 +1,34 @@
+/*
+ *   OnTime - AnvilPowered.org
+ *   Copyright (C) 2019-2024 Contributors
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Affero General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.anvilpowered.ontime.core.db
+
+import org.anvilpowered.anvil.core.db.SizedIterable as AnvilSizedIterable
+import org.jetbrains.exposed.sql.SizedIterable as ExposedSizedIterable
+
+fun <T> ExposedSizedIterable<T>.wrap(): AnvilSizedIterable<T> = SizedIterableWrapper(this)
+
+private class SizedIterableWrapper<out T>(
+    private val delegate: ExposedSizedIterable<T>,
+) : AnvilSizedIterable<T> {
+    override fun copy(): AnvilSizedIterable<T> = SizedIterableWrapper(delegate.copy())
+    override fun count(): Long = delegate.count()
+    override fun empty(): Boolean = delegate.empty()
+    override fun iterator(): Iterator<T> = delegate.iterator()
+    override fun limit(n: Int, offset: Long): AnvilSizedIterable<T> = SizedIterableWrapper(delegate.limit(n, offset))
+}

gradle/libs.versions.toml

@@ -10,12 +10,20 @@ anvil-velocity = { module = "org.anvilpowered:anvil-velocity", version.ref = "an
 arrow-core = "io.arrow-kt:arrow-core:1.2.2"
 driver-mariadb = "org.mariadb.jdbc:mariadb-java-client:3.3.3"
 driver-postgresql = "org.postgresql:postgresql:42.7.2"
+exposed-bom = "org.jetbrains.exposed:exposed-bom:0.50.1"
+exposed-core = { module = "org.jetbrains.exposed:exposed-core" }
+exposed-dao = { module = "org.jetbrains.exposed:exposed-dao" }
+exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc" }
+exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time" }
 kotest = "io.kotest:kotest-runner-junit5-jvm:5.8.0"
 kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 luckperms = "net.luckperms:api:5.4"
 paper = "io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT"
 velocity = "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT"
 
+[bundles]
+exposed = ["exposed-core", "exposed-dao", "exposed-jdbc", "exposed-java-time"]
+
 [plugins]
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }