change: change plugin-island configuration file from TOML to YAML

Author: tksimeji

gradle/libs.versions.toml

@@ -21,7 +21,6 @@ packetevents = "2.11.2"
 paperweight = "2.0.0-beta.19"
 postgresql = "42.7.10"
 shadow = "9.3.1"
-tomlkt = "0.6.0"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -64,4 +63,3 @@ postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql"
 # Utility
 jnoise-pipeline = { module = "de.articdive:jnoise-pipeline", version.ref = "jnoise" }
 kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kaml" }
-tomlkt = { module = "dev.eav.tomlkt:tomlkt", version.ref = "tomlkt" }

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Config.kt

@@ -0,0 +1,42 @@
+package net.azisaba.vanilife.islands
+
+import com.charleskorn.kaml.Yaml
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
+import kotlin.io.path.exists
+import kotlin.io.path.readText
+import kotlin.io.path.writeText
+
+private val defaultYaml: Yaml = Yaml.default
+
+internal fun Main.yamlConfig(yaml: Yaml = defaultYaml): Configuration {
+    val path = dataFolder.toPath().resolve("config.yml")
+    if (!path.exists()) {
+        val content = yaml.encodeToString(Configuration.serializer(), Configuration())
+        path.parent?.let { Files.createDirectories(it) }
+        path.writeText(
+            content, options = arrayOf(
+                StandardOpenOption.CREATE,
+                StandardOpenOption.TRUNCATE_EXISTING,
+                StandardOpenOption.WRITE
+            )
+        )
+    }
+    val pathContent = path.readText()
+    return yaml.decodeFromString(Configuration.serializer(), pathContent)
+}
+
+@Serializable
+internal data class Configuration(
+    val database: DatabaseConfiguration = DatabaseConfiguration(),
+)
+
+@Serializable
+internal data class DatabaseConfiguration(
+    val url: String = "jdbc:postgresql://localhost:5432/vanilife",
+    val usernameEnv: String = "DATABASE_USERNAME",
+    val passwordEnv: String = "DATABASE_PASSWORD",
+    val maxPoolSize: Int = 12,
+)

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Configuration.kt

@@ -8,14 +8,14 @@ import org.jetbrains.exposed.v1.jdbc.Database
 import org.jetbrains.exposed.v1.jdbc.SchemaUtils
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 
-internal fun Main.setupDatabase(databaseConfig: DatabaseConfig): Database {
+internal fun Main.setupDatabase(config: DatabaseConfiguration): Database {
     val hikariConfig =
         HikariConfig().apply {
-            jdbcUrl = databaseConfig.url
-            username = System.getenv(databaseConfig.usernameEnv)
-            password = System.getenv(databaseConfig.passwordEnv)
+            jdbcUrl = config.url
+            username = System.getenv(config.usernameEnv)
+            password = System.getenv(config.passwordEnv)
             driverClassName = "org.postgresql.Driver"
-            maximumPoolSize = databaseConfig.maxPoolSize
+            maximumPoolSize = config.maxPoolSize
         }
 
     val dataSource = HikariDataSource(hikariConfig)

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Database.kt

@@ -13,6 +13,7 @@ import net.azisaba.vanilife.islands.repository.IslandRepository
 import net.azisaba.vanilife.islands.wrack.WrackType
 import org.bukkit.plugin.Plugin
 import org.bukkit.plugin.java.JavaPlugin
+import org.jetbrains.exposed.v1.jdbc.Database
 import org.koin.core.KoinApplication
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
@@ -26,7 +27,7 @@ class Main : JavaPlugin() {
     }
 
     override fun onEnable() {
-        val config = tomlConfig()
+        val config = yamlConfig()
         val database = setupDatabase(config.database).setupTables()
 
         PacketEvents.getAPI().init()
@@ -38,8 +39,8 @@ class Main : JavaPlugin() {
             modules(
                 module {
                     single<Plugin> { this@Main }
-                    single { config }
-                    single { database }
+                    single<Configuration> { config }
+                    single<Database> { database }
                     single<IslandRepository> { DatabaseIslandRepository(get()) }
                     single<IslandEnchantmentRepository> { DatabaseIslandEnchantmentRepository(get()) }
                     single<IslandManager> { IslandManager(get(), get(), Vanilife.getIslandsWorld(), get()) }

plugins/plugin-islands/src/main/kotlin/net/azisaba/vanilife/islands/Main.kt

@@ -3,7 +3,6 @@ package net.azisaba.vanilife.npc
 import com.charleskorn.kaml.Yaml
 import kotlinx.serialization.Serializable
 import net.azisaba.vanilife.npc.spawn.NpcNaturalSpawner
-import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 import kotlin.io.path.createDirectories
 import kotlin.io.path.exists
@@ -13,13 +12,12 @@ import kotlin.io.path.writeText
 private val defaultYaml: Yaml = Yaml.default
 
 internal fun Main.yamlConfig(yaml: Yaml = defaultYaml): Configuration {
-    val path = dataFolder.toPath().resolve("config.yaml")
+    val path = dataFolder.toPath().resolve("config.yml")
     if (!path.exists()) {
         val content = yaml.encodeToString(Configuration.serializer(), Configuration())
         path.parent?.createDirectories()
         path.writeText(
-            content,
-            options = arrayOf(
+            content, options = arrayOf(
                 StandardOpenOption.CREATE,
                 StandardOpenOption.TRUNCATE_EXISTING,
                 StandardOpenOption.WRITE,

plugins/plugin-npc/src/main/kotlin/net/azisaba/vanilife/npc/Configuration.kt

@@ -17,5 +17,4 @@ dependencies {
     api(libs.packed.server)
     api(libs.packetevents)
     api(libs.postgresql)
-    api(libs.tomlkt)
 }