Merge branch 'feature/plugin-info-deserialization' into patch/explici…

…tNulls-false
lavalink-devs · Oct 13, 2023 · 3b9dc0a · 3b9dc0a
2 parents 4589d0f + 83128ee
commit 3b9dc0a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/loadResult.kt b/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/loadResult.kt
@@ -135,7 +135,19 @@ data class Playlist(
     val info: PlaylistInfo,
     val pluginInfo: JsonObject,
     val tracks: List<Track>
-) : LoadResult.Data
+) : LoadResult.Data {
+
+    /**
+     * Deserialize the plugin info into a specific type.
+     * This method is a convenience method meant to be used in Java,
+     * since Kotlin extension methods are painful to use in Java.
+     *
+     * @param deserializer The deserializer to use. (e.g. `T.Companion.serializer()`)
+     *
+     * @return the deserialized plugin info as type T
+     */
+    fun <T> deserializePluginInfo(deserializer: DeserializationStrategy<T>): T = pluginInfo.deserialize(deserializer)
+}
 
 @Serializable
 data class Exception(

diff --git a/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt b/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt
@@ -1,10 +1,18 @@
 package dev.arbjerg.lavalink.protocol.v4
 
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.serializer
 import kotlin.jvm.JvmInline
 
-@Serializable()
+inline fun <reified T> JsonObject.deserialize(): T =
+    deserialize(json.serializersModule.serializer<T>())
+
+fun <T> JsonObject.deserialize(deserializer: DeserializationStrategy<T>): T =
+    json.decodeFromJsonElement(deserializer, this)
+
+@Serializable
 @JvmInline
 value class Players(val players: List<Player>)
 
@@ -24,7 +32,19 @@ data class Track(
     val encoded: String,
     val info: TrackInfo,
     val pluginInfo: JsonObject
-) : LoadResult.Data
+) : LoadResult.Data {
+
+    /**
+     * Deserialize the plugin info into a specific type.
+     * This method is a convenience method meant to be used in Java,
+     * since Kotlin extension methods are painful to use in Java.
+     *
+     * @param deserializer The deserializer to use. (e.g. `T.Companion.serializer()`)
+     *
+     * @return the deserialized plugin info as type T
+     */
+    fun <T> deserializePluginInfo(deserializer: DeserializationStrategy<T>): T = pluginInfo.deserialize(deserializer)
+}
 
 @Serializable
 @JvmInline

diff --git a/protocol/src/commonTest/kotlin/LoadResultSerializerTest.kt b/protocol/src/commonTest/kotlin/LoadResultSerializerTest.kt
@@ -1,6 +1,7 @@
 import dev.arbjerg.lavalink.protocol.v4.Exception
 import dev.arbjerg.lavalink.protocol.v4.LoadResult
 import dev.arbjerg.lavalink.protocol.v4.ResultStatus
+import kotlinx.serialization.json.JsonObject
 import kotlin.js.JsName
 import kotlin.test.Test
 import kotlin.test.assertIs