Merge pull request #40 from VaryaGet/main

update telegrambots to 9.1.0

Author: ArtemGet

telegrambots/pom.xml

@@ -12,7 +12,7 @@
   <name>eleroute-telegrambots</name>
   <properties>
     <logging.version>2.22.1</logging.version>
-    <telegrambots.version>6.9.7.1</telegrambots.version>
+    <telegrambots.version>9.1.0</telegrambots.version>
   </properties>
   <dependencies>
     <dependency>
@@ -22,8 +22,9 @@
     </dependency>
     <dependency>
       <groupId>org.telegram</groupId>
-      <artifactId>telegrambots</artifactId>
+      <artifactId>telegrambots-meta</artifactId>
       <version>${telegrambots.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -58,15 +59,6 @@
                 <exclude>
                   duplicatefinder:.*
                 </exclude>
-                <exclude>
-                  dependencies:org.telegram:telegrambots:jar:6.9.7.1
-                </exclude>
-                <exclude>
-                  dependencies:org.telegram:telegrambots-meta:jar:6.9.7.1
-                </exclude>
-                <exclude>
-                  dependencies:com.github.ArtemGet:teleroute:jar:1.0.0:compile
-                </exclude>
               </excludes>
               <license>file:${basedir}/LICENSE</license>
             </configuration>

telegrambots/src/io/github/artemget/teleroute/telegrambots/send/SendMessageWrap.java

@@ -27,9 +27,9 @@
 import io.github.artemget.teleroute.send.Send;
 import io.github.artemget.teleroute.send.SendException;
 import java.io.Serializable;
-import org.telegram.telegrambots.meta.api.methods.BotApiMethod;
-import org.telegram.telegrambots.meta.bots.AbsSender;
+import org.telegram.telegrambots.meta.api.methods.botapimethods.BotApiMethod;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
 
 /**
  * Send all content laying under {@code BotApiMethod<T>}. Including ancestors of
@@ -39,7 +39,7 @@
  * @see BotApiMethod
  * @since 0.1.0
  */
-public final class SendMessageWrap<T extends Serializable> implements Send<AbsSender> {
+public final class SendMessageWrap<T extends Serializable> implements Send<TelegramClient> {
     /**
      * Message.
      */
@@ -55,7 +55,7 @@ public SendMessageWrap(final BotApiMethod<T> message) {
     }
 
     @Override
-    public void send(final AbsSender send) throws SendException {
+    public void send(final TelegramClient send) throws SendException {
         try {
             send.execute(this.message);
         } catch (final TelegramApiException exception) {

telegrambots/src/io/github/artemget/teleroute/telegrambots/send/SendStickerWrap.java

@@ -27,15 +27,15 @@
 import io.github.artemget.teleroute.send.Send;
 import io.github.artemget.teleroute.send.SendException;
 import org.telegram.telegrambots.meta.api.methods.send.SendSticker;
-import org.telegram.telegrambots.meta.bots.AbsSender;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
 
 /**
  * Send sticker wrap.
  *
  * @since 0.1.0
  */
-public final class SendStickerWrap implements Send<AbsSender> {
+public final class SendStickerWrap implements Send<TelegramClient> {
     /**
      * Message.
      */
@@ -51,7 +51,7 @@ public SendStickerWrap(final SendSticker message) {
     }
 
     @Override
-    public void send(final AbsSender send) throws SendException {
+    public void send(final TelegramClient send) throws SendException {
         try {
             send.execute(this.message);
         } catch (final TelegramApiException exception) {

telegrambots/src/io/github/artemget/teleroute/telegrambots/update/TgBotWrap.java

@@ -26,8 +26,8 @@
 
 import io.github.artemget.teleroute.update.Wrap;
 import java.util.Optional;
-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;
 
 /**
  * Telegram Update wrap.