Add optional fileName for all multipart send requests

Author: pengrad

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

@@ -9,29 +9,46 @@
 abstract public class AbstractMultipartRequest<T extends AbstractMultipartRequest> extends AbstractSendRequest<T> {
 
     private final boolean isMultipart;
+    private String fileName;
 
     public AbstractMultipartRequest(Object chatId, Object file) {
         super(chatId);
         if (file instanceof String) {
             isMultipart = false;
-        } else if (file instanceof File || file instanceof byte[]) {
+        } else if (file instanceof File) {
+            isMultipart = true;
+            fileName = ((File) file).getName();
+        } else if (file instanceof byte[]) {
             isMultipart = true;
         } else {
             throw new IllegalArgumentException("Sending data should be String, File or byte[]");
         }
         add(getFileParamName(), file);
     }
 
+    public T fileName(String fileName) {
+        this.fileName = fileName;
+        return thisAsT;
+    }
+
     @Override
     public boolean isMultipart() {
         return isMultipart;
     }
 
-    abstract protected String getFileParamName();
-
     @Override
-    abstract public String getFileName();
+    public String getFileName() {
+        if (fileName != null && !fileName.isEmpty()) {
+            return fileName;
+        } else {
+            return getDefaultFileName();
+        }
+    }
 
     @Override
     abstract public String getContentType();
+
+    abstract protected String getDefaultFileName();
+
+    abstract protected String getFileParamName();
 }

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

@@ -38,7 +38,7 @@ protected String getFileParamName() {
     }
 
     @Override
-    public String getFileName() {
+    public String getDefaultFileName() {
         return ContentTypes.AUDIO_FILE_NAME;
     }
 

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

@@ -8,15 +8,12 @@
  */
 public class SendDocument extends AbstractMultipartRequest<SendDocument> {
 
-    private String fileName;
-
     public SendDocument(Object chatId, String document) {
         super(chatId, document);
     }
 
     public SendDocument(Object chatId, File document) {
         super(chatId, document);
-        fileName = document.getName();
     }
 
     public SendDocument(Object chatId, byte[] document) {
@@ -27,23 +24,14 @@ public SendDocument caption(String caption) {
         return add("caption", caption);
     }
 
-    public SendDocument fileName(String fileName) {
-        this.fileName = fileName;
-        return thisAsT;
-    }
-
     @Override
     protected String getFileParamName() {
         return "document";
     }
 
     @Override
-    public String getFileName() {
-        if (fileName != null && !fileName.isEmpty()) {
-            return fileName;
-        } else {
-            return ContentTypes.DOC_FILE_NAME;
-        }
+    public String getDefaultFileName() {
+        return ContentTypes.DOC_FILE_NAME;
     }
 
     @Override

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

@@ -30,7 +30,7 @@ protected String getFileParamName() {
     }
 
     @Override
-    public String getFileName() {
+    public String getDefaultFileName() {
         return ContentTypes.PHOTO_FILE_NAME;
     }
 

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

@@ -26,7 +26,7 @@ protected String getFileParamName() {
     }
 
     @Override
-    public String getFileName() {
+    public String getDefaultFileName() {
         return ContentTypes.PHOTO_FILE_NAME;
     }
 

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

@@ -42,7 +42,7 @@ protected String getFileParamName() {
     }
 
     @Override
-    public String getFileName() {
+    public String getDefaultFileName() {
         return ContentTypes.VIDEO_FILE_NAME;
     }
 

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

@@ -30,7 +30,7 @@ protected String getFileParamName() {
     }
 
     @Override
-    public String getFileName() {
+    public String getDefaultFileName() {
         return ContentTypes.VOICE_FILE_NAME;
     }
 

src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

@@ -132,7 +132,7 @@ public void sendAudio() {
 
     @Test
     public void sendDocument() {
-        SendDocument request = new SendDocument(chatId, new File(docFile)).caption("caption");
+        SendDocument request = new SendDocument(chatId, new File(docFile)).fileName("my doc.zip").caption("caption");
         SendResponse sendResponse = bot.execute(request);
         Message message = sendResponse.message();
         MessageTest.checkDocumentMessage(message);