diff --git a/README.md b/README.md index 9f96685c..226d87b8 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,12 @@ Just import add the library to your project with one of these options: org.telegram telegrambots - 2.4.2 + 2.4.3 ``` - 2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/v2.4.2) - 3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/v2.4.2) + 2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/v2.4.3) + 3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/v2.4.3) In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`. diff --git a/TelegramBots.wiki/Changelog.md b/TelegramBots.wiki/Changelog.md index 24b3bb17..de57c861 100644 --- a/TelegramBots.wiki/Changelog.md +++ b/TelegramBots.wiki/Changelog.md @@ -1,4 +1,4 @@ -### 2.4.2 ### +### 2.4.3 ### 1. Split library in two modules to allow custom implementations. 2. Use [Guice](https://github.com/google/guice) for dependency injection. 3. Use [Jackson](https://github.com/FasterXML/jackson) for json (de)serialization. @@ -8,4 +8,4 @@ 7. In `SentCallback` method `onError` changed second parameter to `TelegramApiRequestException` and `onResult` now receives the deserialized answer (of type `T`) instead of a `JSONObject` as second parameter 8. Moved to MIT license -**[[How to update to version 2.4.2|How-To-Update#2.4.2]]** \ No newline at end of file +**[[How to update to version 2.4.3|How-To-Update#2.4.3]]** \ No newline at end of file diff --git a/TelegramBots.wiki/Getting-Started.md b/TelegramBots.wiki/Getting-Started.md index ac48aaa6..70fa7a54 100644 --- a/TelegramBots.wiki/Getting-Started.md +++ b/TelegramBots.wiki/Getting-Started.md @@ -11,13 +11,13 @@ First you need ot get the library and add it to your project. There are few poss org.telegram telegrambots - 2.4.2 + 2.4.3 ``` * With **Gradle**: ```groovy - compile group: 'org.telegram', name: 'telegrambots', version: '2.4.2' + compile group: 'org.telegram', name: 'telegrambots', version: '2.4.3' ``` 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots). diff --git a/TelegramBots.wiki/How-To-Update.md b/TelegramBots.wiki/How-To-Update.md index 572218e8..4a745d69 100644 --- a/TelegramBots.wiki/How-To-Update.md +++ b/TelegramBots.wiki/How-To-Update.md @@ -1,4 +1,4 @@ -### To version 2.4.2 ### +### To version 2.4.3 ### 1. Replace `BotOptions` by `DefaultBotOptions`. 2. At the beginning of your program (before creating your `TelegramBotsApi` instance, add the following line: ```java diff --git a/pom.xml b/pom.xml index 0292ae79..c0590f52 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 2.4.2 + 2.4.3 telegrambots @@ -24,6 +24,6 @@ true - 2.4.2 + 2.4.3 \ No newline at end of file diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index 77529b38..abfe64e2 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.telegram telegrambots-meta - 2.4.2 + 2.4.3 jar Telegram Bots Meta diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java index 9c8a3218..ba4e4c41 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java @@ -27,7 +27,7 @@ public class InlineQueryResultArticle implements InlineQueryResult { private static final String THUMBHEIGHT_FIELD = "thumb_height"; @JsonProperty(TYPE_FIELD) - private static final String type = "article"; ///< Type of the result, must be “article” + private final String type = "article"; ///< Type of the result, must be “article” @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(TITLE_FIELD) @@ -53,7 +53,7 @@ public class InlineQueryResultArticle implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java index fd3d70d9..9cb42c4b 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java @@ -29,7 +29,7 @@ public class InlineQueryResultAudio implements InlineQueryResult { private static final String CAPTION_FIELD = "caption"; @JsonProperty(TYPE_FIELD) - private static final String type = "audio"; ///< Type of the result, must be "audio" + private final String type = "audio"; ///< Type of the result, must be "audio" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result @JsonProperty(AUDIOURL_FIELD) @@ -51,7 +51,7 @@ public class InlineQueryResultAudio implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java index aa5aafe6..33522758 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java @@ -30,7 +30,7 @@ public class InlineQueryResultContact implements InlineQueryResult { private static final String THUMBHEIGHT_FIELD = "thumb_height"; @JsonProperty(TYPE_FIELD) - private static final String type = "contact"; ///< Type of the result, must be "contact" + private final String type = "contact"; ///< Type of the result, must be "contact" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(PHONE_NUMBER_FIELD) @@ -54,7 +54,7 @@ public class InlineQueryResultContact implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java index f9b38a2c..a63f8dc6 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java @@ -33,7 +33,7 @@ public class InlineQueryResultDocument implements InlineQueryResult { private static final String THUMBHEIGHT_FIELD = "thumb_height"; @JsonProperty(TYPE_FIELD) - private static final String type = "document"; ///< Type of the result, must be "document" + private final String type = "document"; ///< Type of the result, must be "document" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(TITLE_FIELD) @@ -61,7 +61,7 @@ public class InlineQueryResultDocument implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java index 7b4cfbfa..04832e8f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGame.java @@ -37,7 +37,7 @@ public class InlineQueryResultGame implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "game"; ///< Type of the result, must be "game" + private final String type = "game"; ///< Type of the result, must be "game" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(GAMESHORTNAME_FIELD) @@ -49,7 +49,7 @@ public class InlineQueryResultGame implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java index 660b846e..617a2ccc 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java @@ -28,7 +28,7 @@ public class InlineQueryResultGif implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "gif"; ///< Type of the result, must be "gif" + private final String type = "gif"; ///< Type of the result, must be "gif" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(GIFURL_FIELD) @@ -52,7 +52,7 @@ public class InlineQueryResultGif implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java index 34085786..fa3b973d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java @@ -30,7 +30,7 @@ public class InlineQueryResultLocation implements InlineQueryResult { private static final String THUMBHEIGHT_FIELD = "thumb_height"; @JsonProperty(TYPE_FIELD) - private static final String type = "location"; ///< Type of the result, must be "location" + private final String type = "location"; ///< Type of the result, must be "location" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(TITLE_FIELD) @@ -54,7 +54,7 @@ public class InlineQueryResultLocation implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java index 6e3e38ab..6ee2afce 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java @@ -28,7 +28,7 @@ public class InlineQueryResultMpeg4Gif implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "mpeg4_gif"; ///< Type of the result, must be "mpeg4_gif" + private final String type = "mpeg4_gif"; ///< Type of the result, must be "mpeg4_gif" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(MPEG4URL_FIELD) @@ -52,7 +52,7 @@ public class InlineQueryResultMpeg4Gif implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java index ccfa2796..e9d6490d 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java @@ -30,7 +30,7 @@ public class InlineQueryResultPhoto implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "photo"; ///< Type of the result, must be “photo” + private final String type = "photo"; ///< Type of the result, must be “photo” @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(PHOTOURL_FIELD) @@ -58,7 +58,7 @@ public class InlineQueryResultPhoto implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java index 9b3f3cd1..894e7e29 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java @@ -31,7 +31,7 @@ public class InlineQueryResultVenue implements InlineQueryResult { private static final String THUMBHEIGHT_FIELD = "thumb_height"; @JsonProperty(TYPE_FIELD) - private static final String type = "venue"; ///< Type of the result, must be "venue" + private final String type = "venue"; ///< Type of the result, must be "venue" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(TITLE_FIELD) @@ -59,7 +59,7 @@ public class InlineQueryResultVenue implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java index 23aa4891..30978694 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java @@ -31,7 +31,7 @@ public class InlineQueryResultVideo implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "video"; ///< Type of the result, must be "video" + private final String type = "video"; ///< Type of the result, must be "video" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result @JsonProperty(MIMETYPE_FIELD) @@ -61,7 +61,7 @@ public class InlineQueryResultVideo implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java index d72748b9..8cab871f 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java @@ -28,7 +28,7 @@ public class InlineQueryResultVoice implements InlineQueryResult { private static final String CAPTION_FIELD = "caption"; @JsonProperty(TYPE_FIELD) - private static final String type = "voice"; ///< Type of the result, must be "voice" + private final String type = "voice"; ///< Type of the result, must be "voice" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(VOICEURL_FIELD) @@ -48,7 +48,7 @@ public class InlineQueryResultVoice implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java index 3413e3de..3478e0ba 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java @@ -27,7 +27,7 @@ public class InlineQueryResultCachedAudio implements InlineQueryResult { private static final String CAPTION_FIELD = "caption"; @JsonProperty(TYPE_FIELD) - private static final String type = "audio"; ///< Type of the result, must be "audio" + private final String type = "audio"; ///< Type of the result, must be "audio" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result @JsonProperty(AUDIO_FILE_ID_FIELD) @@ -43,7 +43,7 @@ public class InlineQueryResultCachedAudio implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java index 684b3e24..5d0bdbbd 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java @@ -30,7 +30,7 @@ public class InlineQueryResultCachedDocument implements InlineQueryResult { private static final String INPUTMESSAGECONTENT_FIELD = "input_message_content"; @JsonProperty(TYPE_FIELD) - private static final String type = "document"; ///< Type of the result, must be "document" + private final String type = "document"; ///< Type of the result, must be "document" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(TITLE_FIELD) @@ -50,7 +50,7 @@ public class InlineQueryResultCachedDocument implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java index 4a3dbe74..9c8e4a75 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java @@ -26,7 +26,7 @@ public class InlineQueryResultCachedGif implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "gif"; ///< Type of the result, must be "gif" + private final String type = "gif"; ///< Type of the result, must be "gif" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(GIF_FILE_ID_FIELD) @@ -44,7 +44,7 @@ public class InlineQueryResultCachedGif implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java index 635e1454..cf840cc4 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java @@ -26,7 +26,7 @@ public class InlineQueryResultCachedMpeg4Gif implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "mpeg4_gif"; ///< Type of the result, must be "mpeg4_gif" + private final String type = "mpeg4_gif"; ///< Type of the result, must be "mpeg4_gif" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(MPEG4_FILE_ID_FIELD) @@ -44,7 +44,7 @@ public class InlineQueryResultCachedMpeg4Gif implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java index 388e1cd5..b15b5146 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java @@ -27,7 +27,7 @@ public class InlineQueryResultCachedPhoto implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "photo"; ///< Type of the result, must be “photo” + private final String type = "photo"; ///< Type of the result, must be “photo” @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(PHOTOFILEID_FIELD) @@ -47,7 +47,7 @@ public class InlineQueryResultCachedPhoto implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java index f23a9400..b19f313a 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java @@ -26,7 +26,7 @@ public class InlineQueryResultCachedSticker implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "sticker"; ///< Type of the result, must be "sticker" + private final String type = "sticker"; ///< Type of the result, must be "sticker" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(STICKER_FILE_ID_FIELD) @@ -40,7 +40,7 @@ public class InlineQueryResultCachedSticker implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java index 7cb46bff..c0a526fb 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java @@ -27,7 +27,7 @@ public class InlineQueryResultCachedVideo implements InlineQueryResult { private static final String REPLY_MARKUP_FIELD = "reply_markup"; @JsonProperty(TYPE_FIELD) - private static final String type = "video"; ///< Type of the result, must be "video" + private final String type = "video"; ///< Type of the result, must be "video" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result @JsonProperty(VIDEO_FILE_ID_FIELD) @@ -47,7 +47,7 @@ public class InlineQueryResultCachedVideo implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java index 700f8f3b..5a3539d2 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java @@ -28,7 +28,7 @@ public class InlineQueryResultCachedVoice implements InlineQueryResult { private static final String CAPTION_FIELD = "caption"; @JsonProperty(TYPE_FIELD) - private static final String type = "voice"; ///< Type of the result, must be "voice" + private final String type = "voice"; ///< Type of the result, must be "voice" @JsonProperty(ID_FIELD) private String id; ///< Unique identifier of this result, 1-64 bytes @JsonProperty(VOICE_FILE_ID_FIELD) @@ -46,7 +46,7 @@ public class InlineQueryResultCachedVoice implements InlineQueryResult { super(); } - public static String getType() { + public String getType() { return type; } diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index fbbf2e76..4e10e0ab 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.telegram telegrambots - 2.4.2 + 2.4.3 jar Telegram Bots @@ -60,7 +60,7 @@ 20160810 2.8.5 2.5 - 2.4.2 + 2.4.3 diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/TestRestApi.java b/telegrambots/src/test/java/org/telegram/telegrambots/TestRestApi.java index 24e9e8b1..4ae43859 100644 --- a/telegrambots/src/test/java/org/telegram/telegrambots/TestRestApi.java +++ b/telegrambots/src/test/java/org/telegram/telegrambots/TestRestApi.java @@ -108,7 +108,7 @@ public class TestRestApi extends JerseyTest { assertEquals("{\"inline_query_id\":\"id\",\"results\":[{\"@class\":\"org." + "telegram.telegrambots.api.objects.inlinequery.result.InlineQueryResultArticle\"," + - "\"id\":\"0\",\"title\":\"Title\",\"input_message_content\":{\"@class\":\"org." + + "\"type\":\"article\",\"id\":\"0\",\"title\":\"Title\",\"input_message_content\":{\"@class\":\"org." + "telegram.telegrambots.api.objects.inlinequery.inputmessagecontent." + "InputTextMessageContent\",\"message_text\":\"Text\",\"parse_mode\":\"Markdown\"}," + "\"reply_markup\":{\"@class\":\"org.telegram.telegrambots.api.objects.replykeyboard" + @@ -117,7 +117,7 @@ public class TestRestApi extends JerseyTest { "\"Button1\",\"callback_data\":\"Callback\"}]]},\"url\":\"Url\",\"hide_url\":false," + "\"description\":\"Description\",\"thumb_url\":\"ThumbUrl\",\"thumb_width\":10," + "\"thumb_height\":20},{\"@class\":\"org.telegram.telegrambots.api.objects." + - "inlinequery.result.InlineQueryResultPhoto\",\"id\":\"1\",\"photo_url\":\"PhotoUrl" + + "inlinequery.result.InlineQueryResultPhoto\",\"type\":\"photo\",\"id\":\"1\",\"photo_url\":\"PhotoUrl" + "\",\"mime_type\":\"image/jpg\",\"photo_width\":10,\"photo_height\":20,\"thumb_url" + "\":\"ThumbUrl\",\"title\":\"Title\",\"description\":\"Description\",\"caption\":" + "\"Caption\",\"input_message_content\":{\"@class\":\"org.telegram.telegrambots." +