chore: code cleanup

DarkAtra · Jul 6, 2024 · 3c0846d · 3c0846d
1 parent 3c37daf
commit 3c0846d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/main/kotlin/de/darkatra/vrising/discord/persistence/DatabaseConfiguration.kt b/src/main/kotlin/de/darkatra/vrising/discord/persistence/DatabaseConfiguration.kt
@@ -13,7 +13,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import java.nio.file.Path
-import kotlin.io.path.absolutePathString
 
 @Configuration
 @EnableConfigurationProperties(BotProperties::class)
@@ -26,7 +25,7 @@ class DatabaseConfiguration(
         fun buildNitriteDatabase(databaseFile: Path, username: String? = null, password: String? = null): Nitrite {
 
             val storeModule = MVStoreModule.withConfig()
-                .filePath(databaseFile.absolutePathString())
+                .filePath(databaseFile.toAbsolutePath().toFile())
                 .compress(true)
                 .build()
 

diff --git a/src/test/kotlin/de/darkatra/vrising/discord/DatabaseConfigurationTestUtils.kt b/src/test/kotlin/de/darkatra/vrising/discord/DatabaseConfigurationTestUtils.kt
@@ -5,25 +5,29 @@ import org.dizitart.no2.Nitrite
 import org.dizitart.no2.filters.Filter
 import org.slf4j.LoggerFactory
 import java.io.File
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.copyTo
 
 object DatabaseConfigurationTestUtils {
 
-    val DATABASE_FILE_V1_2_x = File(DatabaseConfigurationTestUtils::class.java.getResource("/persistence/v1.2.db")!!.toURI())
-    val DATABASE_FILE_V2_10_5 = File(DatabaseConfigurationTestUtils::class.java.getResource("/persistence/v2.10.5.db")!!.toURI())
+    val DATABASE_FILE_V1_2_x = File(DatabaseConfigurationTestUtils::class.java.getResource("/persistence/v1.2.db")!!.toURI()).toPath()
+    val DATABASE_FILE_V2_10_5 = File(DatabaseConfigurationTestUtils::class.java.getResource("/persistence/v2.10.5.db")!!.toURI()).toPath()
     private val logger = LoggerFactory.getLogger(javaClass)
 
-    fun getTestDatabase(fromTemplate: File? = null): Nitrite {
+    fun getTestDatabase(fromTemplate: Path? = null): Nitrite {
 
-        val databaseFile = File.createTempFile("v-rising-bot", ".db").also {
-            logger.info("Test Db location: " + it.absolutePath)
+        val databaseFile = Files.createTempFile("v-rising-bot", ".db").also {
+            logger.info("Test Db location: " + it.absolutePathString())
         }
 
         if (fromTemplate != null) {
-            logger.info("Loading template from '${fromTemplate.absolutePath}'.")
+            logger.info("Loading template from '${fromTemplate.absolutePathString()}'.")
             fromTemplate.copyTo(databaseFile, overwrite = true)
         }
 
-        return DatabaseConfiguration.buildNitriteDatabase(databaseFile.toPath())
+        return DatabaseConfiguration.buildNitriteDatabase(databaseFile)
     }
 
     fun clearDatabase(nitrite: Nitrite) {