From b39232ae479b2f5069638d0cd49d327d241ad957 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Thu, 21 Feb 2019 15:48:49 +0800 Subject: [PATCH] add SimpleRequestSerializer --- .../bot/Ktor/base/SimpleRequestCallFactory.kt | 5 ++--- .../TelegramBotAPI/requests/abstracts/SimpleRequest.kt | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt index b50a8a83e5..48b4d7e21a 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/SimpleRequestCallFactory.kt @@ -1,8 +1,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base import com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.KtorCallFactory -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.Request -import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.SimpleRequest +import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* import com.github.insanusmokrassar.TelegramBotAPI.utils.toJsonWithoutNulls import io.ktor.client.HttpClient import io.ktor.client.call.HttpClientCall @@ -27,7 +26,7 @@ class SimpleRequestCallFactory : KtorCallFactory { method = HttpMethod.Post accept(ContentType.Application.Json) - val content = request.toJsonWithoutNulls().toString() + val content = request.toJsonWithoutNulls(SimpleRequestSerializer).toString() body = TextContent( content, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt index b1aab229dd..5a0a8f7f02 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/requests/abstracts/SimpleRequest.kt @@ -1,3 +1,10 @@ package com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts +import kotlinx.serialization.ContextSerializer +import kotlinx.serialization.KSerializer +import kotlinx.serialization.Serializable + +@Serializable(SimpleRequestSerializer::class) interface SimpleRequest : Request + +object SimpleRequestSerializer : KSerializer> by ContextSerializer(SimpleRequest::class)