Skip to content

Commit fead2d0

Browse files
committed
feat: improved codebase
1 parent ce5ab22 commit fead2d0

4 files changed

Lines changed: 23 additions & 26 deletions

File tree

build.gradle.kts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ version =
1616
val pf4jVersion: String by project
1717
val vertxVersion: String by project
1818
val handlebarsVersion: String by project
19+
val springContextVersion: String by project
1920
val bootstrap = (project.findProperty("bootstrap") as String?)?.toBoolean() ?: false
2021
val pluginsDir: File? by rootProject.extra
2122

@@ -40,6 +41,9 @@ dependencies {
4041
compileOnly("io.vertx:vertx-lang-kotlin:$vertxVersion")
4142
compileOnly("io.vertx:vertx-lang-kotlin-coroutines:$vertxVersion")
4243
compileOnly("io.vertx:vertx-jdbc-client:$vertxVersion")
44+
45+
// https://mvnrepository.com/artifact/org.springframework/spring-context
46+
compileOnly("org.springframework:spring-context:$springContextVersion")
4347
}
4448

4549
tasks {
@@ -57,11 +61,11 @@ tasks {
5761
val pluginDependencies: String by project
5862

5963
manifest {
60-
attributes["Plugin-Class"] = pluginClass
61-
attributes["Plugin-Id"] = pluginId
62-
attributes["Plugin-Version"] = version
63-
attributes["Plugin-Provider"] = pluginProvider
64-
attributes["Plugin-Dependencies"] = pluginDependencies
64+
attributes["main-class"] = pluginClass
65+
attributes["id"] = pluginId
66+
attributes["version"] = version
67+
attributes["developer"] = pluginProvider
68+
attributes["dependencies"] = pluginDependencies
6569
}
6670

6771
if (version != "unspecified") {
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package co.statu.rule.systemProperty
22

33
import co.statu.parsek.api.ParsekPlugin
4-
import co.statu.rule.database.Dao
5-
import co.statu.rule.database.DatabaseMigration
6-
import co.statu.rule.database.api.DatabaseHelper
7-
import co.statu.rule.systemProperty.db.impl.SystemPropertyDaoImpl
4+
import co.statu.rule.database.DatabaseManager
5+
import org.springframework.beans.factory.getBean
86

9-
class SystemPropertyPlugin : ParsekPlugin(), DatabaseHelper {
10-
override val tables: List<Dao<*>> = listOf(SystemPropertyDaoImpl())
7+
class SystemPropertyPlugin : ParsekPlugin() {
8+
override suspend fun onStart() {
9+
val databaseManager = pluginGlobalBeanContext.beanFactory.getBean<DatabaseManager>()
1110

12-
override val migrations: List<DatabaseMigration> = listOf()
11+
databaseManager.initialize(this)
12+
}
1313
}
1414

src/main/kotlin/co/statu/rule/systemProperty/db/impl/SystemPropertyDaoImpl.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
package co.statu.rule.systemProperty.db.impl
22

33
import co.statu.parsek.api.ParsekPlugin
4+
import co.statu.rule.database.annotation.Dao
45
import co.statu.rule.systemProperty.SystemPropertyDefaults
56
import co.statu.rule.systemProperty.db.dao.SystemPropertyDao
67
import co.statu.rule.systemProperty.db.model.SystemProperty
7-
import io.vertx.jdbcclient.JDBCPool
88
import io.vertx.sqlclient.Pool
99
import io.vertx.kotlin.coroutines.*
1010
import io.vertx.sqlclient.Row
1111
import io.vertx.sqlclient.RowSet
1212
import io.vertx.sqlclient.Tuple
13+
import org.springframework.beans.factory.config.ConfigurableBeanFactory
14+
import org.springframework.context.annotation.Lazy
15+
import org.springframework.context.annotation.Scope
1316

17+
@Dao
18+
@Lazy
19+
@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
1420
class SystemPropertyDaoImpl : SystemPropertyDao() {
1521

1622
override suspend fun init(jdbcPool: Pool, plugin: ParsekPlugin) {

src/main/kotlin/co/statu/rule/systemProperty/event/DatabaseEventHandler.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)