Skip to content

Change ErrorCodeSerializer descriptor kind #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 26, 2025
Merged

Change ErrorCodeSerializer descriptor kind #54

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0b60c1
Change descriptor to INT for correct serialization
Leesin0222 Mar 16, 2025
9ea0ba9
Remove @OptIn(ExperimentalSerializationApi::class)
Leesin0222 Mar 16, 2025
f2bdf3d
Merge branch 'main' into chang-descriptor-kind
e5l Mar 26, 2025
b56577b
Merge branch 'main' into chang-descriptor-kind
e5l Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types.util.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package io.modelcontextprotocol.kotlin.sdk
import io.github.oshai.kotlinlogging.KotlinLogging
import io.modelcontextprotocol.kotlin.sdk.LoggingMessageNotification.SetLevelRequest
import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.KSerializer
import kotlinx.serialization.descriptors.PrimitiveKind
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
Expand All @@ -17,25 +16,23 @@ private val logger = KotlinLogging.logger {}

internal object ErrorCodeSerializer : KSerializer<ErrorCode> {
override val descriptor: SerialDescriptor =
PrimitiveSerialDescriptor("io.modelcontextprotocol.kotlin.sdk.ErrorCode", PrimitiveKind.STRING)
PrimitiveSerialDescriptor("io.modelcontextprotocol.kotlin.sdk.ErrorCode", PrimitiveKind.INT)

@OptIn(ExperimentalSerializationApi::class)
override fun serialize(encoder: Encoder, value: ErrorCode) {
encoder.encodeInt(value.code)
}

override fun deserialize(decoder: Decoder): ErrorCode {
val decodedString = decoder.decodeInt()
return ErrorCode.Defined.entries.firstOrNull { it.code == decodedString }
?: ErrorCode.Unknown(decodedString)
val decodedInt = decoder.decodeInt()
return ErrorCode.Defined.entries.firstOrNull { it.code == decodedInt }
?: ErrorCode.Unknown(decodedInt)
}
}

internal object RequestMethodSerializer : KSerializer<Method> {
override val descriptor: SerialDescriptor =
PrimitiveSerialDescriptor("io.modelcontextprotocol.kotlin.sdk.Method", PrimitiveKind.STRING)

@OptIn(ExperimentalSerializationApi::class)
override fun serialize(encoder: Encoder, value: Method) {
encoder.encodeString(value.value)
}
Expand All @@ -51,7 +48,6 @@ internal object StopReasonSerializer : KSerializer<StopReason> {
override val descriptor: SerialDescriptor =
PrimitiveSerialDescriptor("io.modelcontextprotocol.kotlin.sdk.StopReason", PrimitiveKind.STRING)

@OptIn(ExperimentalSerializationApi::class)
override fun serialize(encoder: Encoder, value: StopReason) {
encoder.encodeString(value.value)
}
Expand Down