diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java index 896b34e1..f81035b5 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/CreateInvoiceLink.java @@ -14,6 +14,7 @@ import lombok.Setter; import lombok.Singular; import lombok.ToString; import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodMessage; import org.telegram.telegrambots.meta.api.objects.ApiResponse; import org.telegram.telegrambots.meta.api.objects.Message; import org.telegram.telegrambots.meta.api.objects.payments.LabeledPrice; @@ -36,7 +37,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -public class CreateInvoiceLink extends BotApiMethod { +public class CreateInvoiceLink extends BotApiMethodMessage { public static final String PATH = "createInvoiceLink"; public static final String TITLE_FIELD = "title"; @@ -135,21 +136,6 @@ public class CreateInvoiceLink extends BotApiMethod { return PATH; } - @Override - public Message deserializeResponse(String answer) throws TelegramApiRequestException { - try { - ApiResponse result = OBJECT_MAPPER.readValue(answer, - new TypeReference>(){}); - if (result.getOk()) { - return result.getResult(); - } else { - throw new TelegramApiRequestException("Error sending invoice", result); - } - } catch (IOException e) { - throw new TelegramApiRequestException("Unable to deserialize response", e); - } - } - @Override public void validate() throws TelegramApiValidationException { if (Strings.isNullOrEmpty(title) || title.length() > 32) { diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java index 90ac1f81..48757a3c 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/api/methods/invoices/SendInvoice.java @@ -15,6 +15,7 @@ import lombok.Singular; import lombok.ToString; import lombok.experimental.Tolerate; import org.telegram.telegrambots.meta.api.methods.BotApiMethod; +import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethodMessage; import org.telegram.telegrambots.meta.api.objects.ApiResponse; import org.telegram.telegrambots.meta.api.objects.Message; import org.telegram.telegrambots.meta.api.objects.payments.LabeledPrice; @@ -38,7 +39,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -public class SendInvoice extends BotApiMethod { +public class SendInvoice extends BotApiMethodMessage { public static final String PATH = "sendinvoice"; private static final String CHATID_FIELD = "chat_id"; @@ -176,21 +177,6 @@ public class SendInvoice extends BotApiMethod { return PATH; } - @Override - public Message deserializeResponse(String answer) throws TelegramApiRequestException { - try { - ApiResponse result = OBJECT_MAPPER.readValue(answer, - new TypeReference>(){}); - if (result.getOk()) { - return result.getResult(); - } else { - throw new TelegramApiRequestException("Error sending invoice", result); - } - } catch (IOException e) { - throw new TelegramApiRequestException("Unable to deserialize response", e); - } - } - @Override public void validate() throws TelegramApiValidationException { if (Strings.isNullOrEmpty(chatId)) {