diff options
| author | Leonid Startsev <sandwwraith@gmail.com> | 2023-08-22 17:03:51 +0200 |
|---|---|---|
| committer | Leonid Startsev <sandwwraith@gmail.com> | 2023-08-22 17:03:51 +0200 |
| commit | 79867f12b97e7ea1b8a97b7039f87adca06bf7be (patch) | |
| tree | 113d9a69786fa26378cd59ead7b4d9db3000db62 | |
| parent | ef923dea2a0fdd5e657a393b8b61f6490b35effb (diff) | |
| parent | 77af2c971b2ec30140bed3c99c26b8704586dc34 (diff) | |
| download | kotlinx.serialization-79867f12b97e7ea1b8a97b7039f87adca06bf7be.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev
| -rw-r--r-- | docs/json.md | 6 | ||||
| -rw-r--r-- | guide/example/example-json-26.kt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/json.md b/docs/json.md index 07476f97..d764ce5f 100644 --- a/docs/json.md +++ b/docs/json.md @@ -1128,10 +1128,10 @@ sealed class Response<out T> { class ResponseSerializer<T>(private val dataSerializer: KSerializer<T>) : KSerializer<Response<T>> { override val descriptor: SerialDescriptor = buildSerialDescriptor("Response", PolymorphicKind.SEALED) { - element("Ok", buildClassSerialDescriptor("Ok") { - element<String>("message") + element("Ok", dataSerializer.descriptor) + element("Error", buildClassSerialDescriptor("Error") { + element<String>("message") }) - element("Error", dataSerializer.descriptor) } override fun deserialize(decoder: Decoder): Response<T> { diff --git a/guide/example/example-json-26.kt b/guide/example/example-json-26.kt index 32b2fb65..c308b634 100644 --- a/guide/example/example-json-26.kt +++ b/guide/example/example-json-26.kt @@ -15,10 +15,10 @@ sealed class Response<out T> { class ResponseSerializer<T>(private val dataSerializer: KSerializer<T>) : KSerializer<Response<T>> { override val descriptor: SerialDescriptor = buildSerialDescriptor("Response", PolymorphicKind.SEALED) { - element("Ok", buildClassSerialDescriptor("Ok") { - element<String>("message") + element("Ok", dataSerializer.descriptor) + element("Error", buildClassSerialDescriptor("Error") { + element<String>("message") }) - element("Error", dataSerializer.descriptor) } override fun deserialize(decoder: Decoder): Response<T> { |