Merge pull request #422 from pengrad/issue-419

Rewrite all AbstractSendRequest & AbstractMultipartRequest requests to Kotlin

Author: pengrad

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

@@ -3,7 +3,7 @@ package com.pengrad.telegrambot.request
 import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
 import java.io.File
 
-abstract class KAbstractMultipartRequest<REQ : KAbstractMultipartRequest<REQ>>(
+abstract class AbstractMultipartRequest<REQ : AbstractMultipartRequest<REQ>>(
     chatId: Long?,
     channelUsername: String?,
 
@@ -14,7 +14,7 @@ abstract class KAbstractMultipartRequest<REQ : KAbstractMultipartRequest<REQ>>(
 
     defaultFileName: String,
     defaultContentType: String
-) : KAbstractSendRequest<REQ>(
+) : AbstractSendRequest<REQ>(
     chatId = chatId,
     channelUsername = channelUsername
 ) {
@@ -23,29 +23,20 @@ abstract class KAbstractMultipartRequest<REQ : KAbstractMultipartRequest<REQ>>(
     val contentFile by optionalRequestParameter(contentFile, customParameterName = contentParameterName)
     val contentBytes by optionalRequestParameter(contentBytes, customParameterName = contentParameterName)
 
-    var thumbnailFile: File? by optionalRequestParameter(customParameterName = "thumbnail")
-    var thumbnailBytes: ByteArray? by optionalRequestParameter(customParameterName = "thumbnail")
-
-    @get:JvmName("isUseMultipart")
-    val isMultipart: Boolean
+    open val isMultipartRequest: Boolean
         get() = contentFile != null || contentBytes != null
-                || thumbnailFile != null || thumbnailBytes != null
 
     @get:JvmName("getContentFileName")
     var fileName: String = contentFile?.name ?: defaultFileName
 
     @get:JvmName("getContentMimeType")
     var contentType: String = defaultContentType
 
-    fun thumbnail(thumbnail: File) = applySelf { this.thumbnailFile = thumbnail }
-
-    fun thumbnail(thumbnail: ByteArray) = applySelf { this.thumbnailBytes = thumbnail }
-
     fun fileName(fileName: String) = applySelf { this.fileName = fileName }
 
     fun contentType(contentType: String) = applySelf { this.contentType = contentType }
 
-    override fun isMultipart() = isMultipart
+    override fun isMultipart() = isMultipartRequest
 
     override fun getFileName() = fileName
 

library/src/main/java/com/pengrad/telegrambot/request/KAbstractMultipartRequest.kt renamed to library/src/main/java/com/pengrad/telegrambot/request/AbstractMultipartRequest.kt

@@ -5,7 +5,7 @@ import com.pengrad.telegrambot.model.request.ReplyParameters
 import com.pengrad.telegrambot.response.SendResponse
 import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
 
-abstract class KAbstractSendRequest<REQ : KAbstractSendRequest<REQ>>(
+abstract class AbstractSendRequest<REQ : AbstractSendRequest<REQ>>(
     chatId: Long?,
     channelUsername: String?
 ) : KBaseRequest<REQ, SendResponse>(SendResponse::class) {

library/src/main/java/com/pengrad/telegrambot/request/AbstractSendRequest.java

@@ -0,0 +1,41 @@
+package com.pengrad.telegrambot.request
+
+import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
+import java.io.File
+
+abstract class AbstractThumbnailedMultipartRequest<REQ : AbstractThumbnailedMultipartRequest<REQ>>(
+    chatId: Long?,
+    channelUsername: String?,
+
+    contentParameterName: String,
+    contentUrl: String?,
+    contentFile: File?,
+    contentBytes: ByteArray?,
+
+    defaultFileName: String,
+    defaultContentType: String
+) : AbstractMultipartRequest<REQ>(
+    chatId = chatId,
+    channelUsername = channelUsername,
+
+    contentParameterName = contentParameterName,
+    contentUrl = contentUrl,
+    contentFile = contentFile,
+    contentBytes = contentBytes,
+
+    defaultFileName = defaultFileName,
+    defaultContentType = defaultContentType
+) {
+
+    var thumbnailFile: File? by optionalRequestParameter(customParameterName = "thumbnail")
+    var thumbnailBytes: ByteArray? by optionalRequestParameter(customParameterName = "thumbnail")
+
+    override val isMultipartRequest: Boolean
+        get() = super.isMultipartRequest
+                || thumbnailFile != null || thumbnailBytes != null
+
+    fun thumbnail(thumbnail: File) = applySelf { this.thumbnailFile = thumbnail }
+
+    fun thumbnail(thumbnail: ByteArray) = applySelf { this.thumbnailBytes = thumbnail }
+
+}