From c2d9b5db783dbb9fcab6ad7c4ca7b1857c568b3f Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sun, 19 Mar 2023 17:49:22 +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=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=D0=B5=D0=B1=D1=85=D1=83=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quarkus/core/TelegramWebhookConnect.java | 6 ++---- .../telegram/simple/core/TelegramWebhookConnect.java | 2 ++ .../telegram/domain/config/ProxyConfig.java | 12 ++++++++++++ .../telegram/domain/config/TelegramBotConfig.java | 4 ++++ .../telegram/domain/config/WebhookConfig.java | 8 ++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/TelegramWebhookConnect.java b/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/TelegramWebhookConnect.java index a764cc7..da33371 100644 --- a/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/TelegramWebhookConnect.java +++ b/telegram-core/telegram-core-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/core/TelegramWebhookConnect.java @@ -15,10 +15,7 @@ public class TelegramWebhookConnect implements TelegramConnect { private TelegramWebhookBot webhookBot; public TelegramWebhookConnect(TelegramBotConfig telegramBotConfig) { - initWebHook(telegramBotConfig); - } - - private void initWebHook(TelegramBotConfig telegramBotConfig) { + log.info("Инициализация webhook соединения. {}", telegramBotConfig.getWebhookConfig()); try { final TelegramWebhookBot bot = new TelegramWebhookBot(telegramBotConfig); final WebhookConfig webhookConfig = telegramBotConfig.getWebhookConfig(); @@ -28,6 +25,7 @@ public class TelegramWebhookConnect implements TelegramConnect { .build(); bot.setWebhook(setWebhook); webhookBot = bot; + log.info("Инициализация webhook соединения прошла успешно."); } } catch (TelegramApiException e) { log.error(e.getMessage()); diff --git a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramWebhookConnect.java b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramWebhookConnect.java index 106972e..74d8ec8 100644 --- a/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramWebhookConnect.java +++ b/telegram-core/telegram-core-simple/src/main/java/dev/struchkov/godfather/telegram/simple/core/TelegramWebhookConnect.java @@ -19,6 +19,7 @@ public class TelegramWebhookConnect implements TelegramConnect { } private void initWebHook(TelegramBotConfig telegramBotConfig) { + log.info("Инициализация webhook соединения. {}", telegramBotConfig.getWebhookConfig()); try { final TelegramWebhookBot bot = new TelegramWebhookBot(telegramBotConfig); final WebhookConfig webhookConfig = telegramBotConfig.getWebhookConfig(); @@ -28,6 +29,7 @@ public class TelegramWebhookConnect implements TelegramConnect { .build(); bot.setWebhook(setWebhook); webhookBot = bot; + log.info("Инициализация webhook соединения прошла успешно."); } } catch (TelegramApiException e) { log.error(e.getMessage()); diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/ProxyConfig.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/ProxyConfig.java index d121017..c05888c 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/ProxyConfig.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/ProxyConfig.java @@ -2,6 +2,7 @@ package dev.struchkov.godfather.telegram.domain.config; import lombok.Getter; import lombok.Setter; +import lombok.ToString; /** * TODO: Добавить описание класса. @@ -10,13 +11,24 @@ import lombok.Setter; */ @Getter @Setter +@ToString public class ProxyConfig { private boolean enable = false; + + @ToString.Exclude private String host; + + @ToString.Exclude private Integer port; + + @ToString.Exclude private String user; + + @ToString.Exclude private String password; + + @ToString.Exclude private Type type; public enum Type { diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/TelegramBotConfig.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/TelegramBotConfig.java index 1037ebb..890f7ee 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/TelegramBotConfig.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/TelegramBotConfig.java @@ -3,6 +3,7 @@ package dev.struchkov.godfather.telegram.domain.config; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.ToString; /** * TODO: Добавить описание класса. @@ -11,10 +12,13 @@ import lombok.Setter; */ @Getter @Setter +@ToString @NoArgsConstructor public class TelegramBotConfig { private String username; + + @ToString.Exclude private String token; private ProxyConfig proxyConfig; diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/WebhookConfig.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/WebhookConfig.java index 3ef431b..1df2c2c 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/WebhookConfig.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/config/WebhookConfig.java @@ -2,14 +2,22 @@ package dev.struchkov.godfather.telegram.domain.config; import lombok.Getter; import lombok.Setter; +import lombok.ToString; @Getter @Setter +@ToString public class WebhookConfig { private boolean enable = false; + + @ToString.Exclude private String rootUrl; + + @ToString.Exclude private String path; + + @ToString.Exclude private String accessKey; }