Move json loaders into Ark companion

UnitTestBot · Jun 3, 2024 · 77696ff · 77696ff
1 parent 01ce4ee
commit 77696ff
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 40 deletions.
diff --git a/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/Ark.kt b/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/Ark.kt
@@ -16,7 +16,12 @@
 
 package org.jacodb.panda.dynamic.ark.dto
 
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import java.io.InputStream
 
 @Serializable
 data class Ark(
@@ -28,7 +33,23 @@ data class Ark(
     val classes: List<Class>,
     val importInfos: List<ImportInfo>,
     val exportInfos: List<ExportInfo>,
-)
+) {
+    companion object{
+        private val json = Json {
+            classDiscriminator = "_"
+            prettyPrint = true
+        }
+
+        fun loadFromJson(jsonString: String): Ark {
+            return json.decodeFromString(jsonString)
+        }
+
+        @OptIn(ExperimentalSerializationApi::class)
+        fun loadFromJson(stream: InputStream): Ark {
+            return json.decodeFromStream(stream)
+        }
+    }
+}
 
 @Serializable
 data class Namespace(

diff --git a/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/io.kt b/jacodb-panda-dynamic/src/main/kotlin/org/jacodb/panda/dynamic/ark/dto/io.kt
diff --git a/jacodb-panda-dynamic/src/test/kotlin/ark/ArkFromJsonTest.kt b/jacodb-panda-dynamic/src/test/kotlin/ark/ArkFromJsonTest.kt
@@ -16,7 +16,7 @@
 
 package ark
 
-import org.jacodb.panda.dynamic.ark.dto.loadArkFromJson
+import org.jacodb.panda.dynamic.ark.dto.Ark
 import org.junit.jupiter.api.Test
 
 class ArkFromJsonTest {
@@ -25,7 +25,7 @@ class ArkFromJsonTest {
         val path = "basic.ts.json"
         val stream = object {}::class.java.getResourceAsStream("/$path")
             ?: error("Resource not found: $path")
-        val ark = loadArkFromJson(stream)
+        val ark = Ark.loadFromJson(stream)
         println(ark)
     }
 }