Bump version of tg libs (#7)

* Bump version of tg libs

* Bump version of tg libs

* Bump version of tg libs

* Fix test

* Fix test

* Added properties on application.yml

* Fix application.yml

Author: Gretchen-z

pom.xml

@@ -10,6 +10,7 @@
         <version>3.0.9</version>
     </parent>
 
+    <name>alerting-tg-bot</name>
     <artifactId>alerting-tg-bot</artifactId>
     <version>1.0.0</version>
 
@@ -23,6 +24,7 @@
         <management.port>8023</management.port>
         <exposed.ports>${server.port} ${management.port}</exposed.ports>
         <testcontainers.annotations.version>2.0.4</testcontainers.annotations.version>
+        <org.telegram.telegrambots.version>9.0.0</org.telegram.telegrambots.version>
     </properties>
 
     <dependencyManagement>
@@ -80,8 +82,18 @@
         <!--third party-->
         <dependency>
             <groupId>org.telegram</groupId>
-            <artifactId>telegrambots-spring-boot-starter</artifactId>
-            <version>6.9.7.1</version>
+            <artifactId>telegrambots-springboot-longpolling-starter</artifactId>
+            <version>${org.telegram.telegrambots.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.telegram</groupId>
+            <artifactId>telegrambots-client</artifactId>
+            <version>${org.telegram.telegrambots.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.telegram</groupId>
+            <artifactId>telegrambots-meta</artifactId>
+            <version>${org.telegram.telegrambots.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>

src/main/java/dev/vality/alerting/tg/bot/config/AlertBotConfig.java

@@ -1,22 +1,18 @@
 package dev.vality.alerting.tg.bot.config;
 
-import dev.vality.alerting.tg.bot.service.AlertBot;
+import dev.vality.alerting.tg.bot.config.properties.AlertBotProperties;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.telegram.telegrambots.meta.TelegramBotsApi;
-import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
+import org.telegram.telegrambots.client.okhttp.OkHttpTelegramClient;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
 
 @Configuration
 @RequiredArgsConstructor
 public class AlertBotConfig {
 
-    private final AlertBot alertBot;
-
     @Bean
-    public TelegramBotsApi telegramBotsApi() throws Exception {
-        TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class);
-        api.registerBot(alertBot);
-        return api;
+    public TelegramClient telegramClient(AlertBotProperties properties) {
+        return new OkHttpTelegramClient(properties.getToken());
     }
 }

src/main/java/dev/vality/alerting/tg/bot/service/AlertBot.java

@@ -6,37 +6,40 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Service;
-import org.telegram.telegrambots.bots.TelegramLongPollingBot;
+import org.telegram.telegrambots.longpolling.starter.SpringLongPollingBot;
+import org.telegram.telegrambots.longpolling.util.LongPollingSingleThreadUpdateConsumer;
 import org.telegram.telegrambots.meta.api.methods.forum.CreateForumTopic;
 import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import org.telegram.telegrambots.meta.api.objects.Message;
 import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.api.objects.message.Message;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
 
 import java.util.*;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 @EnableScheduling
-public class AlertBot extends TelegramLongPollingBot {
+public class AlertBot implements SpringLongPollingBot, LongPollingSingleThreadUpdateConsumer {
 
     private final AlertBotProperties properties;
+    private final TelegramClient telegramClient;
     private static final Map<Long, List<String>> activeTopics = new HashMap<>();
     private static final Set<Long> waitingForTopicName = new HashSet<>();
 
     @Override
-    public String getBotUsername() {
-        return properties.getName();
+    public String getBotToken() {
+        return properties.getToken();
     }
 
     @Override
-    public String getBotToken() {
-        return properties.getToken();
+    public LongPollingSingleThreadUpdateConsumer getUpdatesConsumer() {
+        return this;
     }
 
     @Override
-    public void onUpdateReceived(Update update) {
+    public void consume(Update update) {
         if (update.hasMessage() && update.getMessage().hasText()) {
 
             log.debug("Получено сообщение: message={}, chatId={}, threadId={}, user=@{}, text='{}'",
@@ -98,7 +101,7 @@ private void createTopic(Long chatId, String topicName) {
                     .name(topicName)
                     .build();
 
-            Integer messageThreadId = execute(createForumTopic).getMessageThreadId();
+            Integer messageThreadId = telegramClient.execute(createForumTopic).getMessageThreadId();
 //            activeTopics.put(chatId, String.valueOf(messageThreadId));
 
             // Добавляем топик в список, если у чата уже есть созданные топики
@@ -231,7 +234,7 @@ private void sendResponse(Long chatId, Integer threadId, String messageText, Str
                 .build();
 
         try {
-            execute(message);
+            telegramClient.execute(message);
         } catch (TelegramApiException e) {
             log.error("Ошибка при отправке сообщения", e);
         }

src/main/resources/application.yml

@@ -31,6 +31,14 @@ spring:
       enabled: always
   main:
     allow-bean-definition-overriding: true
+  cloud:
+    vault:
+      kv:
+        enabled: true
+      uri: https://vault.vality.dev:443
+      authentication: TOKEN
+      scheme: http
+      token: "123456"
 
 info:
   version: '@project.version@'
@@ -46,3 +54,7 @@ bot:
     altpay-conversion: ${topicAltpayConversion}
     failed-machines: ${topicFailedMachines}
     pending-payments: ${topicPendingPayments}
+
+alertmanager:
+  webhook:
+    url: http://localhost:8082/alertmanager/webhook

src/test/java/dev/vality/alerting/tg/bot/WebhookControllerTest.java

@@ -1,7 +1,6 @@
 package dev.vality.alerting.tg.bot;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import dev.vality.alerting.tg.bot.config.AlertBotConfig;
 import dev.vality.alerting.tg.bot.config.properties.AlertmanagerWebhookProperties;
 import dev.vality.alerting.tg.bot.controller.WebhookController;
 import dev.vality.alerting.tg.bot.model.Webhook;
@@ -14,6 +13,8 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.telegram.telegrambots.longpolling.starter.TelegramBotInitializer;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
 
 import java.nio.charset.StandardCharsets;
 
@@ -42,7 +43,10 @@ public class WebhookControllerTest {
     AlertBot alertBot;
 
     @MockitoBean
-    AlertBotConfig alertBotConfig;
+    TelegramClient telegramClient;
+
+    @MockitoBean
+    TelegramBotInitializer telegramBotInitializer;
 
     String webhookJson = """
             {