diff --git a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_1.xml similarity index 55% rename from .idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml rename to .idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_1.xml index 3c722ab..00b2b88 100644 --- a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_2_6.xml +++ b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_1.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 81bb26a..dce803c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,26 @@ + + + + + + + + + + + + + + @@ -52,66 +66,13 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -153,10 +114,6 @@ @@ -369,7 +330,7 @@ - + @@ -473,7 +434,7 @@ - + @@ -1202,14 +1163,8 @@ - - - - 1434932225092 - 1434956620075 @@ -1547,11 +1502,18 @@ - - @@ -1563,17 +1525,19 @@ - + + + @@ -1581,22 +1545,20 @@ - + + - - + - - @@ -1642,7 +1604,6 @@ - @@ -1667,7 +1628,8 @@ - @@ -1675,7 +1637,7 @@ file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java - 172 + 173 @@ -1687,7 +1649,7 @@ file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java - 329 + 330 @@ -1740,18 +1702,6 @@ - - - - - - - - - - - - @@ -1790,14 +1740,6 @@ - - - - - - - - @@ -1837,13 +1779,6 @@ - - - - - - - @@ -1879,22 +1814,6 @@ - - - - - - - - - - - - - - - - @@ -1953,7 +1872,6 @@ - @@ -1965,6 +1883,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -2015,13 +1953,80 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BotAPi.iml b/BotAPi.iml index 997844b..448ca73 100644 --- a/BotAPi.iml +++ b/BotAPi.iml @@ -11,7 +11,7 @@ - + diff --git a/pom.xml b/pom.xml index 2648e3c..7081b55 100644 --- a/pom.xml +++ b/pom.xml @@ -24,10 +24,8 @@ UTF-8 UTF-8 - 2.22.2 - 1.19.1 4.5.2 - v2.2.6 + v2.3.3.1 20160212 5.1.38 @@ -54,21 +52,6 @@ org.glassfish.jersey.containers jersey-container-grizzly2-http - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} - - - com.sun.jersey - jersey-bundle - ${jerseyengine.version} - - - com.sun.jersey - jersey-grizzly2-servlet - ${jerseyengine.version} - org.json json diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java index aa5a067..474e4ff 100644 --- a/src/main/java/org/telegram/Main.java +++ b/src/main/java/org/telegram/Main.java @@ -1,9 +1,19 @@ package org.telegram; -import org.telegram.services.BotLogger; import org.telegram.telegrambots.TelegramApiException; import org.telegram.telegrambots.TelegramBotsApi; -import org.telegram.updateshandlers.*; +import org.telegram.telegrambots.logging.BotLogger; +import org.telegram.telegrambots.logging.BotsFileHandler; +import org.telegram.updateshandlers.ChannelHandlers; +import org.telegram.updateshandlers.DirectionsHandlers; +import org.telegram.updateshandlers.FilesHandlers; +import org.telegram.updateshandlers.RaeHandlers; +import org.telegram.updateshandlers.TransifexHandlers; +import org.telegram.updateshandlers.WeatherHandlers; + +import java.io.IOException; +import java.util.logging.ConsoleHandler; +import java.util.logging.Level; /** * @author Ruben Bermudez @@ -15,6 +25,13 @@ public class Main { private static final String LOGTAG = "MAIN"; public static void main(String[] args) { + BotLogger.setLevel(Level.ALL); + BotLogger.registerLogger(new ConsoleHandler()); + try { + BotLogger.registerLogger(new BotsFileHandler()); + } catch (IOException e) { + BotLogger.severe("MAIN", e); + } TelegramBotsApi telegramBotsApi = new TelegramBotsApi(); try { diff --git a/src/main/java/org/telegram/database/ConectionDB.java b/src/main/java/org/telegram/database/ConectionDB.java index 5a98513..ed74781 100644 --- a/src/main/java/org/telegram/database/ConectionDB.java +++ b/src/main/java/org/telegram/database/ConectionDB.java @@ -8,9 +8,15 @@ package org.telegram.database; import org.telegram.BuildVars; -import org.telegram.services.BotLogger; +import org.telegram.telegrambots.logging.BotLogger; -import java.sql.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; /** * @author Ruben Bermudez diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java index 4dbe43a..7921338 100644 --- a/src/main/java/org/telegram/database/DatabaseManager.java +++ b/src/main/java/org/telegram/database/DatabaseManager.java @@ -7,8 +7,8 @@ */ package org.telegram.database; -import org.telegram.services.BotLogger; import org.telegram.structure.WeatherAlert; +import org.telegram.telegrambots.logging.BotLogger; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/src/main/java/org/telegram/services/BotLogger.java b/src/main/java/org/telegram/services/BotLogger.java deleted file mode 100644 index fd180b9..0000000 --- a/src/main/java/org/telegram/services/BotLogger.java +++ /dev/null @@ -1,348 +0,0 @@ -package org.telegram.services; - -import org.telegram.BuildVars; - -import javax.validation.constraints.NotNull; -import java.io.*; -import java.time.LocalDateTime; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.logging.ConsoleHandler; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * @author Ruben Bermudez - * @version 2.0 - * @brief Logger to file - * @date 21/01/15 - */ -public class BotLogger { - private static final Object lockToWrite = new Object(); - private static volatile PrintWriter logginFile; - private static volatile String currentFileName; - private static final Logger logger = Logger.getLogger("Tsupport Bot"); - private static volatile LocalDateTime lastFileDate; - private static LoggerThread loggerThread = new LoggerThread(); - private static final ConcurrentLinkedQueue logsToFile = new ConcurrentLinkedQueue<>(); - - static { - logger.setLevel(Level.ALL); - logger.addHandler(new ConsoleHandler()); - loggerThread.start(); - lastFileDate = LocalDateTime.now(); - if ((currentFileName == null) || (currentFileName.compareTo("") == 0)) { - currentFileName = dateFormatterForFileName(lastFileDate) + ".log"; - try { - final File file = new File(currentFileName); - if (file.exists()) { - logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true))); - } else { - final boolean created = file.createNewFile(); - if (created) { - logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true))); - } else { - throw new NullPointerException("File for logging error"); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - - } - } - - public static void log(@NotNull Level level, String tag, String msg) { - logger.log(level, String.format("[%s] %s", tag, msg)); - logToFile(level, tag, msg); - } - - - public static void severe(String tag, String msg) { - logger.severe(String.format("[%s] %s", tag, msg)); - logToFile(Level.SEVERE, tag, msg); - } - - public static void warn(String tag, String msg) { - warning(tag, msg); - } - - public static void debug(String tag, String msg) { - fine(tag, msg); - } - - public static void error(String tag, String msg) { - severe(tag, msg); - } - - public static void trace(String tag, String msg) { - finer(tag, msg); - } - - public static void warning(String tag, String msg) { - logger.warning(String.format("[%s] %s", tag, msg)); - logToFile(Level.WARNING, tag, msg); - } - - - public static void info(String tag, String msg) { - logger.info(String.format("[%s] %s", tag, msg)); - logToFile(Level.INFO, tag, msg); - } - - - public static void config(String tag, String msg) { - logger.config(String.format("[%s] %s", tag, msg)); - logToFile(Level.CONFIG, tag, msg); - } - - - public static void fine(String tag, String msg) { - logger.fine(String.format("[%s] %s", tag, msg)); - logToFile(Level.FINE, tag, msg); - } - - - public static void finer(String tag, String msg) { - logger.finer(String.format("[%s] %s", tag, msg)); - logToFile(Level.FINER, tag, msg); - } - - - public static void finest(String tag, String msg) { - logger.finest(String.format("[%s] %s", tag, msg)); - logToFile(Level.FINEST, tag, msg); - } - - - public static void log(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable) { - logger.log(level, String.format("[%s] Exception", tag), throwable); - logToFile(level, tag, throwable); - } - - public static void log(@NotNull Level level, @NotNull String tag, @NotNull String msg, @NotNull Throwable thrown) { - logger.log(level, msg, thrown); - logToFile(level, msg, thrown); - } - - public static void severe(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.SEVERE, tag, throwable); - } - - public static void warning(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.WARNING, tag, throwable); - } - - public static void info(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.INFO, tag, throwable); - } - - public static void config(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.CONFIG, tag, throwable); - } - - public static void fine(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.FINE, tag, throwable); - } - - public static void finer(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.FINER, tag, throwable); - } - - public static void finest(@NotNull String tag, @NotNull Throwable throwable) { - logToFile(Level.FINEST, tag, throwable); - } - - public static void warn(@NotNull String tag, Throwable throwable) { - warning(tag, throwable); - } - - public static void debug(@NotNull String tag, Throwable throwable) { - fine(tag, throwable); - } - - public static void error(@NotNull String tag, Throwable throwable) { - severe(tag, throwable); - } - - public static void trace(@NotNull String tag, Throwable throwable) { - finer(tag, throwable); - } - - public static void severe(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.SEVERE, tag, msg, throwable); - } - - public static void warning(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.WARNING, tag, msg, throwable); - } - - public static void info(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.INFO, tag, msg, throwable); - } - - public static void config(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.CONFIG, tag, msg, throwable); - } - - public static void fine(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.FINE, tag, msg, throwable); - } - - public static void finer(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.FINER, tag, msg, throwable); - } - - public static void finest(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.FINEST, msg, throwable); - } - - public static void warn(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.WARNING, tag, msg, throwable); - } - - public static void debug(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.FINE, tag, msg, throwable); - } - - public static void error(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.SEVERE, tag, msg, throwable); - } - - public static void trace(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) { - log(Level.FINER, tag, msg, throwable); - } - - private static boolean isCurrentDate(LocalDateTime dateTime) { - return dateTime.toLocalDate().isEqual(lastFileDate.toLocalDate()); - } - - private static String dateFormatterForFileName(@NotNull LocalDateTime dateTime) { - String dateString = ""; - dateString += dateTime.getDayOfMonth(); - dateString += dateTime.getMonthValue(); - dateString += dateTime.getYear(); - return dateString; - } - - private static String dateFormatterForLogs(@NotNull LocalDateTime dateTime) { - String dateString = "["; - dateString += dateTime.getDayOfMonth() + "_"; - dateString += dateTime.getMonthValue() + "_"; - dateString += dateTime.getYear() + "_"; - dateString += dateTime.getHour() + ":"; - dateString += dateTime.getMinute() + ":"; - dateString += dateTime.getSecond(); - dateString += "] "; - return dateString; - } - - private static void updateAndCreateFile(LocalDateTime dateTime) { - if (!isCurrentDate(dateTime)) { - lastFileDate = LocalDateTime.now(); - currentFileName = BuildVars.pathToLogs + dateFormatterForFileName(lastFileDate) + ".log"; - try { - logginFile.flush(); - logginFile.close(); - final File file = new File(currentFileName); - if (file.exists()) { - logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true))); - } else { - final boolean created = file.createNewFile(); - if (created) { - logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true))); - } else { - throw new NullPointerException("Error updating log file"); - } - } - } catch (IOException ignored) { - } - } - } - - - private static void logToFile(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable) { - if (isLoggable(level)) { - synchronized (lockToWrite) { - final LocalDateTime currentDate = LocalDateTime.now(); - final String dateForLog = dateFormatterForLogs(currentDate); - updateAndCreateFile(currentDate); - logThrowableToFile(level, tag, throwable, dateForLog); - } - } - } - - - - private static void logToFile(@NotNull Level level, @NotNull String tag, @NotNull String msg) { - if (isLoggable(level)) { - synchronized (lockToWrite) { - final LocalDateTime currentDate = LocalDateTime.now(); - updateAndCreateFile(currentDate); - final String dateForLog = dateFormatterForLogs(currentDate); - logMsgToFile(level, tag, msg, dateForLog); - } - } - } - - private static void logToFile(Level level, @NotNull String tag, @NotNull String msg, @NotNull Throwable throwable) { - if (isLoggable(level)) { - synchronized (lockToWrite) { - final LocalDateTime currentDate = LocalDateTime.now(); - updateAndCreateFile(currentDate); - final String dateForLog = dateFormatterForLogs(currentDate); - logMsgToFile(level, tag, msg, dateForLog); - logThrowableToFile(level, tag, throwable, dateForLog); - } - } - } - - private static void logMsgToFile(@NotNull Level level, @NotNull String tag, @NotNull String msg, @NotNull String dateForLog) { - final String logMessage = String.format("%s{%s} %s - %s", dateForLog, level.toString(), tag, msg); - logsToFile.add(logMessage); - synchronized (logsToFile) { - logsToFile.notifyAll(); - } - } - - private static void logThrowableToFile(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable, @NotNull String dateForLog) { - String throwableLog = String.format("%s{%s} %s - %s", dateForLog, level.toString(), tag, throwable.toString()); - for (StackTraceElement element : throwable.getStackTrace()) { - throwableLog += "\tat " + element + "\n"; - } - logsToFile.add(throwableLog); - synchronized (logsToFile) { - logsToFile.notifyAll(); - } - } - - private static boolean isLoggable(Level level) { - return logger.isLoggable(level) && BuildVars.debug; - } - - private static class LoggerThread extends Thread { - - @Override - public void run() { - while(true) { - final ConcurrentLinkedQueue stringsToLog = new ConcurrentLinkedQueue<>(); - synchronized (logsToFile) { - if (logsToFile.isEmpty()) { - try { - logsToFile.wait(); - } catch (InterruptedException e) { - return; - } - if (logsToFile.isEmpty()) { - continue; - } - } - stringsToLog.addAll(logsToFile); - logsToFile.clear(); - } - - stringsToLog.stream().forEach(logginFile::println); - logginFile.flush(); - } - } - } -} diff --git a/src/main/java/org/telegram/services/DirectionsService.java b/src/main/java/org/telegram/services/DirectionsService.java index 305a651..bd96e97 100644 --- a/src/main/java/org/telegram/services/DirectionsService.java +++ b/src/main/java/org/telegram/services/DirectionsService.java @@ -12,6 +12,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; import org.telegram.BuildVars; +import org.telegram.telegrambots.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/org/telegram/services/RaeService.java b/src/main/java/org/telegram/services/RaeService.java index 13712d9..505fb63 100644 --- a/src/main/java/org/telegram/services/RaeService.java +++ b/src/main/java/org/telegram/services/RaeService.java @@ -12,6 +12,7 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import org.telegram.telegrambots.logging.BotLogger; import java.io.IOException; import java.net.URLEncoder; diff --git a/src/main/java/org/telegram/services/TimerExecutor.java b/src/main/java/org/telegram/services/TimerExecutor.java index 278313e..68387f6 100644 --- a/src/main/java/org/telegram/services/TimerExecutor.java +++ b/src/main/java/org/telegram/services/TimerExecutor.java @@ -1,5 +1,7 @@ package org.telegram.services; +import org.telegram.telegrambots.logging.BotLogger; + import java.time.Clock; import java.time.Duration; import java.time.LocalDateTime; diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index 0316f26..ce701ca 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -9,6 +9,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.telegram.BuildVars; import org.telegram.telegrambots.api.methods.send.SendDocument; +import org.telegram.telegrambots.logging.BotLogger; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java index 880a92a..a7a96ac 100644 --- a/src/main/java/org/telegram/services/WeatherService.java +++ b/src/main/java/org/telegram/services/WeatherService.java @@ -11,6 +11,7 @@ import org.apache.http.util.EntityUtils; import org.json.JSONObject; import org.telegram.BuildVars; import org.telegram.database.DatabaseManager; +import org.telegram.telegrambots.logging.BotLogger; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index 76180aa..1ff8323 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -1,7 +1,6 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; -import org.telegram.services.BotLogger; import org.telegram.telegrambots.TelegramApiException; import org.telegram.telegrambots.api.methods.send.SendMessage; import org.telegram.telegrambots.api.objects.Message; @@ -9,6 +8,7 @@ import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.api.objects.replykeyboard.ForceReplyKeyboard; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import java.io.InvalidObjectException; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 8f4d9a6..366c9c1 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -4,7 +4,6 @@ import org.json.JSONObject; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.BotLogger; import org.telegram.services.DirectionsService; import org.telegram.services.LocalisationService; import org.telegram.telegrambots.TelegramApiException; @@ -17,6 +16,7 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import org.telegram.telegrambots.updateshandlers.SentCallback; import java.io.InvalidObjectException; diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index 52e95c6..b5d1113 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -3,7 +3,6 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.BotLogger; import org.telegram.services.Emoji; import org.telegram.services.LocalisationService; import org.telegram.telegrambots.TelegramApiException; @@ -15,6 +14,7 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import java.io.InvalidObjectException; import java.util.ArrayList; diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java index 3369139..7aac6ef 100644 --- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java @@ -1,7 +1,6 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; -import org.telegram.services.BotLogger; import org.telegram.services.RaeService; import org.telegram.telegrambots.TelegramApiException; import org.telegram.telegrambots.api.methods.AnswerInlineQuery; @@ -13,6 +12,7 @@ import org.telegram.telegrambots.api.objects.inlinequery.inputmessagecontent.Inp import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResult; import org.telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java index bbca2b0..0929911 100644 --- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java @@ -3,7 +3,6 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.BotLogger; import org.telegram.services.LocalisationService; import org.telegram.services.TransifexService; import org.telegram.telegrambots.TelegramApiException; @@ -12,6 +11,7 @@ import org.telegram.telegrambots.api.methods.send.SendMessage; import org.telegram.telegrambots.api.objects.Message; import org.telegram.telegrambots.api.objects.Update; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import java.io.InvalidObjectException; diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index cdd25be..87f85c4 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -3,7 +3,6 @@ package org.telegram.updateshandlers; import org.telegram.BotConfig; import org.telegram.Commands; import org.telegram.database.DatabaseManager; -import org.telegram.services.BotLogger; import org.telegram.services.CustomTimerTask; import org.telegram.services.Emoji; import org.telegram.services.LocalisationService; @@ -20,6 +19,7 @@ import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardHide; import org.telegram.telegrambots.api.objects.replykeyboard.ReplyKeyboardMarkup; import org.telegram.telegrambots.api.objects.replykeyboard.buttons.KeyboardRow; import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.logging.BotLogger; import java.util.ArrayList; import java.util.List;