H2 Database (#660)

tiagohm · Oct 18, 2024 · d74cffa · d74cffa
2 parents e558c86 + b053250
commit d74cffa
Show file tree

Hide file tree

Showing 73 changed files with 891 additions and 884 deletions.
diff --git a/.gitignore b/.gitignore
@@ -182,11 +182,6 @@ gradle-app.setting
 ### Gradle Cache ###
 .cache
 
-### ObjectBox ###
-objectbox*.dll
-libobjectbox*.so
-libobjectbox*.dylib
-
 ### Kotlin ###
 .kotlin
 

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -2,8 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     kotlin("jvm")
-    kotlin("kapt")
-    id("io.objectbox")
     id("com.gradleup.shadow")
 }
 
@@ -40,7 +38,9 @@ dependencies {
     implementation(libs.javalin)
     implementation(libs.koin)
     implementation(libs.airline)
-
+    implementation(libs.h2)
+    implementation(libs.bundles.exposed)
+    implementation(libs.flyway)
     testImplementation(project(":nebulosa-astrobin-api"))
     testImplementation(project(":nebulosa-skycatalog-stellarium"))
     testImplementation(project(":nebulosa-test"))
@@ -56,10 +56,3 @@ tasks.withType<ShadowJar> {
         attributes["Main-Class"] = "nebulosa.api.MainKt"
     }
 }
-
-kapt {
-    arguments {
-        arg("objectbox.modelPath", "$projectDir/schemas/objectbox.json")
-        arg("objectbox.myObjectBoxPackage", "nebulosa.api.database")
-    }
-}
diff --git a/api/schemas/.gitignore b/api/schemas/.gitignore
diff --git a/api/schemas/objectbox.json b/api/schemas/objectbox.json
diff --git a/api/src/main/kotlin/nebulosa/api/Nebulosa.kt b/api/src/main/kotlin/nebulosa/api/Nebulosa.kt
@@ -13,13 +13,16 @@ import io.javalin.http.HttpStatus.BAD_REQUEST
 import io.javalin.json.JavalinJackson
 import nebulosa.api.converters.DeviceModule
 import nebulosa.api.core.ErrorResponse
+import nebulosa.api.database.MainDatabaseMigrator
+import nebulosa.api.database.SkyDatabaseMigrator
 import nebulosa.api.inject.*
 import nebulosa.json.PathModule
 import nebulosa.log.i
 import nebulosa.log.loggerFor
 import org.koin.core.context.startKoin
 import org.slf4j.LoggerFactory
 import java.net.ConnectException
+import java.util.concurrent.ExecutorService
 
 @Command(name = "nebulosa")
 class Nebulosa : Runnable, AutoCloseable {
@@ -65,6 +68,12 @@ class Nebulosa : Runnable, AutoCloseable {
         startKoin(koinApp)
 
         LOG.i("server is started at port: {}", app.port())
+
+        with(koinApp.koin) {
+            val executor = get<ExecutorService>()
+            executor.submit(get<MainDatabaseMigrator>())
+            executor.submit(get<SkyDatabaseMigrator>())
+        }
     }
 
     private fun handleException(ex: Exception, ctx: Context) {

diff --git a/api/src/main/kotlin/nebulosa/api/atlas/IERSUpdateTask.kt b/api/src/main/kotlin/nebulosa/api/atlas/IERSUpdateTask.kt
@@ -1,6 +1,7 @@
 package nebulosa.api.atlas
 
 import io.javalin.http.Header
+import nebulosa.api.database.MainDatabaseMigrator
 import nebulosa.api.preference.PreferenceService
 import nebulosa.io.transferAndClose
 import nebulosa.log.d
@@ -13,6 +14,8 @@ import nebulosa.time.IERSAB
 import nebulosa.time.IERSB
 import okhttp3.OkHttpClient
 import okhttp3.Request
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import java.nio.file.Path
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
@@ -24,13 +27,15 @@ class IERSUpdateTask(
     private val httpClient: OkHttpClient,
     private val preferenceService: PreferenceService,
     scheduledExecutorService: ScheduledExecutorService,
-) : Runnable {
+) : Runnable, KoinComponent {
 
     init {
-        scheduledExecutorService.schedule(this, 0L, TimeUnit.SECONDS)
+        scheduledExecutorService.schedule(this, 5L, TimeUnit.SECONDS)
     }
 
     override fun run() {
+        get<MainDatabaseMigrator>().await()
+
         val iersa = IERSA()
         val iersb = IERSB()
 

diff --git a/api/src/main/kotlin/nebulosa/api/atlas/LibWCSDownloadTask.kt b/api/src/main/kotlin/nebulosa/api/atlas/LibWCSDownloadTask.kt
@@ -1,6 +1,7 @@
 package nebulosa.api.atlas
 
 import com.sun.jna.Platform
+import nebulosa.api.database.MainDatabaseMigrator
 import nebulosa.api.preference.PreferenceService
 import nebulosa.io.transferAndCloseOutput
 import nebulosa.log.e
@@ -10,6 +11,8 @@ import nebulosa.wcs.LibWCS
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.apache.commons.codec.digest.DigestUtils
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
 import java.nio.file.Path
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
@@ -22,13 +25,15 @@ class LibWCSDownloadTask(
     private val httpClient: OkHttpClient,
     private val preferenceService: PreferenceService,
     scheduledExecutorService: ScheduledExecutorService,
-) : Runnable {
+) : Runnable, KoinComponent {
 
     init {
         scheduledExecutorService.schedule(this, 5L, TimeUnit.SECONDS)
     }
 
     override fun run() {
+        get<MainDatabaseMigrator>().await()
+
         var request = Request.Builder().get().url(VERSION_URL).build()
 
         val libraryUrl = LIBRARY_URLS[Platform.RESOURCE_PREFIX]