TelegramBotRunner: stop previous bot session before creating new one (#…

…50) * Upgrade telegrambots dependency to 4.3.1 Latest 4.4.0.1 has some dependency conflicts with jenkins libs, I'm not sure how to resolve them. For 4.3.1, only imports need to be updated. * TelegramBotRunner: stop previous bot session before creating new one Otherwise it seems that the previous session remains alive until I restart Jenkins.
jenkinsci · Oct 24, 2019 · e89a2ac · e89a2ac
1 parent ad8e1c4
commit e89a2ac
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 43 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <jacoco.version>0.7.4.201502262128</jacoco.version>
 
         <!--Libraries-->
-        <telegrambots.version>3.6</telegrambots.version>
+        <telegrambots.version>4.3.1</telegrambots.version>
         <jenkins.plugins.job-dsl.version>1.68</jenkins.plugins.job-dsl.version>
         <jenkins.plugins.structs.version>1.13</jenkins.plugins.structs.version>
         <jenkins.plugins.token-macro.version>2.3</jenkins.plugins.token-macro.version>

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/TelegramBot.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/TelegramBot.java
@@ -24,14 +24,14 @@
 import org.apache.http.util.EntityUtils;
 import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
 import org.jenkinsci.plugins.tokenmacro.TokenMacro;
-import org.telegram.telegrambots.api.methods.BotApiMethod;
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.Message;
-import org.telegram.telegrambots.api.objects.Update;
-import org.telegram.telegrambots.bots.commandbot.TelegramLongPollingCommandBot;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.exceptions.TelegramApiValidationException;
+import org.telegram.telegrambots.meta.api.methods.BotApiMethod;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.Message;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.extensions.bots.commandbot.TelegramLongPollingCommandBot;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiValidationException;
 
 import java.io.IOException;
 import java.io.Serializable;

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/TelegramBotRunner.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/TelegramBotRunner.java
@@ -3,9 +3,9 @@
 import jenkins.model.GlobalConfiguration;
 import jenkinsci.plugins.telegrambot.TelegramBotGlobalConfiguration;
 import org.telegram.telegrambots.ApiContextInitializer;
-import org.telegram.telegrambots.TelegramBotsApi;
-import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
-import org.telegram.telegrambots.generics.BotSession;
+import org.telegram.telegrambots.meta.TelegramBotsApi;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiRequestException;
+import org.telegram.telegrambots.meta.generics.BotSession;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -62,6 +62,11 @@ public TelegramBot getBot() {
     };
 
     private void createBotSession() {
+        if (botSession != null && botSession.isRunning()) {
+            LOG.info("Stopping previous bot session");
+            botSession.stop();
+        }
+
         try {
             botSession = api.registerBot(bot);
             LOG.log(Level.INFO, "New bot session was registered");

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/AbstractBotCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/AbstractBotCommand.java
@@ -2,7 +2,7 @@
 
 import jenkins.model.GlobalConfiguration;
 import jenkinsci.plugins.telegrambot.TelegramBotGlobalConfiguration;
-import org.telegram.telegrambots.bots.commandbot.commands.BotCommand;
+import org.telegram.telegrambots.extensions.bots.commandbot.commands.BotCommand;
 
 import java.util.Map;
 

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/HelpCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/HelpCommand.java
@@ -1,11 +1,11 @@
 package jenkinsci.plugins.telegrambot.telegram.commands;
 
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.User;
-import org.telegram.telegrambots.bots.AbsSender;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.logging.BotLogger;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.logging.BotLogger;
 
 public class HelpCommand extends AbstractBotCommand {
 

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/StartCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/StartCommand.java
@@ -1,11 +1,11 @@
 package jenkinsci.plugins.telegrambot.telegram.commands;
 
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.User;
-import org.telegram.telegrambots.bots.AbsSender;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.logging.BotLogger;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.logging.BotLogger;
 
 public class StartCommand extends AbstractBotCommand {
 

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/StatusCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/StatusCommand.java
@@ -4,12 +4,12 @@
 import jenkinsci.plugins.telegrambot.TelegramBotGlobalConfiguration;
 import jenkinsci.plugins.telegrambot.users.Subscribers;
 import jenkinsci.plugins.telegrambot.users.UserApprover;
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.User;
-import org.telegram.telegrambots.bots.AbsSender;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.logging.BotLogger;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.logging.BotLogger;
 
 public class StatusCommand extends AbstractBotCommand {
 

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/SubCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/SubCommand.java
@@ -1,12 +1,12 @@
 package jenkinsci.plugins.telegrambot.telegram.commands;
 
 import jenkinsci.plugins.telegrambot.users.Subscribers;
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.User;
-import org.telegram.telegrambots.bots.AbsSender;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.logging.BotLogger;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.logging.BotLogger;
 
 public class SubCommand extends AbstractBotCommand {
 

diff --git a/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/UnsubCommand.java b/src/main/java/jenkinsci/plugins/telegrambot/telegram/commands/UnsubCommand.java
@@ -1,12 +1,12 @@
 package jenkinsci.plugins.telegrambot.telegram.commands;
 
 import jenkinsci.plugins.telegrambot.users.Subscribers;
-import org.telegram.telegrambots.api.methods.send.SendMessage;
-import org.telegram.telegrambots.api.objects.Chat;
-import org.telegram.telegrambots.api.objects.User;
-import org.telegram.telegrambots.bots.AbsSender;
-import org.telegram.telegrambots.exceptions.TelegramApiException;
-import org.telegram.telegrambots.logging.BotLogger;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.api.objects.Chat;
+import org.telegram.telegrambots.meta.api.objects.User;
+import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.logging.BotLogger;
 
 public class UnsubCommand extends AbstractBotCommand {