-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace companion object serializers (#869)
* Update serializer for DiscordShard The companion object is no longer the serializer and the implementation was changed to work with IntArray instead of JsonArray. * Update serializer for Heartbeat The companion object is no longer the serializer. * Update serializer for OpCode The companion object is no longer the serializer.
- Loading branch information
1 parent
1b95322
commit d918920
Showing
5 changed files
with
98 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,54 @@ | ||
| package dev.kord.common.entity | ||
|
|
||
| import kotlinx.serialization.* | ||
| import kotlinx.serialization.descriptors.* | ||
| import kotlinx.serialization.ExperimentalSerializationApi | ||
| import kotlinx.serialization.KSerializer | ||
| import kotlinx.serialization.Serializable | ||
| import kotlinx.serialization.SerializationException | ||
| import kotlinx.serialization.builtins.IntArraySerializer | ||
| import kotlinx.serialization.descriptors.SerialDescriptor | ||
| import kotlinx.serialization.encoding.Decoder | ||
| import kotlinx.serialization.encoding.Encoder | ||
| import kotlinx.serialization.json.* | ||
| import kotlin.jvm.JvmField | ||
|
|
||
| /** | ||
| * An instance of a [Discord shard](https://discord.com/developers/docs/topics/gateway#sharding). | ||
| */ | ||
| @Serializable(with = DiscordShard.Companion::class) | ||
| @Serializable(with = DiscordShard.Serializer::class) | ||
| public data class DiscordShard(val index: Int, val count: Int) { | ||
|
|
||
| public companion object : KSerializer<DiscordShard> { | ||
|
|
||
| internal object Serializer : KSerializer<DiscordShard> { | ||
| @OptIn(ExperimentalSerializationApi::class) | ||
| override val descriptor: SerialDescriptor | ||
| get() = listSerialDescriptor(PrimitiveSerialDescriptor("DiscordShardElement", PrimitiveKind.INT)) | ||
| override val descriptor = | ||
| SerialDescriptor("dev.kord.common.entity.DiscordShard", original = IntArraySerializer().descriptor) | ||
|
|
||
| override fun serialize(encoder: Encoder, value: DiscordShard) { | ||
| val array = buildJsonArray { | ||
| add(JsonPrimitive(value.index)) | ||
| add(JsonPrimitive(value.count)) | ||
| } | ||
|
|
||
| encoder.encodeSerializableValue(JsonArray.serializer(), array) | ||
| val array = intArrayOf(value.index, value.count) | ||
| encoder.encodeSerializableValue(IntArraySerializer(), array) | ||
| } | ||
|
|
||
| override fun deserialize(decoder: Decoder): DiscordShard { | ||
| val array = JsonArray.serializer().deserialize(decoder) | ||
| val index = array[0].jsonPrimitive.int | ||
| val count = array[1].jsonPrimitive.int | ||
| return DiscordShard(index, count) | ||
| val array = decoder.decodeSerializableValue(IntArraySerializer()) | ||
| if (array.size != 2) throw SerializationException("Expected IntArray with exactly two elements") | ||
| return DiscordShard(index = array[0], count = array[1]) | ||
| } | ||
| } | ||
|
|
||
| public companion object NewCompanion { | ||
| @Suppress("DEPRECATION") | ||
| @Deprecated( | ||
| "Renamed to 'NewCompanion', which no longer implements 'KSerializer<DiscordShard>'.", | ||
| ReplaceWith("DiscordShard.serializer()", imports = ["dev.kord.common.entity.DiscordShard"]), | ||
| DeprecationLevel.WARNING, | ||
| ) | ||
| @JvmField | ||
| public val Companion: Companion = Companion() | ||
| } | ||
|
|
||
| @Deprecated( | ||
| "Renamed to 'NewCompanion', which no longer implements 'KSerializer<DiscordShard>'.", | ||
| ReplaceWith("DiscordShard.serializer()", imports = ["dev.kord.common.entity.DiscordShard"]), | ||
| DeprecationLevel.WARNING, | ||
| ) | ||
| public class Companion internal constructor() : KSerializer<DiscordShard> by Serializer { | ||
| public fun serializer(): KSerializer<DiscordShard> = this | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters