Fix send files requests to take String, File or byte[]

Author: pengrad

src/main/java/com/pengrad/telegrambot/OldTelegramBot.java

@@ -66,21 +66,20 @@ public SendResponse forwardMessage(Object chatId, Object fromChatId, Integer mes
 
     @Deprecated
     public SendResponse sendPhoto(Object chatId, String photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendPhoto(chatId, photo, caption, replyToMessageId, replyMarkup, false);
+        return sendPhoto(new SendPhoto(chatId, photo), caption, replyToMessageId, replyMarkup);
     }
 
     @Deprecated
     public SendResponse sendPhoto(Object chatId, InputFile photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendPhoto(chatId, photo.getFile(), caption, replyToMessageId, replyMarkup, true);
+        return sendPhoto(new SendPhoto(chatId, photo.getFile()), caption, replyToMessageId, replyMarkup);
     }
 
     @Deprecated
     public SendResponse sendPhoto(Object chatId, InputFileBytes photo, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendPhoto(chatId, photo.getBytes(), caption, replyToMessageId, replyMarkup, true);
+        return sendPhoto(new SendPhoto(chatId, photo.getBytes()), caption, replyToMessageId, replyMarkup);
     }
 
-    private SendResponse sendPhoto(Object chatId, Object photo, String caption, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendPhoto request = new SendPhoto(chatId, photo, isMultipart);
+    private SendResponse sendPhoto(SendPhoto request, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
         if (caption != null) request.caption(caption);
         if (replyToMessageId != null) request.replyToMessageId(replyToMessageId);
         if (replyMarkup != null) request.replyMarkup(replyMarkup);
@@ -89,21 +88,20 @@ private SendResponse sendPhoto(Object chatId, Object photo, String caption, Inte
 
     @Deprecated
     public SendResponse sendAudio(Object chatId, String audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendAudio(chatId, audio, duration, performer, title, replyToMessageId, replyMarkup, false);
+        return sendAudio(new SendAudio(chatId, audio), duration, performer, title, replyToMessageId, replyMarkup, false);
     }
 
     @Deprecated
     public SendResponse sendAudio(Object chatId, InputFile audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendAudio(chatId, audio.getFile(), duration, performer, title, replyToMessageId, replyMarkup, true);
+        return sendAudio(new SendAudio(chatId, audio.getFile()), duration, performer, title, replyToMessageId, replyMarkup, true);
     }
 
     @Deprecated
     public SendResponse sendAudio(Object chatId, InputFileBytes audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendAudio(chatId, audio.getBytes(), duration, performer, title, replyToMessageId, replyMarkup, true);
+        return sendAudio(new SendAudio(chatId, audio.getBytes()), duration, performer, title, replyToMessageId, replyMarkup, true);
     }
 
-    private SendResponse sendAudio(Object chatId, Object audio, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendAudio request = new SendAudio(chatId, audio, isMultipart);
+    private SendResponse sendAudio(SendAudio request, Integer duration, String performer, String title, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
         if (duration != null) request.duration(duration);
         if (performer != null) request.performer(performer);
         if (title != null) request.title(title);
@@ -114,65 +112,62 @@ private SendResponse sendAudio(Object chatId, Object audio, Integer duration, St
 
     @Deprecated
     public SendResponse sendDocument(Object chatId, String document, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendDocument(chatId, document, replyToMessageId, replyMarkup, false);
+        return sendDocument(new SendDocument(chatId, document), replyToMessageId, replyMarkup, false);
     }
 
     @Deprecated
     public SendResponse sendDocument(Object chatId, InputFile document, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendDocument(chatId, document.getFile(), replyToMessageId, replyMarkup, true);
+        return sendDocument(new SendDocument(chatId, document.getFile()), replyToMessageId, replyMarkup, true);
     }
 
     @Deprecated
     public SendResponse sendDocument(Object chatId, InputFileBytes document, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendDocument(chatId, document.getBytes(), replyToMessageId, replyMarkup, true);
+        return sendDocument(new SendDocument(chatId, document.getBytes()), replyToMessageId, replyMarkup, true);
     }
 
-    private SendResponse sendDocument(Object chatId, Object document, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendDocument request = new SendDocument(chatId, document, isMultipart);
+    private SendResponse sendDocument(SendDocument request, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
         if (replyToMessageId != null) request.replyToMessageId(replyToMessageId);
         if (replyMarkup != null) request.replyMarkup(replyMarkup);
         return execute(request);
     }
 
     @Deprecated
     public SendResponse sendSticker(Object chatId, String sticker, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendSticker(chatId, sticker, replyToMessageId, replyMarkup, false);
+        return sendSticker(new SendSticker(chatId, sticker), replyToMessageId, replyMarkup, false);
     }
 
     @Deprecated
     public SendResponse sendSticker(Object chatId, InputFile sticker, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendSticker(chatId, sticker.getFile(), replyToMessageId, replyMarkup, true);
+        return sendSticker(new SendSticker(chatId, sticker.getFile()), replyToMessageId, replyMarkup, true);
     }
 
     @Deprecated
     public SendResponse sendSticker(Object chatId, InputFileBytes sticker, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendSticker(chatId, sticker.getBytes(), replyToMessageId, replyMarkup, true);
+        return sendSticker(new SendSticker(chatId, sticker.getBytes()), replyToMessageId, replyMarkup, true);
     }
 
-    private SendResponse sendSticker(Object chatId, Object sticker, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendSticker request = new SendSticker(chatId, sticker, isMultipart);
+    private SendResponse sendSticker(SendSticker request, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
         if (replyToMessageId != null) request.replyToMessageId(replyToMessageId);
         if (replyMarkup != null) request.replyMarkup(replyMarkup);
         return execute(request);
     }
 
     @Deprecated
     public SendResponse sendVideo(Object chatId, String video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVideo(chatId, video, duration, caption, replyToMessageId, replyMarkup, false);
+        return sendVideo(new SendVideo(chatId, video), duration, caption, replyToMessageId, replyMarkup, false);
     }
 
     @Deprecated
     public SendResponse sendVideo(Object chatId, InputFile video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVideo(chatId, video.getFile(), duration, caption, replyToMessageId, replyMarkup, true);
+        return sendVideo(new SendVideo(chatId, video.getFile()), duration, caption, replyToMessageId, replyMarkup, true);
     }
 
     @Deprecated
     public SendResponse sendVideo(Object chatId, InputFileBytes video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVideo(chatId, video.getBytes(), duration, caption, replyToMessageId, replyMarkup, true);
+        return sendVideo(new SendVideo(chatId, video.getBytes()), duration, caption, replyToMessageId, replyMarkup, true);
     }
 
-    private SendResponse sendVideo(Object chatId, Object video, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendVideo request = new SendVideo(chatId, video, isMultipart);
+    private SendResponse sendVideo(SendVideo request, Integer duration, String caption, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
         if (duration != null) request.duration(duration);
         if (caption != null) request.caption(caption);
         if (replyToMessageId != null) request.replyToMessageId(replyToMessageId);
@@ -182,21 +177,20 @@ private SendResponse sendVideo(Object chatId, Object video, Integer duration, St
 
     @Deprecated
     public SendResponse sendVoice(Object chatId, String voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVoice(chatId, voice, duration, replyToMessageId, replyMarkup, false);
+        return sendVoice(new SendVoice(chatId, voice), duration, replyToMessageId, replyMarkup, false);
     }
 
     @Deprecated
     public SendResponse sendVoice(Object chatId, InputFile voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVoice(chatId, voice.getFile(), duration, replyToMessageId, replyMarkup, true);
+        return sendVoice(new SendVoice(chatId, voice.getFile()), duration, replyToMessageId, replyMarkup, true);
     }
 
     @Deprecated
     public SendResponse sendVoice(Object chatId, InputFileBytes voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup) {
-        return sendVoice(chatId, voice.getBytes(), duration, replyToMessageId, replyMarkup, true);
+        return sendVoice(new SendVoice(chatId, voice.getBytes()), duration, replyToMessageId, replyMarkup, true);
     }
 
-    private SendResponse sendVoice(Object chatId, Object voice, Integer duration, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
-        SendVoice request = new SendVoice(chatId, voice, isMultipart);
+    private SendResponse sendVoice(SendVoice request, Integer duration, Integer replyToMessageId, Keyboard replyMarkup, boolean isMultipart) {
         if (duration != null) request.duration(duration);
         if (replyToMessageId != null) request.replyToMessageId(replyToMessageId);
         if (replyMarkup != null) request.replyMarkup(replyMarkup);

src/main/java/com/pengrad/telegrambot/request/AbstractMultipartRequest.java

@@ -1,5 +1,7 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/1/16.
@@ -8,16 +10,25 @@ abstract public class AbstractMultipartRequest<T extends AbstractMultipartReques
 
     private final boolean isMultipart;
 
-    public AbstractMultipartRequest(Object chatId, boolean isMultipart) {
+    public AbstractMultipartRequest(Object chatId, Object file) {
         super(chatId);
-        this.isMultipart = isMultipart;
+        if (file instanceof String) {
+            isMultipart = false;
+        } else if (file instanceof File || file instanceof byte[]) {
+            isMultipart = true;
+        } else {
+            throw new IllegalArgumentException("Sending data should be String, File or byte[]");
+        }
+        add(getFileParamName(), file);
     }
 
     @Override
     public boolean isMultipart() {
         return isMultipart;
     }
 
+    abstract protected String getFileParamName();
+
     @Override
     abstract public String getFileName();
 

src/main/java/com/pengrad/telegrambot/request/SendAudio.java

@@ -1,14 +1,23 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/2/16.
  */
 public class SendAudio extends AbstractMultipartRequest<SendAudio> {
 
-    public SendAudio(Object chatId, Object audio, boolean isMultipart) {
-        super(chatId, isMultipart);
-        add("audio", audio);
+    public SendAudio(Object chatId, String audio) {
+        super(chatId, audio);
+    }
+
+    public SendAudio(Object chatId, File audio) {
+        super(chatId, audio);
+    }
+
+    public SendAudio(Object chatId, byte[] audio) {
+        super(chatId, audio);
     }
 
     public SendAudio duration(int duration) {
@@ -23,6 +32,11 @@ public SendAudio title(String title) {
         return add("title", title);
     }
 
+    @Override
+    protected String getFileParamName() {
+        return "audio";
+    }
+
     @Override
     public String getFileName() {
         return ContentTypes.AUDIO_FILE_NAME;

src/main/java/com/pengrad/telegrambot/request/SendDocument.java

@@ -1,20 +1,34 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/2/16.
  */
 public class SendDocument extends AbstractMultipartRequest<SendDocument> {
 
-    public SendDocument(Object chatId, Object document, boolean isMultipart) {
-        super(chatId, isMultipart);
-        add("document", document);
+    public SendDocument(Object chatId, String document) {
+        super(chatId, document);
+    }
+
+    public SendDocument(Object chatId, File document) {
+        super(chatId, document);
+    }
+
+    public SendDocument(Object chatId, byte[] document) {
+        super(chatId, document);
     }
 
     public SendDocument caption(String caption) {
         return add("caption", caption);
     }
 
+    @Override
+    protected String getFileParamName() {
+        return "document";
+    }
+
     @Override
     public String getFileName() {
         return ContentTypes.DOC_FILE_NAME;

src/main/java/com/pengrad/telegrambot/request/SendPhoto.java

@@ -1,20 +1,34 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/1/16.
  */
 public class SendPhoto extends AbstractMultipartRequest<SendPhoto> {
 
-    public SendPhoto(Object chatId, Object photo, boolean isMultipart) {
-        super(chatId, isMultipart);
-        add("photo", photo);
+    public SendPhoto(Object chatId, String photo) {
+        super(chatId, photo);
+    }
+
+    public SendPhoto(Object chatId, File photo) {
+        super(chatId, photo);
+    }
+
+    public SendPhoto(Object chatId, byte[] photo) {
+        super(chatId, photo);
     }
 
     public SendPhoto caption(String caption) {
         return add("caption", caption);
     }
 
+    @Override
+    protected String getFileParamName() {
+        return "photo";
+    }
+
     @Override
     public String getFileName() {
         return ContentTypes.PHOTO_FILE_NAME;

src/main/java/com/pengrad/telegrambot/request/SendSticker.java

@@ -1,14 +1,28 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/2/16.
  */
 public class SendSticker extends AbstractMultipartRequest<SendSticker> {
 
-    public SendSticker(Object chatId, Object sticker, boolean isMultipart) {
-        super(chatId, isMultipart);
-        add("sticker", sticker);
+    public SendSticker(Object chatId, String sticker) {
+        super(chatId, sticker);
+    }
+
+    public SendSticker(Object chatId, File sticker) {
+        super(chatId, sticker);
+    }
+
+    public SendSticker(Object chatId, byte[] sticker) {
+        super(chatId, sticker);
+    }
+
+    @Override
+    protected String getFileParamName() {
+        return "sticker";
     }
 
     @Override

src/main/java/com/pengrad/telegrambot/request/SendVideo.java

@@ -1,14 +1,23 @@
 package com.pengrad.telegrambot.request;
 
+import java.io.File;
+
 /**
  * stas
  * 5/1/16.
  */
 public class SendVideo extends AbstractMultipartRequest<SendVideo> {
 
-    public SendVideo(Object chatId, Object video, boolean isMultipart) {
-        super(chatId, isMultipart);
-        add("video", video);
+    public SendVideo(Object chatId, String video) {
+        super(chatId, video);
+    }
+
+    public SendVideo(Object chatId, File video) {
+        super(chatId, video);
+    }
+
+    public SendVideo(Object chatId, byte[] video) {
+        super(chatId, video);
     }
 
     public SendVideo duration(int duration) {
@@ -27,6 +36,11 @@ public SendVideo caption(String caption) {
         return add("caption", caption);
     }
 
+    @Override
+    protected String getFileParamName() {
+        return "video";
+    }
+
     @Override
     public String getFileName() {
         return ContentTypes.VIDEO_FILE_NAME;