Skip to content

Commit de01317

Browse files
committed
Create JavaCompatabilityUtility
1 parent e012950 commit de01317

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

library/src/main/java/com/pengrad/telegrambot/request/CopyMessage.kt

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import com.pengrad.telegrambot.model.request.Keyboard
55
import com.pengrad.telegrambot.model.request.ParseMode
66
import com.pengrad.telegrambot.model.request.ReplyParameters
77
import com.pengrad.telegrambot.response.MessageIdResponse
8+
import com.pengrad.telegrambot.utility.kotlin.JavaInteger
9+
import com.pengrad.telegrambot.utility.kotlin.JavaLong
810
import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
911
import com.pengrad.telegrambot.utility.kotlin.requestParameter
1012

@@ -31,7 +33,7 @@ class CopyMessage private constructor(
3133
/**
3234
* Backwards-compatability for Java code
3335
*/
34-
constructor(chatId: java.lang.Long, fromChatId: java.lang.Long, messageId: Integer) : this(
36+
constructor(chatId: JavaLong, fromChatId: JavaLong, messageId: JavaInteger) : this(
3537
chatId = chatId.toLong(),
3638
fromChatId = fromChatId.toLong(),
3739
messageId = messageId.toInt()
@@ -51,7 +53,7 @@ class CopyMessage private constructor(
5153
/**
5254
* Backwards-compatability for Java code
5355
*/
54-
constructor(channelUsername: String, fromChatId: java.lang.Long, messageId: Integer) : this(
56+
constructor(channelUsername: String, fromChatId: JavaLong, messageId: JavaInteger) : this(
5557
channelUsername = channelUsername,
5658
fromChatId = fromChatId.toLong(),
5759
messageId = messageId.toInt()
@@ -71,7 +73,7 @@ class CopyMessage private constructor(
7173
/**
7274
* Backwards-compatability for Java code
7375
*/
74-
constructor(chatId: java.lang.Long, fromChannelUsername: String, messageId: Integer) : this(
76+
constructor(chatId: JavaLong, fromChannelUsername: String, messageId: JavaInteger) : this(
7577
chatId = chatId.toLong(),
7678
fromChannelUsername = fromChannelUsername,
7779
messageId = messageId.toInt()
@@ -91,7 +93,7 @@ class CopyMessage private constructor(
9193
/**
9294
* Backwards-compatability for Java code
9395
*/
94-
constructor(channelUsername: String, fromChannelUsername: String, messageId: Integer) : this(
96+
constructor(channelUsername: String, fromChannelUsername: String, messageId: JavaInteger) : this(
9597
channelUsername = channelUsername,
9698
fromChannelUsername = fromChannelUsername,
9799
messageId = messageId.toInt()
@@ -120,7 +122,7 @@ class CopyMessage private constructor(
120122
*/
121123
@Suppress("DEPRECATION")
122124
@Deprecated("Use constructor with chatId and fromChatId or channelUsername and fromChannelUsername instead", ReplaceWith("ForwardMessage(chatId, fromChatId, messageId)"))
123-
constructor(chatId: Any, fromChatId: Any, messageId: Integer) : this(
125+
constructor(chatId: Any, fromChatId: Any, messageId: JavaInteger) : this(
124126
chatId = chatId,
125127
fromChatId = fromChatId,
126128
messageId = messageId.toInt()

library/src/main/java/com/pengrad/telegrambot/request/ForwardMessage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
package com.pengrad.telegrambot.request
44

55
import com.pengrad.telegrambot.response.SendResponse
6+
import com.pengrad.telegrambot.utility.kotlin.JavaInteger
7+
import com.pengrad.telegrambot.utility.kotlin.JavaLong
68
import com.pengrad.telegrambot.utility.kotlin.optionalRequestParameter
79
import com.pengrad.telegrambot.utility.kotlin.requestParameter
8-
import java.lang.Integer as JavaInteger
9-
import java.lang.Long as JavaLong
1010

1111
class ForwardMessage private constructor(
1212
chatId: Long?,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
2+
3+
package com.pengrad.telegrambot.utility.kotlin
4+
5+
typealias JavaInteger = java.lang.Integer
6+
7+
typealias JavaLong = java.lang.Long

0 commit comments

Comments
 (0)