feat: improved codebase

Author: duruer

build.gradle.kts

@@ -74,11 +74,11 @@ tasks {
         val pluginDependencies: String by project
 
         manifest {
-            attributes["Plugin-Class"] = pluginClass
-            attributes["Plugin-Id"] = pluginId
-            attributes["Plugin-Version"] = version
-            attributes["Plugin-Provider"] = pluginProvider
-            attributes["Plugin-Dependencies"] = pluginDependencies
+            attributes["main-class"] = pluginClass
+            attributes["id"] = pluginId
+            attributes["version"] = version
+            attributes["developer"] = pluginProvider
+            attributes["dependencies"] = pluginDependencies
         }
 
         if (version != "unspecified") {

src/main/kotlin/co/statu/rule/database/DatabaseManager.kt

@@ -2,11 +2,9 @@ package co.statu.rule.database
 
 import co.statu.parsek.api.ParsekPlugin
 import co.statu.parsek.api.config.PluginConfigManager
-import co.statu.rule.database.api.DatabaseHelper
 import co.statu.rule.database.impl.SchemeVersionDaoImpl
 import co.statu.rule.database.model.SchemeVersion
 import io.vertx.core.Vertx
-import io.vertx.core.json.JsonObject
 import io.vertx.jdbcclient.JDBCConnectOptions
 import io.vertx.jdbcclient.JDBCPool
 import io.vertx.sqlclient.Pool
@@ -127,7 +125,6 @@ class DatabaseManager(
 
     suspend fun initialize(
         plugin: ParsekPlugin,
-        databaseHelper: DatabaseHelper? = null
     ) {
         if (this.tables[plugin] == null) {
             this.tables[plugin] = mutableListOf()
@@ -137,8 +134,8 @@ class DatabaseManager(
             this.migrations[plugin] = mutableListOf()
         }
 
-        databaseHelper?.tables?.let { this.tables[plugin]!!.addAll(it) }
-        databaseHelper?.migrations?.let { this.migrations[plugin]!!.addAll(it) }
+        this.tables[plugin] = plugin.pluginBeanContext.getBeansOfType(Dao::class.java).values.map { it as Dao }.toMutableList()
+        this.migrations[plugin] = plugin.pluginBeanContext.getBeansOfType(DatabaseMigration::class.java).values.map { it as DatabaseMigration }.toMutableList()
 
         val jdbcPool: Pool
 
@@ -155,7 +152,7 @@ class DatabaseManager(
 
         try {
             lastSchemeVersion = schemeVersionDaoImpl.getLastSchemeVersion(plugin.pluginId, jdbcPool)
-        } catch (e: BatchUpdateException) {
+        } catch (_: BatchUpdateException) {
             try {
                 if (plugin is DatabasePlugin) {
                     logger.warn("First time installing scheme version (first time app installation)")
@@ -183,9 +180,9 @@ class DatabaseManager(
         checkMigration(plugin, jdbcPool, lastSchemeVersion)
     }
 
-    suspend fun migrateNewPluginId(exPluginId: String, newPluginId: String, plugin: ParsekPlugin) {
+    suspend fun migrateNewPluginId(exPluginId: String, plugin: ParsekPlugin) {
         try {
-            schemeVersionDaoImpl.renamePluginId(exPluginId, newPluginId, getConnectionPool())
+            schemeVersionDaoImpl.renamePluginId(exPluginId, plugin.pluginId, getConnectionPool())
         } catch (e: Exception) {
             if (plugin !is DatabasePlugin) {
                 logger.error(e.message)

src/main/kotlin/co/statu/rule/database/DatabasePlugin.kt

@@ -1,9 +1,37 @@
 package co.statu.rule.database
 
+import co.statu.parsek.PluginEventManager
 import co.statu.parsek.api.ParsekPlugin
+import co.statu.parsek.api.config.PluginConfigManager
+import co.statu.rule.database.event.DatabaseEventListener
 
 class DatabasePlugin : ParsekPlugin() {
     companion object {
         internal lateinit var databaseManager: DatabaseManager
     }
+
+    override suspend fun onStart() {
+        val configManager = PluginConfigManager(this, DatabaseConfig::class.java)
+        pluginBeanContext.beanFactory.registerSingleton(PluginConfigManager::class.java.name, configManager)
+
+        logger.info("Initialized plugin config")
+
+        databaseManager =
+            pluginBeanContext.getBean(DatabaseManager::class.java)
+
+        databaseManager.migrateNewPluginId(
+            "database",
+            this
+        )
+
+        databaseManager.initialize(this)
+
+        registerSingletonGlobal(databaseManager)
+
+        val handlers = PluginEventManager.getEventListeners<DatabaseEventListener>()
+
+        handlers.forEach {
+            it.onReady(databaseManager)
+        }
+    }
 }

src/main/kotlin/co/statu/rule/database/annotation/Dao.kt

@@ -0,0 +1,10 @@
+package co.statu.rule.database.annotation
+
+import org.springframework.stereotype.Component
+
+@Target(AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@Component
+annotation class Dao(
+    val value: String = ""
+)

src/main/kotlin/co/statu/rule/database/event/CoreEventHandler.kt

@@ -3,7 +3,6 @@ package co.statu.rule.database.impl
 import co.statu.parsek.api.ParsekPlugin
 import co.statu.rule.database.dao.SchemeVersionDao
 import co.statu.rule.database.model.SchemeVersion
-import io.vertx.jdbcclient.JDBCPool
 import io.vertx.sqlclient.Pool
 import io.vertx.kotlin.coroutines.*
 import io.vertx.sqlclient.Row