From 27f21ce24a9fc054943fc5c5bbd5cd8b165c8e81 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Mon, 10 Apr 2023 10:12:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/TelegramBotException.java | 16 +++++++++++ .../exception/TelegramSenderException.java | 9 ++++++ .../simple/sender/TelegramSender.java | 28 +++++++++---------- 3 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramBotException.java create mode 100644 telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramSenderException.java diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramBotException.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramBotException.java new file mode 100644 index 0000000..16fe4df --- /dev/null +++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramBotException.java @@ -0,0 +1,16 @@ +package dev.struchkov.godfather.telegram.main.context.exception; + +public class TelegramBotException extends RuntimeException { + + public TelegramBotException() { + } + + public TelegramBotException(String message) { + super(message); + } + + public TelegramBotException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramSenderException.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramSenderException.java new file mode 100644 index 0000000..0e9594e --- /dev/null +++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/exception/TelegramSenderException.java @@ -0,0 +1,9 @@ +package dev.struchkov.godfather.telegram.main.context.exception; + +public class TelegramSenderException extends TelegramBotException { + + public TelegramSenderException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java b/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java index 2a10828..e1c100f 100644 --- a/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java +++ b/telegram-sender/telegram-sender-simple/src/main/java/dev/struchkov/godfather/telegram/simple/sender/TelegramSender.java @@ -9,6 +9,7 @@ import dev.struchkov.godfather.simple.domain.content.send.SendFile; import dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard; import dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload; import dev.struchkov.godfather.telegram.main.context.convert.MessageMailConvert; +import dev.struchkov.godfather.telegram.main.context.exception.TelegramSenderException; import dev.struchkov.godfather.telegram.simple.context.repository.SenderRepository; import dev.struchkov.godfather.telegram.simple.context.service.TelegramConnect; import dev.struchkov.godfather.telegram.simple.context.service.TelegramSending; @@ -81,7 +82,7 @@ public class TelegramSender implements TelegramSending { try { absSender.execute(deleteMessage); } catch (TelegramApiException e) { - log.error(e.getMessage(), e); + throw new TelegramSenderException(e.getMessage(), e); } } @@ -111,9 +112,9 @@ public class TelegramSender implements TelegramSending { try { absSender.execute(editMessageText); } catch (TelegramApiRequestException e) { - log.error(e.getApiResponse()); + throw new TelegramSenderException(e.getApiResponse(), e); } catch (TelegramApiException e) { - log.error(e.getMessage(), e); + throw new TelegramSenderException(e.getMessage(), e); } } @@ -129,8 +130,7 @@ public class TelegramSender implements TelegramSending { absSender.execute(sendInvoice); return Optional.empty(); } catch (TelegramApiException e) { - log.error(e.getMessage(), e); - return Optional.empty(); + throw new TelegramSenderException(e.getMessage(), e); } } @@ -188,14 +188,14 @@ public class TelegramSender implements TelegramSending { .build() ); } catch (TelegramApiRequestException e) { - log.error(e.getApiResponse()); if (ERROR_REPLACE_MESSAGE.equals(e.getApiResponse())) { return sendMessage(telegramId, preparedAnswer, preparedAnswer, saveMessageId); + } else { + throw new TelegramSenderException(e.getApiResponse(), e); } } catch (TelegramApiException e) { - log.error(e.getMessage(), e); + throw new TelegramSenderException(e.getMessage(), e); } - return Optional.empty(); } private Optional sendMessage(@NotNull String telegramId, @NotNull BoxAnswer boxAnswer, BoxAnswer preparedAnswer, boolean saveMessageId) { @@ -206,9 +206,9 @@ public class TelegramSender implements TelegramSending { try { execute = absSender.execute(sendMessage); } catch (TelegramApiRequestException e) { - log.error(e.getApiResponse()); + throw new TelegramSenderException(e.getApiResponse(), e); } catch (TelegramApiException e) { - log.error(e.getMessage()); + throw new TelegramSenderException(e.getMessage(), e); } } if (checkNotNull(execute)) { @@ -249,9 +249,9 @@ public class TelegramSender implements TelegramSending { try { execute = absSender.execute(sendPhoto); } catch (TelegramApiRequestException e) { - log.error(e.getApiResponse()); + throw new TelegramSenderException(e.getApiResponse(), e); } catch (TelegramApiException e) { - log.error(e.getMessage()); + throw new TelegramSenderException(e.getMessage(), e); } if (checkNotNull(execute)) { if (checkNotNull(senderRepository)) { @@ -287,9 +287,9 @@ public class TelegramSender implements TelegramSending { try { execute = absSender.execute(sendDocument); } catch (TelegramApiRequestException e) { - log.error(e.getApiResponse()); + throw new TelegramSenderException(e.getApiResponse(), e); } catch (TelegramApiException e) { - log.error(e.getMessage()); + throw new TelegramSenderException(e.getMessage(), e); } if (checkNotNull(execute)) { if (checkNotNull(senderRepository)) {