Rename telegram configuration property : bot_id -> bot_api_token

Author: WikiDru

README.md

@@ -37,7 +37,7 @@ It's channel configuration file.
 [channel_name]:
 # Telegram
 - type: "telegram"
-  bot_id: ""
+  bot_api_token: ""
   chat_id: ""
   display_tags: true
   merge_duplicate_message: true

src/main/java/org/code13k/perri/business/message/sender/TelegramSender.java

@@ -1,15 +1,12 @@
 package org.code13k.perri.business.message.sender;
 
 import io.vertx.ext.web.client.HttpResponse;
-import org.apache.commons.lang3.StringUtils;
-import org.code13k.perri.model.Message;
 import org.code13k.perri.model.MessageOperation;
 import org.code13k.perri.model.config.channel.TelegramInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.function.Consumer;
 
 public class TelegramSender extends BasicSender {
@@ -78,10 +75,10 @@ private String makeTelegramUri(MessageOperation messageOperation) {
             String urlEncodedText = URLEncoder.encode(text, "UTF-8");
 
             // Make URL
-            String bot_id = telegramInfo.getBotId();
-            String chat_id = telegramInfo.getChatId();
+            String botApiToken = telegramInfo.getBotApiToken();
+            String chatId = telegramInfo.getChatId();
             String uriFormat = "https://api.telegram.org/bot%s/sendMessage?chat_id=%s&text=%s";
-            String uri = String.format(uriFormat, bot_id, chat_id, urlEncodedText);
+            String uri = String.format(uriFormat, botApiToken, chatId, urlEncodedText);
 
             // End
             mLogger.debug("TelegramSender URI : " + uri);

src/main/java/org/code13k/perri/config/ChannelConfig.java

@@ -110,20 +110,20 @@ protected boolean loadConfig(final String content, final String filePath) {
 
                     // Telegram
                     if (type.equalsIgnoreCase(ChannelType.TELEGRAM)) {
-                        String botId = (String) valueItemObject.getOrDefault("bot_id", "");
+                        String botApiToken = (String) valueItemObject.getOrDefault("bot_api_token", "");
                         String chatId = (String) valueItemObject.getOrDefault("chat_id", "");
 
                         // Set Telegram
                         TelegramInfo telegramInfo = new TelegramInfo();
                         telegramInfo.setType(ChannelType.TELEGRAM);
-                        telegramInfo.setBotId(botId);
+                        telegramInfo.setBotApiToken(botApiToken);
                         telegramInfo.setChatId(chatId);
                         telegramInfo.setDisplayTags(displayTags);
                         telegramInfo.setMergeDuplicateMessage(mergeDuplicateMessage);
 
                         // Check validation
-                        if (StringUtils.isEmpty(telegramInfo.getBotId()) == true) {
-                            mLogger.error("Invalid telegram channel (bot_id is invalid)");
+                        if (StringUtils.isEmpty(telegramInfo.getBotApiToken()) == true) {
+                            mLogger.error("Invalid telegram channel (bot_api_token is invalid)");
                         } else if (StringUtils.isEmpty(telegramInfo.getChatId()) == true) {
                             mLogger.error("Invalid telegram channel (chat_id is invalid)");
                         } else {

src/main/java/org/code13k/perri/model/config/channel/TelegramInfo.java

@@ -1,14 +1,14 @@
 package org.code13k.perri.model.config.channel;
 
 public class TelegramInfo extends ChannelInfo {
-    private String botId;
+    private String botApiToken;
     private String chatId;
 
     @Override
     public boolean equals(Object object) {
         if (super.equals(object) == true) {
             if (object instanceof TelegramInfo) {
-                if (this.getBotId().equals(((TelegramInfo) object).getBotId())) {
+                if (this.getBotApiToken().equals(((TelegramInfo) object).getBotApiToken())) {
                     if (this.getChatId().equals(((TelegramInfo) object).getChatId())) {
                         return true;
                     }
@@ -18,12 +18,12 @@ public boolean equals(Object object) {
         return false;
     }
 
-    public String getBotId() {
-        return botId;
+    public String getBotApiToken() {
+        return botApiToken;
     }
 
-    public void setBotId(String botId) {
-        this.botId = botId;
+    public void setBotApiToken(String botApiToken) {
+        this.botApiToken = botApiToken;
     }
 
     public String getChatId() {

src/main/resources/config/default_channel_config.yml

@@ -1,6 +1,6 @@
 perri_default_channel:
 - type: "telegram"
-  bot_id: ""
+  bot_api_token: ""
   chat_id: ""
   display_tags: true
   merge_duplicate_message: true

src/main/resources/config/default_logback.xml

@@ -52,7 +52,7 @@
     -->
 
     <!-- Mode -->
-    <logger name="org.code13k.perri" level="TRACE"/>
+    <logger name="org.code13k.perri" level="INFO"/>
     <root level="WARN">
         <appender-ref ref="FILE"/>
     </root>