Fix startTimestamp

Author: pengrad

library/src/main/java/com/pengrad/telegrambot/model/Video.kt

@@ -1,5 +1,7 @@
 package com.pengrad.telegrambot.model
 
+import com.pengrad.telegrambot.utility.kotlin.JavaInteger
+
 data class Video(
     @get:JvmName("fileId") val fileId: String,
     @get:JvmName("fileUniqueId") val fileUniqueId: String,
@@ -11,31 +13,27 @@ data class Video(
     @get:JvmName("thumbnail") val thumbnail: PhotoSize? = null,
     @get:JvmName("cover") val cover: List<PhotoSize>? = null,
 
-    @get:JvmName("start_timestamp") val startTimestamp: Int? = null,
+    @get:JvmName("startTimestamp") val startTimestamp: Int? = null,
 
     @get:JvmName("fileName") val fileName: String? = null,
     @get:JvmName("mimeType") val mimeType: String? = null,
-    @get:JvmName("fileSize") val fileSize: Long? = null,
-
+    @get:JvmName("fileSize") val fileSize: Long? = null
 ) {
 
     /**
      * Backwards compatability for Java code because of Kotlin optimization
      */
-    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
-    fun width() = width as Integer
+    fun width() = width as JavaInteger
 
     /**
      * Backwards compatability for Java code because of Kotlin optimization
      */
-    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
-    fun height() = height as Integer
+    fun height() = height as JavaInteger
 
     /**
      * Backwards compatability for Java code because of Kotlin optimization
      */
-    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
-    fun duration() = duration as Integer
+    fun duration() = duration as JavaInteger
 
     @Deprecated("Use thumbnail instead", ReplaceWith("thumbnail"))
     fun thumb(): PhotoSize? = thumbnail

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

@@ -398,9 +398,9 @@ public void answerInline() {
                         .thumbUrl(someUrl).thumbHeight(100).thumbWidth(100)
                         .thumbnailUrl(someUrl).thumbnailHeight(100).thumbnailWidth(100),
                 new InlineQueryResultVideo("15", someUrl, VIDEO_MIME_TYPE, someUrl, "title")
-                    .inputMessageContent(new InputTextMessageContent("text"))
-                    .caption("cap <b>bold</b>").parseMode(ParseMode.HTML)
-                    .videoWidth(100).videoHeight(100).videoDuration(100).description("desc"),
+                        .inputMessageContent(new InputTextMessageContent("text"))
+                        .caption("cap <b>bold</b>").parseMode(ParseMode.HTML)
+                        .videoWidth(100).videoHeight(100).videoDuration(100).description("desc"),
                 new InlineQueryResultVoice("16", someUrl, "title").caption("cap <b>bold</b>").parseMode(ParseMode.HTML).voiceDuration(100),
                 new InlineQueryResultCachedAudio("17", audioFileId).caption("cap <b>bold</b>").parseMode(ParseMode.HTML),
                 new InlineQueryResultCachedDocument("18", stickerId, "title").caption("cap <b>bold</b>").parseMode(ParseMode.HTML).description("desc"),
@@ -982,17 +982,17 @@ public void sendSticker() {
 
     @Test
     public void sendVideo() {
-        Message message = bot.execute(new SendVideo(chatId, videoFileId).hasSpoiler(true)).message();
+        Message message = bot.execute(new SendVideo(chatId.longValue(), videoFileId).hasSpoiler(true)).message();
         MessageTest.checkMessage(message);
         VideoTest.check(message.video(), false);
 
-        message = bot.execute(new SendVideo(chatId, videoFile)
-                .thumb(thumbFile)
+        message = bot.execute(new SendVideo(chatId.longValue(), videoFile)
+                .thumbnail(thumbFile)
                 .caption("caption").captionEntities(new MessageEntity(MessageEntity.Type.italic, 0, 7))
         ).message();
         MessageTest.checkMessage(message);
         VideoTest.check(message.video());
-        assertNotEquals("telegram should generate thumb", thumbSize, message.video().thumb().fileSize());
+        assertNotEquals("telegram should generate thumb", thumbSize, Objects.requireNonNull(message.video().thumbnail()).fileSize());
         assertEquals("tabs.mp4", message.video().fileName());
         MessageEntity captionEntity = message.captionEntities()[0];
         assertEquals(MessageEntity.Type.italic, captionEntity.type());
@@ -1001,22 +1001,24 @@ public void sendVideo() {
 
         String caption = "caption <b>bold</b>";
         int duration = 6;
+        int start = 2;
         message = bot.execute(
-                        new SendVideo(chatId, videoBytes).thumb(thumbBytes)
+                        new SendVideo(chatId.longValue(), videoBytes).thumbnail(thumbBytes)
                                 .caption(caption).parseMode(ParseMode.HTML)
-                                .duration(duration).height(1).width(2).supportsStreaming(true))
+                                .startTimestamp(start).duration(duration).height(1).width(2).supportsStreaming(true))
                 .message();
         System.out.println(message);
         MessageTest.checkMessage(message);
         assertEquals(caption.replace("<b>", "").replace("</b>", ""), message.caption());
 
         Video video = message.video();
         VideoTest.check(message.video());
+        assertEquals(start, Objects.requireNonNull(video.startTimestamp()).intValue());
         assertEquals(duration, video.duration().intValue());
         assertEquals(120, video.height().intValue());
         assertEquals(400, video.width().intValue());
         assertEquals("video/mp4", video.mimeType());
-        assertNotEquals("telegram should generate thumb", thumbSize, video.thumb().fileSize());
+        assertNotEquals("telegram should generate thumb", thumbSize, Objects.requireNonNull(video.thumbnail()).fileSize());
 
         captionEntity = message.captionEntities()[0];
         assertEquals(MessageEntity.Type.bold, captionEntity.type());