Merge pull request #38 from rubenlagus/dev

Merge Dev

README.md

@@ -13,7 +13,7 @@ I recommend using getUpdates methods.
 
 ## Usage
 
-Just import add the library to your project using [Maven, Gradly, ...](https://jitpack.io/#rubenlagus/TelegramBots/v2.0.2) or download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/v2.0.2)
+Just import add the library to your project using [Maven, Gradly, ...](https://jitpack.io/#rubenlagus/TelegramBots/v2.1) or download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/v2.1)
 
 In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.
 

pom.xml

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <groupId>org.telegram</groupId>
     <artifactId>telegrambots</artifactId>
-    <version>2.0.2</version>
+    <version>2.1</version>
 
     <name>Telegram Bots</name>
     <description>Easy to use library to create Telegram Bots</description>

src/main/java/org/telegram/telegrambots/TelegramBotsApi.java

@@ -15,7 +15,7 @@ import org.json.JSONObject;
 import org.telegram.telegrambots.api.methods.updates.SetWebhook;
 import org.telegram.telegrambots.bots.TelegramLongPollingBot;
 import org.telegram.telegrambots.bots.TelegramWebhookBot;
-import org.telegram.telegrambots.updatesreceivers.UpdatesThread;
+import org.telegram.telegrambots.updatesreceivers.BotSession;
 import org.telegram.telegrambots.updatesreceivers.Webhook;
 
 import java.io.File;
@@ -122,12 +122,12 @@ public class TelegramBotsApi {
     }
 
     /**
-     *
+     * Register a bot. The Bot Session is started immediately, and may be disconnected by calling close.
      * @param bot
      */
-    public void registerBot(TelegramLongPollingBot bot) throws TelegramApiException {
+    public BotSession registerBot(TelegramLongPollingBot bot) throws TelegramApiException {
         setWebhook(bot.getBotToken());
-        new UpdatesThread(bot.getBotToken(), bot);
+        return new BotSession(bot.getBotToken(), bot);
     }
 
     /**

src/main/java/org/telegram/telegrambots/api/methods/AnswerCallbackQuery.java

@@ -1,5 +1,6 @@
 package org.telegram.telegrambots.api.methods;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
@@ -24,8 +25,11 @@ public class AnswerCallbackQuery extends BotApiMethod<Boolean> {
     private static final String TEXT_FIELD = "text";
     private static final String SHOWALERT_FIELD = "show_alert";
 
+    @JsonProperty(CALLBACKQUERYID_FIELD)
     private String callbackQueryId; ///< Unique identifier for the query to be answered
+    @JsonProperty(TEXT_FIELD)
     private String text; ///< Text of the notification. If not specified, nothing will be shown to the user
+    @JsonProperty(SHOWALERT_FIELD)
     private Boolean showAlert; ///< Optional. If true, an alert will be shown by the client instead of a notificaiton at the top of the chat screen. Defaults to false.
 
 
@@ -33,6 +37,30 @@ public class AnswerCallbackQuery extends BotApiMethod<Boolean> {
         super();
     }
 
+    public String getCallbackQueryId() {
+        return this.callbackQueryId;
+    }
+
+    public void setCallbackQueryId(String callbackQueryId) {
+        this.callbackQueryId = callbackQueryId;
+    }
+
+    public String getText() {
+        return this.text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Boolean getShowAlert() {
+        return this.showAlert;
+    }
+
+    public void setShowAlert(Boolean showAlert) {
+        this.showAlert = showAlert;
+    }
+
     @Override
     public JSONObject toJson() {
         JSONObject jsonObject = new JSONObject();

src/main/java/org/telegram/telegrambots/api/methods/AnswerInlineQuery.java

@@ -44,56 +44,63 @@ public class AnswerInlineQuery extends BotApiMethod<Boolean> {
         return inlineQueryId;
     }
 
-    public void setInlineQueryId(String inlineQueryId) {
+    public AnswerInlineQuery setInlineQueryId(String inlineQueryId) {
         this.inlineQueryId = inlineQueryId;
+        return this;
     }
 
     public List<InlineQueryResult> getResults() {
         return results;
     }
 
-    public void setResults(List<InlineQueryResult> results) {
+    public AnswerInlineQuery setResults(List<InlineQueryResult> results) {
         this.results = results;
+        return this;
     }
 
     public Integer getCacheTime() {
         return cacheTime;
     }
 
-    public void setCacheTime(Integer cacheTime) {
+    public AnswerInlineQuery setCacheTime(Integer cacheTime) {
         this.cacheTime = cacheTime;
+        return this;
     }
 
     public Boolean getPersonal() {
         return isPersonal;
     }
 
-    public void setPersonal(Boolean personal) {
+    public AnswerInlineQuery setPersonal(Boolean personal) {
         isPersonal = personal;
+        return this;
     }
 
     public String getNextOffset() {
         return nextOffset;
     }
 
-    public void setNextOffset(String nextOffset) {
+    public AnswerInlineQuery setNextOffset(String nextOffset) {
         this.nextOffset = nextOffset;
+        return this;
     }
 
     public String getSwitchPmText() {
         return switchPmText;
     }
 
-    public void setSwitchPmText(String switchPmText) {
+    public AnswerInlineQuery setSwitchPmText(String switchPmText) {
         this.switchPmText = switchPmText;
+        return this;
     }
 
     public String getSwitchPmParameter() {
         return switchPmParameter;
     }
 
-    public void setSwitchPmParameter(String switchPmParameter) {
+    public AnswerInlineQuery setSwitchPmParameter(String switchPmParameter) {
         this.switchPmParameter = switchPmParameter;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/ForwardMessage.java

@@ -42,24 +42,27 @@ public class ForwardMessage extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public ForwardMessage setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getFromChatId() {
         return fromChatId;
     }
 
-    public void setFromChatId(Integer fromChatId) {
+    public ForwardMessage setFromChatId(Integer fromChatId) {
         this.fromChatId = fromChatId;
+        return this;
     }
 
     public Integer getMessageId() {
         return messageId;
     }
 
-    public void setMessageId(Integer messageId) {
+    public ForwardMessage setMessageId(Integer messageId) {
         this.messageId = messageId;
+        return this;
     }
 
     public Boolean getDisableNotification() {

src/main/java/org/telegram/telegrambots/api/methods/GetFile.java

@@ -36,8 +36,9 @@ public class GetFile extends BotApiMethod<File> {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
+    public GetFile setFileId(String fileId) {
         this.fileId = fileId;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/GetUserProfilePhotos.java

@@ -41,25 +41,29 @@ public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public GetUserProfilePhotos setUserId(Integer userId) {
         this.userId = userId;
+        return this;
     }
 
     public Integer getOffset() {
         return offset;
     }
 
-    public void setOffset(Integer offset) {
+    public GetUserProfilePhotos setOffset(Integer offset) {
         this.offset = offset;
+        return this;
     }
 
     public Integer getLimit() {
         return limit;
     }
 
-    public void setLimit(Integer limit) {
+    public GetUserProfilePhotos setLimit(Integer limit) {
         this.limit = limit;
+        return this;
     }
+
     @Override
     public JSONObject toJson() {
         JSONObject jsonObject = new JSONObject();

src/main/java/org/telegram/telegrambots/api/methods/groupadministration/KickChatMember.java

@@ -38,16 +38,18 @@ public class KickChatMember extends BotApiMethod<Boolean> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public KickChatMember setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public KickChatMember setUserId(Integer userId) {
         this.userId = userId;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/groupadministration/UnbanChatMember.java

@@ -34,16 +34,18 @@ public class UnbanChatMember extends BotApiMethod<Boolean> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public UnbanChatMember setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public UnbanChatMember setUserId(Integer userId) {
         this.userId = userId;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendAudio.java

@@ -47,16 +47,18 @@ public class SendAudio {
         return this.duration;
     }
 
-    public void setDuration(Integer duration) {
+    public SendAudio setDuration(Integer duration) {
         this.duration = duration;
+        return this;
     }
 
     public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendAudio setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getAudio() {
@@ -69,9 +71,10 @@ public class SendAudio {
      * @param audio File_id of the audio to send
      * @note The file_id must have already been received or sent by your bot
      */
-    public void setAudio(String audio) {
+    public SendAudio setAudio(String audio) {
         this.audio = audio;
         this.isNewAudio = false;
+        return this;
     }
 
     /**
@@ -80,54 +83,61 @@ public class SendAudio {
      * @param audio     Path to the new file in your server
      * @param audioName Name of the file itself
      */
-    public void setNewAudio(String audio, String audioName) {
+    public SendAudio setNewAudio(String audio, String audioName) {
         this.audio = audio;
         this.isNewAudio = true;
         this.audioName = audioName;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendAudio setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendAudio setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public String getPerformer() {
         return performer;
     }
 
-    public void setPerformer(String performer) {
+    public SendAudio setPerformer(String performer) {
         this.performer = performer;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public SendAudio setTitle(String title) {
         this.title = title;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendAudio enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendAudio disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public boolean isNewAudio() {

src/main/java/org/telegram/telegrambots/api/methods/send/SendChatAction.java

@@ -37,16 +37,18 @@ public class SendChatAction extends BotApiMethod<Boolean> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendChatAction setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getAction() {
         return action;
     }
 
-    public void setAction(String action) {
+    public SendChatAction setAction(String action) {
         this.action = action;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendContact.java

@@ -45,60 +45,68 @@ public class SendContact extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendContact setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendContact setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendContact setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendContact enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendContact disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public String getPhoneNumber() {
         return phoneNumber;
     }
 
-    public void setPhoneNumber(String phoneNumber) {
+    public SendContact setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
+        return this;
     }
 
     public String getFirstName() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public SendContact setFirstName(String firstName) {
         this.firstName = firstName;
+        return this;
     }
 
     public String getLastName() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public SendContact setLastName(String lastName) {
         this.lastName = lastName;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendDocument.java

@@ -39,23 +39,26 @@ public class SendDocument {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendDocument setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getDocument() {
         return document;
     }
 
-    public void setDocument(String document) {
+    public SendDocument setDocument(String document) {
         this.document = document;
         this.isNewDocument = false;
+        return this;
     }
 
-    public void setNewDocument(String document, String documentName) {
+    public SendDocument setNewDocument(String document, String documentName) {
         this.document = document;
         this.isNewDocument = true;
         this.documentName = documentName;
+        return this;
     }
 
     public boolean isNewDocument() {
@@ -70,36 +73,41 @@ public class SendDocument {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendDocument setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendDocument enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendDocument disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public SendDocument setCaption(String caption) {
         this.caption = caption;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendDocument setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendLocation.java

@@ -42,52 +42,59 @@ public class SendLocation extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendLocation setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Float getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(Float latitude) {
+    public SendLocation setLatitude(Float latitude) {
         this.latitude = latitude;
+        return this;
     }
 
     public Float getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(Float longitude) {
+    public SendLocation setLongitude(Float longitude) {
         this.longitude = longitude;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendLocation setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendLocation setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendLocation enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendLocation disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendMessage.java

@@ -49,32 +49,36 @@ public class SendMessage extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendMessage setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getText() {
         return text;
     }
 
-    public void setText(String text) {
+    public SendMessage setText(String text) {
         this.text = text;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendMessage setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendMessage setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public Boolean getDisableWebPagePreview() {
@@ -85,36 +89,42 @@ public class SendMessage extends BotApiMethod<Message> {
         return disableNotification;
     }
 
-    public void disableWebPagePreview() {
+    public SendMessage disableWebPagePreview() {
         disableWebPagePreview = true;
+        return this;
     }
 
-    public void enableWebPagePreview() {
+    public SendMessage enableWebPagePreview() {
         disableWebPagePreview = null;
+        return this;
     }
 
-    public void enableNotification() {
+    public SendMessage enableNotification() {
         this.disableNotification = null;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendMessage disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
-    public void enableMarkdown(boolean enable) {
+    public SendMessage enableMarkdown(boolean enable) {
         if (enable) {
             this.parseMode = ParseMode.MARKDOWN;
         } else {
             this.parseMode = null;
         }
+        return this;
     }
 
-    public void enableHtml(boolean enable) {
+    public SendMessage enableHtml(boolean enable) {
         if (enable) {
             this.parseMode = ParseMode.HTML;
         } else {
             this.parseMode = null;
         }
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendPhoto.java

@@ -40,41 +40,46 @@ public class SendPhoto {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendPhoto setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getPhoto() {
         return photo;
     }
 
-    public void setPhoto(String photo) {
+    public SendPhoto setPhoto(String photo) {
         this.photo = photo;
         this.isNewPhoto = false;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public SendPhoto setCaption(String caption) {
         this.caption = caption;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendPhoto setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendPhoto setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public boolean isNewPhoto() {
@@ -89,18 +94,21 @@ public class SendPhoto {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendPhoto enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendPhoto disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
-    public void setNewPhoto(String photo, String photoName) {
+    public SendPhoto setNewPhoto(String photo, String photoName) {
         this.photo = photo;
         this.isNewPhoto = true;
         this.photoName = photoName;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendSticker.java

@@ -37,51 +37,58 @@ public class SendSticker {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendSticker setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getSticker() {
         return sticker;
     }
 
-    public void setSticker(String sticker) {
+    public SendSticker setSticker(String sticker) {
         this.sticker = sticker;
         this.isNewSticker = false;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendSticker setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendSticker setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
-    public void setSticker(String sticker, String stickerName) {
+    public SendSticker setSticker(String sticker, String stickerName) {
         this.sticker = sticker;
         this.isNewSticker = true;
         this.stickerName = stickerName;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendSticker enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendSticker disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public boolean isNewSticker() {

src/main/java/org/telegram/telegrambots/api/methods/send/SendVenue.java

@@ -49,76 +49,86 @@ public class SendVenue extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendVenue setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Float getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(Float latitude) {
+    public SendVenue setLatitude(Float latitude) {
         this.latitude = latitude;
+        return this;
     }
 
     public Float getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(Float longitude) {
+    public SendVenue setLongitude(Float longitude) {
         this.longitude = longitude;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendVenue setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendVenue setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public Boolean getDisableNotification() {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendVenue enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendVenue disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public SendVenue setTitle(String title) {
         this.title = title;
+        return this;
     }
 
     public String getAddress() {
         return address;
     }
 
-    public void setAddress(String address) {
+    public SendVenue setAddress(String address) {
         this.address = address;
+        return this;
     }
 
     public String getFoursquareId() {
         return foursquareId;
     }
 
-    public void setFoursquareId(String foursquareId) {
+    public SendVenue setFoursquareId(String foursquareId) {
         this.foursquareId = foursquareId;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendVideo.java

@@ -46,49 +46,55 @@ public class SendVideo {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendVideo setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getVideo() {
         return video;
     }
 
-    public void setVideo(String video) {
+    public SendVideo setVideo(String video) {
         this.video = video;
         this.isNewVideo = false;
+        return this;
     }
 
     public Integer getDuration() {
         return duration;
     }
 
-    public void setDuration(Integer duration) {
+    public SendVideo setDuration(Integer duration) {
         this.duration = duration;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public SendVideo setCaption(String caption) {
         this.caption = caption;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendVideo setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendVideo setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public boolean isNewVideo() {
@@ -103,34 +109,39 @@ public class SendVideo {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendVideo enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendVideo disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public Integer getWidth() {
         return width;
     }
 
-    public void setWidth(Integer width) {
+    public SendVideo setWidth(Integer width) {
         this.width = width;
+        return this;
     }
 
     public Integer getHeight() {
         return height;
     }
 
-    public void setHeight(Integer height) {
+    public SendVideo setHeight(Integer height) {
         this.height = height;
+        return this;
     }
 
-    public void setNewVideo(String video, String videoName) {
+    public SendVideo setNewVideo(String video, String videoName) {
         this.video = video;
         this.isNewVideo = true;
         this.videoName = videoName;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/send/SendVoice.java

@@ -52,59 +52,67 @@ public class SendVoice {
         return disableNotification;
     }
 
-    public void enableNotification() {
+    public SendVoice enableNotification() {
         this.disableNotification = false;
+        return this;
     }
 
-    public void disableNotification() {
+    public SendVoice disableNotification() {
         this.disableNotification = true;
+        return this;
     }
 
     public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public SendVoice setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public String getAudio() {
         return audio;
     }
 
-    public void setAudio(String audio) {
+    public SendVoice setAudio(String audio) {
         this.audio = audio;
         this.isNewVoice = false;
+        return this;
     }
 
-    public void setNewAudio(String audio, String audioName) {
+    public SendVoice setNewAudio(String audio, String audioName) {
         this.audio = audio;
         this.isNewVoice = false;
         this.voiceName = audioName;
+        return this;
     }
 
     public Integer getReplayToMessageId() {
         return replayToMessageId;
     }
 
-    public void setReplayToMessageId(Integer replayToMessageId) {
+    public SendVoice setReplayToMessageId(Integer replayToMessageId) {
         this.replayToMessageId = replayToMessageId;
+        return this;
     }
 
     public ReplyKeyboard getReplayMarkup() {
         return replayMarkup;
     }
 
-    public void setReplayMarkup(ReplyKeyboard replayMarkup) {
+    public SendVoice setReplayMarkup(ReplyKeyboard replayMarkup) {
         this.replayMarkup = replayMarkup;
+        return this;
     }
 
     public Integer getDuration() {
         return duration;
     }
 
-    public void setDuration(Integer duration) {
+    public SendVoice setDuration(Integer duration) {
         this.duration = duration;
+        return this;
     }
 
     public boolean isNewVoice() {

src/main/java/org/telegram/telegrambots/api/methods/updates/GetUpdates.java

@@ -43,24 +43,27 @@ public class GetUpdates implements IToJson {
         return offset;
     }
 
-    public void setOffset(Integer offset) {
+    public GetUpdates setOffset(Integer offset) {
         this.offset = offset;
+        return this;
     }
 
     public Integer getLimit() {
         return limit;
     }
 
-    public void setLimit(Integer limit) {
+    public GetUpdates setLimit(Integer limit) {
         this.limit = limit;
+        return this;
     }
 
     public Integer getTimeout() {
         return timeout;
     }
 
-    public void setTimeout(Integer timeout) {
+    public GetUpdates setTimeout(Integer timeout) {
         this.timeout = timeout;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/updates/SetWebhook.java

@@ -25,16 +25,18 @@ public class SetWebhook {
         return url;
     }
 
-    public void setUrl(String url) {
+    public SetWebhook setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     public String getCertificateFile() {
         return certificateFile;
     }
 
-    public void setCertificateFile(String certificateFile) {
+    public SetWebhook setCertificateFile(String certificateFile) {
         this.certificateFile = certificateFile;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageCaption.java

@@ -52,40 +52,45 @@ public class EditMessageCaption extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public EditMessageCaption setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getMessageId() {
         return messageId;
     }
 
-    public void setMessageId(Integer messageId) {
+    public EditMessageCaption setMessageId(Integer messageId) {
         this.messageId = messageId;
+        return this;
     }
 
     public String getInlineMessageId() {
         return inlineMessageId;
     }
 
-    public void setInlineMessageId(String inlineMessageId) {
+    public EditMessageCaption setInlineMessageId(String inlineMessageId) {
         this.inlineMessageId = inlineMessageId;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public EditMessageCaption setCaption(String caption) {
         this.caption = caption;
+        return this;
     }
 
     public InlineKeyboardMarkup getReplyMarkup() {
         return replyMarkup;
     }
 
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+    public EditMessageCaption setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
         this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageReplyMarkup.java

@@ -50,32 +50,36 @@ public class EditMessageReplyMarkup extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public EditMessageReplyMarkup setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getMessageId() {
         return messageId;
     }
 
-    public void setMessageId(Integer messageId) {
+    public EditMessageReplyMarkup setMessageId(Integer messageId) {
         this.messageId = messageId;
+        return this;
     }
 
     public String getInlineMessageId() {
         return inlineMessageId;
     }
 
-    public void setInlineMessageId(String inlineMessageId) {
+    public EditMessageReplyMarkup setInlineMessageId(String inlineMessageId) {
         this.inlineMessageId = inlineMessageId;
+        return this;
     }
 
     public InlineKeyboardMarkup getReplyMarkup() {
         return replyMarkup;
     }
 
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+    public EditMessageReplyMarkup setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
         this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/methods/updatingmessages/EditMessageText.java

@@ -64,64 +64,73 @@ public class EditMessageText extends BotApiMethod<Message> {
         return chatId;
     }
 
-    public void setChatId(String chatId) {
+    public EditMessageText setChatId(String chatId) {
         this.chatId = chatId;
+        return this;
     }
 
     public Integer getMessageId() {
         return messageId;
     }
 
-    public void setMessageId(Integer messageId) {
+    public EditMessageText setMessageId(Integer messageId) {
         this.messageId = messageId;
+        return this;
     }
 
     public String getInlineMessageId() {
         return inlineMessageId;
     }
 
-    public void setInlineMessageId(String inlineMessageId) {
+    public EditMessageText setInlineMessageId(String inlineMessageId) {
         this.inlineMessageId = inlineMessageId;
+        return this;
     }
 
     public String getText() {
         return text;
     }
 
-    public void setText(String text) {
+    public EditMessageText setText(String text) {
         this.text = text;
+        return this;
     }
 
     public InlineKeyboardMarkup getReplyMarkup() {
         return replyMarkup;
     }
 
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+    public EditMessageText setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
         this.replyMarkup = replyMarkup;
+        return this;
     }
 
-    public void disableWebPagePreview() {
+    public EditMessageText disableWebPagePreview() {
         disableWebPagePreview = true;
+        return this;
     }
 
-    public void enableWebPagePreview() {
+    public EditMessageText enableWebPagePreview() {
         disableWebPagePreview = null;
+        return this;
     }
 
-    public void enableMarkdown(boolean enable) {
+    public EditMessageText enableMarkdown(boolean enable) {
         if (enable) {
             this.parseMode = ParseMode.MARKDOWN;
         } else {
             this.parseMode = null;
         }
+        return this;
     }
 
-    public void enableHtml(boolean enable) {
+    public EditMessageText enableHtml(boolean enable) {
         if (enable) {
             this.parseMode = ParseMode.HTML;
         } else {
             this.parseMode = null;
         }
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/Audio.java

@@ -63,50 +63,26 @@ public class Audio implements IBotApiObject {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
     public Integer getDuration() {
         return duration;
     }
 
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     public String getPerformer() {
         return performer;
     }
 
-    public void setPerformer(String performer) {
-        this.performer = performer;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/CallbackQuery.java

@@ -51,6 +51,22 @@ public class CallbackQuery implements IBotApiObject {
         super();
     }
 
+    public String getId() {
+        return this.id;
+    }
+
+    public User getFrom() {
+        return this.from;
+    }
+
+    public Message getMessage() {
+        return this.getMessage();
+    }
+
+    public String getInlineMessageId() {
+        return this.inlineMessageId;
+    }
+
     public CallbackQuery(JSONObject jsonObject) {
         super();
         this.id = jsonObject.getString(ID_FIELD);

src/main/java/org/telegram/telegrambots/api/objects/Document.java

@@ -59,42 +59,22 @@ public class Document implements IBotApiObject {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
     public PhotoSize getThumb() {
         return thumb;
     }
 
-    public void setThumb(PhotoSize thumb) {
-        this.thumb = thumb;
-    }
-
     public String getFileName() {
         return fileName;
     }
 
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/File.java

@@ -46,26 +46,14 @@ public class File implements IBotApiObject {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     public String getFilePath() {
         return filePath;
     }
 
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/Location.java

@@ -39,18 +39,10 @@ public class Location implements IBotApiObject {
         return longitude;
     }
 
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
     public Double getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/Message.java

@@ -219,24 +219,116 @@ public class Message implements IBotApiObject {
         return messageId;
     }
 
-    public void setMessageId(Integer messageId) {
-        this.messageId = messageId;
-    }
-
     public User getFrom() {
         return from;
     }
 
-    public void setFrom(User from) {
-        this.from = from;
-    }
-
     public Integer getDate() {
         return date;
     }
 
-    public void setDate(Integer date) {
+    public Chat getChat() {
-        this.date = date;
+        return chat;
+    }
+
+    public User getForwardFrom() {
+        return forwardFrom;
+    }
+
+    public Integer getForwardDate() {
+        return forwardDate;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public List<MessageEntity> getEntities() {
+        return entities;
+    }
+
+    public Audio getAudio() {
+        return audio;
+    }
+
+    public Document getDocument() {
+        return document;
+    }
+
+    public List<PhotoSize> getPhoto() {
+        return photo;
+    }
+
+    public Sticker getSticker() {
+        return sticker;
+    }
+
+    public Video getVideo() {
+        return video;
+    }
+
+    public Contact getContact() {
+        return contact;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public Venue getVenue() {
+        return venue;
+    }
+
+    public Message getPinnedMessage() {
+        return pinnedMessage;
+    }
+
+    public User getNewChatMember() {
+        return newChatMember;
+    }
+
+    public User getLeftChatMember() {
+        return leftChatMember;
+    }
+
+    public String getNewChatTitle() {
+        return newChatTitle;
+    }
+
+    public List<PhotoSize> getNewChatPhoto() {
+        return newChatPhoto;
+    }
+
+    public Boolean getDeleteChatPhoto() {
+        return deleteChatPhoto;
+    }
+
+    public Boolean getGroupchatCreated() {
+        return groupchatCreated;
+    }
+
+    public Message getReplyToMessage() {
+        return replyToMessage;
+    }
+
+    public Voice getVoice() {
+        return voice;
+    }
+
+    public Boolean getSuperGroupCreated() {
+        return superGroupCreated;
+    }
+
+    public Boolean getChannelChatCreated() {
+        return channelChatCreated;
+    }
+
+    public Long getMigrateToChatId() {
+        return migrateToChatId;
+    }
+
+    public Long getMigrateFromChatId() {
+        return migrateFromChatId;
     }
 
     public boolean isGroupMessage() {
@@ -259,162 +351,14 @@ public class Message implements IBotApiObject {
         return chat.getId();
     }
 
-    public Chat getChat() {
-        return chat;
-    }
-
-    public void setChat(Chat chat) {
-        this.chat = chat;
-    }
-
-    public User getForwardFrom() {
-        return forwardFrom;
-    }
-
-    public void setForwardFrom(User forwardFrom) {
-        this.forwardFrom = forwardFrom;
-    }
-
-    public Integer getForwardDate() {
-        return forwardDate;
-    }
-
-    public void setForwardDate(Integer forwardDate) {
-        this.forwardDate = forwardDate;
-    }
-
     public boolean hasText() {
         return text != null && !text.isEmpty();
     }
 
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Audio getAudio() {
-        return audio;
-    }
-
-    public void setAudio(Audio audio) {
-        this.audio = audio;
-    }
-
     public boolean hasDocument() {
         return this.document != null;
     }
 
-    public Document getDocument() {
-        return document;
-    }
-
-    public void setDocument(Document document) {
-        this.document = document;
-    }
-
-    public List<PhotoSize> getPhoto() {
-        return photo;
-    }
-
-    public void setPhoto(List<PhotoSize> photo) {
-        this.photo = photo;
-    }
-
-    public Sticker getSticker() {
-        return sticker;
-    }
-
-    public void setSticker(Sticker sticker) {
-        this.sticker = sticker;
-    }
-
-    public Video getVideo() {
-        return video;
-    }
-
-    public void setVideo(Video video) {
-        this.video = video;
-    }
-
-    public Contact getContact() {
-        return contact;
-    }
-
-    public void setContact(Contact contact) {
-        this.contact = contact;
-    }
-
-    public Location getLocation() {
-        return location;
-    }
-
-    public void setLocation(Location location) {
-        this.location = location;
-    }
-
-    public User getNewChatMember() {
-        return newChatMember;
-    }
-
-    public void setNewChatMember(User newChatMember) {
-        this.newChatMember = newChatMember;
-    }
-
-    public User getLeftChatMember() {
-        return leftChatMember;
-    }
-
-    public void setLeftChatMember(User leftChatMember) {
-        this.leftChatMember = leftChatMember;
-    }
-
-    public String getNewChatTitle() {
-        return newChatTitle;
-    }
-
-    public void setNewChatTitle(String newChatTitle) {
-        this.newChatTitle = newChatTitle;
-    }
-
-    public List<PhotoSize> getNewChatPhoto() {
-        return newChatPhoto;
-    }
-
-    public void setNewChatPhoto(List<PhotoSize> newChatPhoto) {
-        this.newChatPhoto = newChatPhoto;
-    }
-
-    public Boolean getDeleteChatPhoto() {
-        return deleteChatPhoto;
-    }
-
-    public void setDeleteChatPhoto(Boolean deleteChatPhoto) {
-        this.deleteChatPhoto = deleteChatPhoto;
-    }
-
-    public Boolean getGroupchatCreated() {
-        return groupchatCreated;
-    }
-
-    public void setGroupchatCreated(Boolean groupchatCreated) {
-        this.groupchatCreated = groupchatCreated;
-    }
-
-    public boolean hasReplayMessage() {
-        return replyToMessage != null;
-    }
-
-    public Message getReplyToMessage() {
-        return replyToMessage;
-    }
-
-    public void setReplyToMessage(Message replyToMessage) {
-        this.replyToMessage = replyToMessage;
-    }
-
     public boolean isReply() {
         return this.replyToMessage != null;
     }
@@ -423,46 +367,6 @@ public class Message implements IBotApiObject {
         return location != null;
     }
 
-    public Voice getVoice() {
-        return voice;
-    }
-
-    public void setVoice(Voice voice) {
-        this.voice = voice;
-    }
-
-    public Boolean getSuperGroupCreated() {
-        return superGroupCreated;
-    }
-
-    public void setSuperGroupCreated(Boolean superGroupCreated) {
-        this.superGroupCreated = superGroupCreated;
-    }
-
-    public Boolean getChannelChatCreated() {
-        return channelChatCreated;
-    }
-
-    public void setChannelChatCreated(Boolean channelChatCreated) {
-        this.channelChatCreated = channelChatCreated;
-    }
-
-    public Long getMigrateToChatId() {
-        return migrateToChatId;
-    }
-
-    public void setMigrateToChatId(Long migrateToChatId) {
-        this.migrateToChatId = migrateToChatId;
-    }
-
-    public Long getMigrateFromChatId() {
-        return migrateFromChatId;
-    }
-
-    public void setMigrateFromChatId(Long migrateFromChatId) {
-        this.migrateFromChatId = migrateFromChatId;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/PhotoSize.java

@@ -55,42 +55,22 @@ public class PhotoSize implements IBotApiObject {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
     public Integer getWidth() {
         return width;
     }
 
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
-
     public Integer getHeight() {
         return height;
     }
 
-    public void setHeight(Integer height) {
-        this.height = height;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     public String getFilePath() {
         return filePath;
     }
 
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/Sticker.java

@@ -51,6 +51,26 @@ public class Sticker implements IBotApiObject {
         }
     }
 
+    public String getFileId() {
+        return fileId;
+    }
+
+    public Integer getWidth() {
+        return width;
+    }
+
+    public Integer getHeight() {
+        return height;
+    }
+
+    public PhotoSize getThumb() {
+        return thumb;
+    }
+
+    public Integer getFileSize() {
+        return fileSize;
+    }
+
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/UserProfilePhotos.java

@@ -53,18 +53,10 @@ public class UserProfilePhotos implements IBotApiObject {
         return totalCount;
     }
 
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
     public List<List<PhotoSize>> getPhotos() {
         return photos;
     }
 
-    public void setPhotos(List<List<PhotoSize>> photos) {
-        this.photos = photos;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/Video.java

@@ -60,62 +60,34 @@ public class Video implements IBotApiObject {
         }
     }
 
-    public Integer getWidth() {
-        return width;
-    }
-
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
-
     public String getFileId() {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
+    public Integer getWidth() {
-        this.fileId = fileId;
+        return width;
     }
 
     public Integer getHeight() {
         return height;
     }
 
-    public void setHeight(Integer height) {
-        this.height = height;
-    }
-
     public Integer getDuration() {
         return duration;
     }
 
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
     public PhotoSize getThumb() {
         return thumb;
     }
 
-    public void setThumb(PhotoSize thumb) {
-        this.thumb = thumb;
-    }
-
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/Voice.java

@@ -50,34 +50,18 @@ public class Voice implements IBotApiObject {
         return fileId;
     }
 
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
     public Integer getDuration() {
         return duration;
     }
 
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
     public Integer getFileSize() {
         return fileSize;
     }
 
-    public void setFileSize(Integer fileSize) {
-        this.fileSize = fileSize;
-    }
-
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/ChosenInlineQuery.java

@@ -68,10 +68,6 @@ public class ChosenInlineQuery implements IBotApiObject {
         return from;
     }
 
-    public String getQuery() {
-        return query;
-    }
-
     public Location getLocation() {
         return location;
     }
@@ -80,6 +76,10 @@ public class ChosenInlineQuery implements IBotApiObject {
         return inlineMessageId;
     }
 
+    public String getQuery() {
+        return query;
+    }
+
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputContactMessageContent.java

@@ -37,24 +37,27 @@ public class InputContactMessageContent implements InputMessageContent {
         return phoneNumber;
     }
 
-    public void setPhoneNumber(String phoneNumber) {
+    public InputContactMessageContent setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
+        return this;
     }
 
     public String getFirstName() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public InputContactMessageContent setFirstName(String firstName) {
         this.firstName = firstName;
+        return this;
     }
 
     public String getLastName() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public InputContactMessageContent setLastName(String lastName) {
         this.lastName = lastName;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputLocationMessageContent.java

@@ -30,20 +30,22 @@ public class InputLocationMessageContent implements InputMessageContent {
         super();
     }
 
-    public Float getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Float latitude) {
-        this.latitude = latitude;
-    }
-
     public Float getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(Float longitude) {
+    public InputLocationMessageContent setLongitude(Float longitude) {
         this.longitude = longitude;
+        return this;
+    }
+
+    public Float getLatitude() {
+        return latitude;
+    }
+
+    public InputLocationMessageContent setLatitude(Float latitude) {
+        this.latitude = latitude;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputTextMessageContent.java

@@ -36,40 +36,55 @@ public class InputTextMessageContent implements InputMessageContent {
         return messageText;
     }
 
-    public void setMessageText(String messageText) {
+    public InputTextMessageContent setMessageText(String messageText) {
         this.messageText = messageText;
+        return this;
     }
 
     public String getParseMode() {
         return parseMode;
     }
 
-    public void enableMarkdown(boolean enable) {
+    public InputTextMessageContent setParseMode(String parseMode) {
-        if (enable) {
+        this.parseMode = parseMode;
-            this.parseMode = ParseMode.MARKDOWN;
+        return this;
-        } else {
-            this.parseMode = null;
-        }
-    }
-
-    public void enableHtml(boolean enable) {
-        if (enable) {
-            this.parseMode = ParseMode.HTML;
-        } else {
-            this.parseMode = null;
-        }
     }
 
     public Boolean getDisableWebPagePreview() {
         return disableWebPagePreview;
     }
 
-    public void disableWebPagePreview() {
+    public InputTextMessageContent setDisableWebPagePreview(Boolean disableWebPagePreview) {
-        disableWebPagePreview = true;
+        this.disableWebPagePreview = disableWebPagePreview;
+        return this;
     }
 
-    public void enableWebPagePreview() {
+    public InputTextMessageContent enableMarkdown(boolean enable) {
+        if (enable) {
+            this.parseMode = ParseMode.MARKDOWN;
+        } else {
+            this.parseMode = null;
+        }
+        return this;
+    }
+
+    public InputTextMessageContent enableHtml(boolean enable) {
+        if (enable) {
+            this.parseMode = ParseMode.HTML;
+        } else {
+            this.parseMode = null;
+        }
+        return this;
+    }
+
+    public InputTextMessageContent disableWebPagePreview() {
+        disableWebPagePreview = true;
+        return this;
+    }
+
+    public InputTextMessageContent enableWebPagePreview() {
         disableWebPagePreview = null;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/inputmessagecontent/InputVenueMessageContent.java

@@ -43,40 +43,45 @@ public class InputVenueMessageContent implements InputMessageContent {
         return latitude;
     }
 
-    public void setLatitude(Float latitude) {
+    public InputVenueMessageContent setLatitude(Float latitude) {
         this.latitude = latitude;
+        return this;
     }
 
     public Float getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(Float longitude) {
+    public InputVenueMessageContent setLongitude(Float longitude) {
         this.longitude = longitude;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InputVenueMessageContent setTitle(String title) {
         this.title = title;
+        return this;
     }
 
     public String getAddress() {
         return address;
     }
 
-    public void setAddress(String address) {
+    public InputVenueMessageContent setAddress(String address) {
         this.address = address;
+        return this;
     }
 
     public String getFoursquareId() {
         return foursquareId;
     }
 
-    public void setFoursquareId(String foursquareId) {
+    public InputVenueMessageContent setFoursquareId(String foursquareId) {
         this.foursquareId = foursquareId;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultArticle.java

@@ -61,80 +61,90 @@ public class InlineQueryResultArticle implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultArticle setId(String id) {
         this.id = id;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InlineQueryResultArticle setTitle(String title) {
         this.title = title;
+        return this;
     }
 
     public InputMessageContent getInputMessageContent() {
         return inputMessageContent;
     }
 
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
+    public InlineQueryResultArticle setInputMessageContent(InputMessageContent inputMessageContent) {
         this.inputMessageContent = inputMessageContent;
+        return this;
     }
 
     public InlineKeyboardMarkup getReplyMarkup() {
         return replyMarkup;
     }
 
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+    public InlineQueryResultArticle setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
         this.replyMarkup = replyMarkup;
+        return this;
     }
 
     public String getUrl() {
         return url;
     }
 
-    public void setUrl(String url) {
+    public InlineQueryResultArticle setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     public Boolean getHideUrl() {
         return hideUrl;
     }
 
-    public void setHideUrl(Boolean hideUrl) {
+    public InlineQueryResultArticle setHideUrl(Boolean hideUrl) {
         this.hideUrl = hideUrl;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultArticle setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultArticle setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
     }
 
     public Integer getThumbWidth() {
         return thumbWidth;
     }
 
-    public void setThumbWidth(Integer thumbWidth) {
+    public InlineQueryResultArticle setThumbWidth(Integer thumbWidth) {
         this.thumbWidth = thumbWidth;
+        return this;
     }
 
     public Integer getThumbHeight() {
         return thumbHeight;
     }
 
-    public void setThumbHeight(Integer thumbHeight) {
+    public InlineQueryResultArticle setThumbHeight(Integer thumbHeight) {
         this.thumbHeight = thumbHeight;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultAudio.java

@@ -56,56 +56,63 @@ public class InlineQueryResultAudio implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultAudio setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getAudioUrl() {
         return audioUrl;
     }
 
-    public void setAudioUrl(String audioUrl) {
+    public InlineQueryResultAudio setAudioUrl(String audioUrl) {
         this.audioUrl = audioUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultAudio setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getPerformer() {
         return performer;
     }
 
-    public void setPerformer(String performer) {
+    public InlineQueryResultAudio setPerformer(String performer) {
         this.performer = performer;
+        return this;
     }
 
     public Integer getAudioDuration() {
         return audioDuration;
     }
 
-    public void setAudioDuration(Integer audioDuration) {
+    public InlineQueryResultAudio setAudioDuration(Integer audioDuration) {
         this.audioDuration = audioDuration;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultAudio setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultAudio setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultContact.java

@@ -62,72 +62,81 @@ public class InlineQueryResultContact implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultContact setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
-    }
-
-    public Integer getThumbWidth() {
-        return thumbWidth;
-    }
-
-    public void setThumbWidth(Integer thumbWidth) {
-        this.thumbWidth = thumbWidth;
-    }
-
-    public Integer getThumbHeight() {
-        return thumbHeight;
-    }
-
-    public void setThumbHeight(Integer thumbHeight) {
-        this.thumbHeight = thumbHeight;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
     }
 
     public String getPhoneNumber() {
         return phoneNumber;
     }
 
-    public void setPhoneNumber(String phoneNumber) {
+    public InlineQueryResultContact setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
+        return this;
     }
 
     public String getFirstName() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public InlineQueryResultContact setFirstName(String firstName) {
         this.firstName = firstName;
+        return this;
     }
 
     public String getLastName() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public InlineQueryResultContact setLastName(String lastName) {
         this.lastName = lastName;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultContact setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultContact setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public InlineQueryResultContact setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public Integer getThumbWidth() {
+        return thumbWidth;
+    }
+
+    public InlineQueryResultContact setThumbWidth(Integer thumbWidth) {
+        this.thumbWidth = thumbWidth;
+        return this;
+    }
+
+    public Integer getThumbHeight() {
+        return thumbHeight;
+    }
+
+    public InlineQueryResultContact setThumbHeight(Integer thumbHeight) {
+        this.thumbHeight = thumbHeight;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultDocument.java

@@ -69,88 +69,99 @@ public class InlineQueryResultDocument implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultDocument setId(String id) {
         this.id = id;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InlineQueryResultDocument setTitle(String title) {
         this.title = title;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
-    }
-
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
     }
 
     public String getDocumentUrl() {
         return documentUrl;
     }
 
-    public void setDocumentUrl(String documentUrl) {
+    public InlineQueryResultDocument setDocumentUrl(String documentUrl) {
         this.documentUrl = documentUrl;
+        return this;
     }
 
-    public Integer getThumbWidth() {
+    public String getMimeType() {
-        return thumbWidth;
+        return mimeType;
     }
 
-    public void setThumbWidth(Integer thumbWidth) {
+    public InlineQueryResultDocument setMimeType(String mimeType) {
-        this.thumbWidth = thumbWidth;
+        this.mimeType = mimeType;
-    }
+        return this;
-
-    public Integer getThumbHeight() {
-        return thumbHeight;
-    }
-
-    public void setThumbHeight(Integer thumbHeight) {
-        this.thumbHeight = thumbHeight;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultDocument setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultDocument setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultDocument setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultDocument setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public InlineQueryResultDocument setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public Integer getThumbWidth() {
+        return thumbWidth;
+    }
+
+    public InlineQueryResultDocument setThumbWidth(Integer thumbWidth) {
+        this.thumbWidth = thumbWidth;
+        return this;
+    }
+
+    public Integer getThumbHeight() {
+        return thumbHeight;
+    }
+
+    public InlineQueryResultDocument setThumbHeight(Integer thumbHeight) {
+        this.thumbHeight = thumbHeight;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultGif.java

@@ -60,72 +60,81 @@ public class InlineQueryResultGif implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultGif setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getGifUrl() {
         return gifUrl;
     }
 
-    public void setGifUrl(String gifUrl) {
+    public InlineQueryResultGif setGifUrl(String gifUrl) {
         this.gifUrl = gifUrl;
+        return this;
     }
 
     public Integer getGifWidth() {
         return gifWidth;
     }
 
-    public void setGifWidth(Integer gifWidth) {
+    public InlineQueryResultGif setGifWidth(Integer gifWidth) {
         this.gifWidth = gifWidth;
+        return this;
     }
 
     public Integer getGifHeight() {
         return gifHeight;
     }
 
-    public void setGifHeight(Integer gifHeight) {
+    public InlineQueryResultGif setGifHeight(Integer gifHeight) {
         this.gifHeight = gifHeight;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultGif setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultGif setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultGif setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultGif setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultGif setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultLocation.java

@@ -62,72 +62,81 @@ public class InlineQueryResultLocation implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultLocation setId(String id) {
         this.id = id;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InlineQueryResultLocation setTitle(String title) {
         this.title = title;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(String latitude) {
+    public InlineQueryResultLocation setLatitude(String latitude) {
         this.latitude = latitude;
+        return this;
     }
 
     public String getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(String longitude) {
+    public InlineQueryResultLocation setLongitude(String longitude) {
         this.longitude = longitude;
+        return this;
     }
 
-    public Integer getThumbWidth() {
+    public InlineKeyboardMarkup getReplyMarkup() {
-        return thumbWidth;
+        return replyMarkup;
     }
 
-    public void setThumbWidth(Integer thumbWidth) {
+    public InlineQueryResultLocation setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.thumbWidth = thumbWidth;
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
-    public Integer getThumbHeight() {
+    public InputMessageContent getInputMessageContent() {
-        return thumbHeight;
+        return inputMessageContent;
     }
 
-    public void setThumbHeight(Integer thumbHeight) {
+    public InlineQueryResultLocation setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.thumbHeight = thumbHeight;
+        this.inputMessageContent = inputMessageContent;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultLocation setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public Integer getThumbWidth() {
+        return thumbWidth;
+    }
+
+    public InlineQueryResultLocation setThumbWidth(Integer thumbWidth) {
+        this.thumbWidth = thumbWidth;
+        return this;
+    }
+
+    public Integer getThumbHeight() {
+        return thumbHeight;
+    }
+
+    public InlineQueryResultLocation setThumbHeight(Integer thumbHeight) {
+        this.thumbHeight = thumbHeight;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultMpeg4Gif.java

@@ -60,72 +60,81 @@ public class InlineQueryResultMpeg4Gif implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultMpeg4Gif setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getMpeg4Url() {
         return mpeg4Url;
     }
 
-    public void setMpeg4Url(String mpeg4Url) {
+    public InlineQueryResultMpeg4Gif setMpeg4Url(String mpeg4Url) {
         this.mpeg4Url = mpeg4Url;
+        return this;
     }
 
     public Integer getMpeg4Width() {
         return mpeg4Width;
     }
 
-    public void setMpeg4Width(Integer mpeg4Width) {
+    public InlineQueryResultMpeg4Gif setMpeg4Width(Integer mpeg4Width) {
         this.mpeg4Width = mpeg4Width;
+        return this;
     }
 
     public Integer getMpeg4Height() {
         return mpeg4Height;
     }
 
-    public void setMpeg4Height(Integer mpeg4Height) {
+    public InlineQueryResultMpeg4Gif setMpeg4Height(Integer mpeg4Height) {
         this.mpeg4Height = mpeg4Height;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultMpeg4Gif setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultMpeg4Gif setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultMpeg4Gif setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultMpeg4Gif setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultMpeg4Gif setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultPhoto.java

@@ -66,88 +66,99 @@ public class InlineQueryResultPhoto implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultPhoto setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getPhotoUrl() {
         return photoUrl;
     }
 
-    public void setPhotoUrl(String photoUrl) {
+    public InlineQueryResultPhoto setPhotoUrl(String photoUrl) {
         this.photoUrl = photoUrl;
+        return this;
     }
 
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
+    public InlineQueryResultPhoto setMimeType(String mimeType) {
         this.mimeType = mimeType;
+        return this;
     }
 
     public Integer getPhotoWidth() {
         return photoWidth;
     }
 
-    public void setPhotoWidth(Integer photoWidth) {
+    public InlineQueryResultPhoto setPhotoWidth(Integer photoWidth) {
         this.photoWidth = photoWidth;
+        return this;
     }
 
     public Integer getPhotoHeight() {
         return photoHeight;
     }
 
-    public void setPhotoHeight(Integer photoHeight) {
+    public InlineQueryResultPhoto setPhotoHeight(Integer photoHeight) {
         this.photoHeight = photoHeight;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultPhoto setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultPhoto setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultPhoto setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultPhoto setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultPhoto setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultPhoto setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVenue.java

@@ -67,88 +67,99 @@ public class InlineQueryResultVenue implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultVenue setId(String id) {
         this.id = id;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InlineQueryResultVenue setTitle(String title) {
         this.title = title;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(String latitude) {
+    public InlineQueryResultVenue setLatitude(String latitude) {
         this.latitude = latitude;
+        return this;
     }
 
     public String getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(String longitude) {
+    public InlineQueryResultVenue setLongitude(String longitude) {
         this.longitude = longitude;
-    }
+        return this;
-
-    public Integer getThumbWidth() {
-        return thumbWidth;
-    }
-
-    public void setThumbWidth(Integer thumbWidth) {
-        this.thumbWidth = thumbWidth;
-    }
-
-    public Integer getThumbHeight() {
-        return thumbHeight;
-    }
-
-    public void setThumbHeight(Integer thumbHeight) {
-        this.thumbHeight = thumbHeight;
-    }
-
-    public String getThumbUrl() {
-        return thumbUrl;
-    }
-
-    public void setThumbUrl(String thumbUrl) {
-        this.thumbUrl = thumbUrl;
     }
 
     public String getAddress() {
         return address;
     }
 
-    public void setAddress(String address) {
+    public InlineQueryResultVenue setAddress(String address) {
         this.address = address;
+        return this;
     }
 
     public String getFoursquareId() {
         return foursquareId;
     }
 
-    public void setFoursquareId(String foursquareId) {
+    public InlineQueryResultVenue setFoursquareId(String foursquareId) {
         this.foursquareId = foursquareId;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultVenue setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultVenue setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public InlineQueryResultVenue setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public Integer getThumbWidth() {
+        return thumbWidth;
+    }
+
+    public InlineQueryResultVenue setThumbWidth(Integer thumbWidth) {
+        this.thumbWidth = thumbWidth;
+        return this;
+    }
+
+    public Integer getThumbHeight() {
+        return thumbHeight;
+    }
+
+    public InlineQueryResultVenue setThumbHeight(Integer thumbHeight) {
+        this.thumbHeight = thumbHeight;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVideo.java

@@ -69,96 +69,108 @@ public class InlineQueryResultVideo implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultVideo setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getMimeType() {
         return mimeType;
     }
 
-    public void setMimeType(String mimeType) {
+    public InlineQueryResultVideo setMimeType(String mimeType) {
         this.mimeType = mimeType;
+        return this;
     }
 
     public String getVideoUrl() {
         return videoUrl;
     }
 
-    public void setVideoUrl(String videoUrl) {
+    public InlineQueryResultVideo setVideoUrl(String videoUrl) {
         this.videoUrl = videoUrl;
+        return this;
     }
 
     public Integer getVideoWidth() {
         return videoWidth;
     }
 
-    public void setVideoWidth(Integer videoWidth) {
+    public InlineQueryResultVideo setVideoWidth(Integer videoWidth) {
         this.videoWidth = videoWidth;
+        return this;
     }
 
     public Integer getVideoHeight() {
         return videoHeight;
     }
 
-    public void setVideoHeight(Integer videoHeight) {
+    public InlineQueryResultVideo setVideoHeight(Integer videoHeight) {
         this.videoHeight = videoHeight;
+        return this;
     }
 
     public Integer getVideoDuration() {
         return videoDuration;
     }
 
-    public void setVideoDuration(Integer videoDuration) {
+    public InlineQueryResultVideo setVideoDuration(Integer videoDuration) {
         this.videoDuration = videoDuration;
+        return this;
     }
 
     public String getThumbUrl() {
         return thumbUrl;
     }
 
-    public void setThumbUrl(String thumbUrl) {
+    public InlineQueryResultVideo setThumbUrl(String thumbUrl) {
         this.thumbUrl = thumbUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultVideo setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultVideo setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultVideo setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultVideo setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultVideo setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/InlineQueryResultVoice.java

@@ -53,48 +53,54 @@ public class InlineQueryResultVoice implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultVoice setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
-    }
-
-    public Integer getVoiceDuration() {
-        return voiceDuration;
-    }
-
-    public void setVoiceDuration(Integer voiceDuration) {
-        this.voiceDuration = voiceDuration;
     }
 
     public String getVoiceUrl() {
         return voiceUrl;
     }
 
-    public void setVoiceUrl(String voiceUrl) {
+    public InlineQueryResultVoice setVoiceUrl(String voiceUrl) {
         this.voiceUrl = voiceUrl;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultVoice setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public Integer getVoiceDuration() {
+        return voiceDuration;
+    }
+
+    public InlineQueryResultVoice setVoiceDuration(Integer voiceDuration) {
+        this.voiceDuration = voiceDuration;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultVoice setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultVoice setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedAudio.java

@@ -48,32 +48,36 @@ public class InlineQueryResultCachedAudio implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedAudio setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getAudioFileId() {
         return audioFileId;
     }
 
-    public void setAudioFileId(String audioFileId) {
+    public InlineQueryResultCachedAudio setAudioFileId(String audioFileId) {
         this.audioFileId = audioFileId;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedAudio setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedAudio setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedDocument.java

@@ -58,56 +58,63 @@ public class InlineQueryResultCachedDocument implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedDocument setId(String id) {
         this.id = id;
+        return this;
     }
 
     public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
+    public InlineQueryResultCachedDocument setTitle(String title) {
         this.title = title;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
-    }
-
-    public String getCaption() {
-        return caption;
-    }
-
-    public void setCaption(String caption) {
-        this.caption = caption;
     }
 
     public String getDocumentFileId() {
         return documentFileId;
     }
 
-    public void setDocumentFileId(String documentFileId) {
+    public InlineQueryResultCachedDocument setDocumentFileId(String documentFileId) {
         this.documentFileId = documentFileId;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultCachedDocument setDescription(String description) {
         this.description = description;
+        return this;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public InlineQueryResultCachedDocument setCaption(String caption) {
+        this.caption = caption;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedDocument setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedDocument setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedGif.java

@@ -52,48 +52,54 @@ public class InlineQueryResultCachedGif implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedGif setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getGifFileId() {
         return gifFileId;
     }
 
-    public void setGifFileId(String gifFileId) {
+    public InlineQueryResultCachedGif setGifFileId(String gifFileId) {
         this.gifFileId = gifFileId;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultCachedGif setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultCachedGif setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedGif setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedGif setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedMpeg4Gif.java

@@ -52,48 +52,54 @@ public class InlineQueryResultCachedMpeg4Gif implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedMpeg4Gif setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getMpeg4FileId() {
         return mpeg4FileId;
     }
 
-    public void setMpeg4FileId(String mpeg4FileId) {
+    public InlineQueryResultCachedMpeg4Gif setMpeg4FileId(String mpeg4FileId) {
         this.mpeg4FileId = mpeg4FileId;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultCachedMpeg4Gif setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultCachedMpeg4Gif setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedMpeg4Gif setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedMpeg4Gif setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedPhoto.java

@@ -55,56 +55,63 @@ public class InlineQueryResultCachedPhoto implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedPhoto setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getPhotoFileId() {
         return photoFileId;
     }
 
-    public void setPhotoFileId(String photoFileId) {
+    public InlineQueryResultCachedPhoto setPhotoFileId(String photoFileId) {
         this.photoFileId = photoFileId;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultCachedPhoto setTitle(String title) {
+        this.title = title;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultCachedPhoto setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public String getCaption() {
         return caption;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultCachedPhoto setCaption(String caption) {
         this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedPhoto setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedPhoto setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedSticker.java

@@ -48,32 +48,36 @@ public class InlineQueryResultCachedSticker implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedSticker setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getStickerFileId() {
         return stickerFileId;
     }
 
-    public void setStickerFileId(String stickerFileId) {
+    public InlineQueryResultCachedSticker setStickerFileId(String stickerFileId) {
         this.stickerFileId = stickerFileId;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedSticker setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedSticker setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVideo.java

@@ -55,56 +55,63 @@ public class InlineQueryResultCachedVideo implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedVideo setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getVideoFileId() {
         return videoFileId;
     }
 
-    public void setVideoFileId(String videoFileId) {
+    public InlineQueryResultCachedVideo setVideoFileId(String videoFileId) {
         this.videoFileId = videoFileId;
+        return this;
     }
 
-    public String getCaption() {
+    public String getTitle() {
-        return caption;
+        return title;
     }
 
-    public void setCaption(String caption) {
+    public InlineQueryResultCachedVideo setTitle(String title) {
-        this.caption = caption;
+        this.title = title;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public InlineQueryResultCachedVideo setDescription(String description) {
         this.description = description;
+        return this;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public InlineQueryResultCachedVideo setCaption(String caption) {
+        this.caption = caption;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedVideo setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedVideo setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/inlinequery/result/chached/InlineQueryResultCachedVoice.java

@@ -51,40 +51,45 @@ public class InlineQueryResultCachedVoice implements InlineQueryResult {
         return id;
     }
 
-    public void setId(String id) {
+    public InlineQueryResultCachedVoice setId(String id) {
         this.id = id;
-    }
+        return this;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public InputMessageContent getInputMessageContent() {
-        return inputMessageContent;
-    }
-
-    public void setInputMessageContent(InputMessageContent inputMessageContent) {
-        this.inputMessageContent = inputMessageContent;
-    }
-
-    public InlineKeyboardMarkup getReplyMarkup() {
-        return replyMarkup;
-    }
-
-    public void setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
-        this.replyMarkup = replyMarkup;
     }
 
     public String getVoiceFileId() {
         return voiceFileId;
     }
 
-    public void setVoiceFileId(String voiceFileId) {
+    public InlineQueryResultCachedVoice setVoiceFileId(String voiceFileId) {
         this.voiceFileId = voiceFileId;
+        return this;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public InlineQueryResultCachedVoice setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public InputMessageContent getInputMessageContent() {
+        return inputMessageContent;
+    }
+
+    public InlineQueryResultCachedVoice setInputMessageContent(InputMessageContent inputMessageContent) {
+        this.inputMessageContent = inputMessageContent;
+        return this;
+    }
+
+    public InlineKeyboardMarkup getReplyMarkup() {
+        return replyMarkup;
+    }
+
+    public InlineQueryResultCachedVoice setReplyMarkup(InlineKeyboardMarkup replyMarkup) {
+        this.replyMarkup = replyMarkup;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ForceReplyKeyboard.java

@@ -55,16 +55,18 @@ public class ForceReplyKeyboard implements ReplyKeyboard {
         return forceReply;
     }
 
-    public void setForceReply(Boolean forceReply) {
+    public ForceReplyKeyboard setForceReply(Boolean forceReply) {
         this.forceReply = forceReply;
+        return this;
     }
 
     public Boolean getSelective() {
         return selective;
     }
 
-    public void setSelective(Boolean selective) {
+    public ForceReplyKeyboard setSelective(Boolean selective) {
         this.selective = selective;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/InlineKeyboardMarkup.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.telegram.telegrambots.api.objects.replykeyboard.buttons.InlineKeyboardButton;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,81 +24,22 @@ import java.util.List;
  */
 public class InlineKeyboardMarkup implements ReplyKeyboard {
 
-    private static final String KEYBOARD_FIELD = "keyboard";
+    private static final String KEYBOARD_FIELD = "inline_keyboard";
-    private static final String RESIZEKEYBOARD_FIELD = "resize_keyboard";
-    private static final String ONETIMEKEYBOARD_FIELD = "one_time_keyboard";
-    private static final String SELECTIVE_FIELD = "selective";
     @JsonProperty(KEYBOARD_FIELD)
-    private List<List<String>> keyboard; ///< Array of button rows, each represented by an Array of Strings
+    private List<List<InlineKeyboardButton>> keyboard; ///< Array of button rows, each represented by an Array of Strings
-    @JsonProperty(RESIZEKEYBOARD_FIELD)
-    private Boolean resizeKeyboard; ///< Optional. Requests clients to resize the keyboard vertically for optimal fit (e.g., make the keyboard smaller if there are just two rows of buttons). Defaults to false.
-    @JsonProperty(ONETIMEKEYBOARD_FIELD)
-    private Boolean oneTimeKeyboad; ///< Optional. Requests clients to hide the keyboard as soon as it's been used. Defaults to false.
-    /**
-     * Optional. Use this parameter if you want to show the keyboard to specific users only.
-     * Targets: 1) users that are @mentioned in the text of the Message object; 2) if the bot's
-     * message is a reply (has reply_to_message_id), sender of the original message.
-     */
-    private Boolean selective;
 
     public InlineKeyboardMarkup() {
         super();
-        keyboard = new ArrayList<List<String>>();
+        keyboard = new ArrayList<>();
     }
 
-    public InlineKeyboardMarkup(JSONObject jsonObject) {
+    public List<List<InlineKeyboardButton>> getKeyboard() {
-        super();
-        this.keyboard = new ArrayList<List<String>>();
-        JSONArray keyboard = jsonObject.getJSONArray(KEYBOARD_FIELD);
-        for (int i = 0; i < keyboard.length(); i++) {
-            JSONArray keyboardRow = keyboard.getJSONArray(i);
-            List<String> row = new ArrayList<String>();
-            for (int j = 0; j < keyboardRow.length(); j++) {
-                row.add(keyboardRow.getString(j));
-            }
-            this.keyboard.add(row);
-        }
-        if (jsonObject.has(RESIZEKEYBOARD_FIELD)) {
-            this.resizeKeyboard = jsonObject.getBoolean(RESIZEKEYBOARD_FIELD);
-        }
-        if (jsonObject.has(ONETIMEKEYBOARD_FIELD)) {
-            this.oneTimeKeyboad = jsonObject.getBoolean(ONETIMEKEYBOARD_FIELD);
-        }
-        if (jsonObject.has(SELECTIVE_FIELD)) {
-            this.selective = jsonObject.getBoolean(SELECTIVE_FIELD);
-        }
-    }
-
-    public List<List<String>> getKeyboard() {
         return keyboard;
     }
 
-    public void setKeyboard(List<List<String>> keyboard) {
+    public InlineKeyboardMarkup setKeyboard(List<List<InlineKeyboardButton>> keyboard) {
         this.keyboard = keyboard;
-    }
+        return this;
-
-    public Boolean getResizeKeyboard() {
-        return resizeKeyboard;
-    }
-
-    public void setResizeKeyboard(Boolean resizeKeyboard) {
-        this.resizeKeyboard = resizeKeyboard;
-    }
-
-    public Boolean getOneTimeKeyboad() {
-        return oneTimeKeyboad;
-    }
-
-    public void setOneTimeKeyboad(Boolean oneTimeKeyboad) {
-        this.oneTimeKeyboad = oneTimeKeyboad;
-    }
-
-    public Boolean getSelective() {
-        return selective;
-    }
-
-    public void setSelective(Boolean selective) {
-        this.selective = selective;
     }
 
     @Override
@@ -105,25 +47,15 @@ public class InlineKeyboardMarkup implements ReplyKeyboard {
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonkeyboard = new JSONArray();
 
-        for (List<String> innerRow : this.keyboard) {
+        for (List<InlineKeyboardButton> innerRow : this.keyboard) {
             JSONArray innerJSONKeyboard = new JSONArray();
-            for (String element : innerRow) {
+            for (InlineKeyboardButton element : innerRow) {
-                innerJSONKeyboard.put(element);
+                innerJSONKeyboard.put(element.toJson());
             }
             jsonkeyboard.put(innerJSONKeyboard);
         }
         jsonObject.put(InlineKeyboardMarkup.KEYBOARD_FIELD, jsonkeyboard);
 
-        if (this.oneTimeKeyboad != null) {
-            jsonObject.put(InlineKeyboardMarkup.ONETIMEKEYBOARD_FIELD, this.oneTimeKeyboad);
-        }
-        if (this.resizeKeyboard != null) {
-            jsonObject.put(InlineKeyboardMarkup.RESIZEKEYBOARD_FIELD, this.resizeKeyboard);
-        }
-        if (this.selective != null) {
-            jsonObject.put(InlineKeyboardMarkup.SELECTIVE_FIELD, this.selective);
-        }
-
         return jsonObject;
     }
 
@@ -131,23 +63,14 @@ public class InlineKeyboardMarkup implements ReplyKeyboard {
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
         gen.writeArrayFieldStart(KEYBOARD_FIELD);
-        for (List<String> innerRow : keyboard) {
+        for (List<InlineKeyboardButton> innerRow : keyboard) {
             gen.writeStartArray();
-            for (String element : innerRow) {
+            for (InlineKeyboardButton element : innerRow) {
-                gen.writeString(element);
+                gen.writeObject(element);
             }
             gen.writeEndArray();
         }
         gen.writeEndArray();
-        if (this.oneTimeKeyboad != null) {
-            gen.writeBooleanField(ONETIMEKEYBOARD_FIELD, oneTimeKeyboad);
-        }
-        if (this.resizeKeyboard != null) {
-            gen.writeBooleanField(RESIZEKEYBOARD_FIELD, resizeKeyboard);
-        }
-        if (this.selective != null) {
-            gen.writeBooleanField(SELECTIVE_FIELD, selective);
-        }
         gen.writeEndObject();
         gen.flush();
     }
@@ -159,11 +82,8 @@ public class InlineKeyboardMarkup implements ReplyKeyboard {
 
     @Override
     public String toString() {
-        return "ReplyKeyboardMarkup{" +
+        return "InlineKeyboardMarkup{" +
-                "keyboard=" + keyboard +
+                "inline_keyboard=" + keyboard +
-                ", resizeKeyboard=" + resizeKeyboard +
-                ", oneTimeKeyboad=" + oneTimeKeyboad +
-                ", selective=" + selective +
                 '}';
     }
 }

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardHide.java

@@ -51,16 +51,18 @@ public class ReplyKeyboardHide implements ReplyKeyboard {
         return hideKeyboard;
     }
 
-    public void setHideKeyboard(Boolean hideKeyboard) {
+    public ReplyKeyboardHide setHideKeyboard(Boolean hideKeyboard) {
         this.hideKeyboard = hideKeyboard;
+        return this;
     }
 
     public Boolean getSelective() {
         return selective;
     }
 
-    public void setSelective(Boolean selective) {
+    public ReplyKeyboardHide setSelective(Boolean selective) {
         this.selective = selective;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ReplyKeyboardMarkup.java

@@ -50,32 +50,36 @@ public class ReplyKeyboardMarkup implements ReplyKeyboard {
         return keyboard;
     }
 
-    public void setKeyboard(List<KeyboardRow> keyboard) {
+    public ReplyKeyboardMarkup setKeyboard(List<KeyboardRow> keyboard) {
         this.keyboard = keyboard;
+        return this;
     }
 
     public Boolean getResizeKeyboard() {
         return resizeKeyboard;
     }
 
-    public void setResizeKeyboard(Boolean resizeKeyboard) {
+    public ReplyKeyboardMarkup setResizeKeyboard(Boolean resizeKeyboard) {
         this.resizeKeyboard = resizeKeyboard;
+        return this;
     }
 
     public Boolean getOneTimeKeyboad() {
         return oneTimeKeyboad;
     }
 
-    public void setOneTimeKeyboad(Boolean oneTimeKeyboad) {
+    public ReplyKeyboardMarkup setOneTimeKeyboad(Boolean oneTimeKeyboad) {
         this.oneTimeKeyboad = oneTimeKeyboad;
+        return this;
     }
 
     public Boolean getSelective() {
         return selective;
     }
 
-    public void setSelective(Boolean selective) {
+    public ReplyKeyboardMarkup setSelective(Boolean selective) {
         this.selective = selective;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/InlineKeyboardButton.java

@@ -67,32 +67,36 @@ public class InlineKeyboardButton implements IBotApiObject, IToJson {
         return text;
     }
 
-    public void setText(String text) {
+    public InlineKeyboardButton setText(String text) {
         this.text = text;
+        return this;
     }
 
     public String getUrl() {
         return url;
     }
 
-    public void setUrl(String url) {
+    public InlineKeyboardButton setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     public String getCallbackData() {
         return callbackData;
     }
 
-    public void setCallbackData(String callbackData) {
+    public InlineKeyboardButton setCallbackData(String callbackData) {
         this.callbackData = callbackData;
+        return this;
     }
 
     public String getSwitchInlineQuery() {
         return switchInlineQuery;
     }
 
-    public void setSwitchInlineQuery(String switchInlineQuery) {
+    public InlineKeyboardButton setSwitchInlineQuery(String switchInlineQuery) {
         this.switchInlineQuery = switchInlineQuery;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/buttons/KeyboardButton.java

@@ -71,30 +71,27 @@ public class KeyboardButton implements IBotApiObject, IToJson {
         return text;
     }
 
-    public void setText(String text) {
+    public KeyboardButton setText(String text) {
         this.text = text;
+        return this;
     }
 
     public Boolean getRequestContact() {
         return requestContact;
     }
 
-    public void setRequestContact(Boolean requestContact) {
+    public KeyboardButton setRequestContact(Boolean requestContact) {
-        if (requestContact != null) {
-            requestLocation = null;
-        }
         this.requestContact = requestContact;
+        return this;
     }
 
     public Boolean getRequestLocation() {
         return requestLocation;
     }
 
-    public void setRequestLocation(Boolean requestLocation) {
+    public KeyboardButton setRequestLocation(Boolean requestLocation) {
-        if (requestLocation != null) {
-            requestContact = null;
-        }
         this.requestLocation = requestLocation;
+        return this;
     }
 
     @Override

src/main/java/org/telegram/telegrambots/bots/AbsSender.java

@@ -781,7 +781,9 @@ public abstract class AbsSender {
     // Simplified methods
 
     private void sendApiMethodAsync(BotApiMethod method, SentCallback callback) {
-        exe.submit(() -> {
+        exe.submit(new Runnable() {
+            @Override
+            public void run() {
                 try {
                     CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
                     String url = getBaseUrl() + method.getPath();
@@ -801,6 +803,8 @@ public abstract class AbsSender {
                 } catch (IOException e) {
                     callback.onException(method, e);
                 }
+
+            }
         });
     }
 

src/main/java/org/telegram/telegrambots/updatesreceivers/BotSession.java

@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
  * @brief Thread to request updates with active wait
  * @date 20 of June of 2015
  */
-public class UpdatesThread {
+public class BotSession {
     private static final int SOCKET_TIMEOUT = 30 * 1000;
 
     private final ITelegramLongPollingBot callback;
@@ -40,26 +40,47 @@ public class UpdatesThread {
     private final ConcurrentLinkedDeque<Update> receivedUpdates = new ConcurrentLinkedDeque<>();
     private final String token;
     private int lastReceivedUpdate = 0;
+    private volatile boolean running = true;
+    private volatile CloseableHttpClient httpclient;
 
-    public UpdatesThread(String token, ITelegramLongPollingBot callback) {
+
+    public BotSession(String token, ITelegramLongPollingBot callback) {
         this.token = token;
         this.callback = callback;
         this.readerThread = new ReaderThread();
+        readerThread.setName(callback.getBotUsername() + " Telegram Connection");
         this.readerThread.start();
         this.handlerThread = new HandlerThread();
+        handlerThread.setName(callback.getBotUsername() + " Executor");
         this.handlerThread.start();
     }
     
+    public void close()
+    {
+    	running = false;
+    	if(httpclient != null)
+    	{
+    		try
+			{
+				httpclient.close();
+				httpclient = null;
+            } catch (IOException ignored) {
+			}
+    	}
+    	
+    }
+
     private class ReaderThread extends Thread {
+
 		@Override
         public void run() {
             setPriority(Thread.MIN_PRIORITY);
-            while(true) {
+            while(running) {
                 GetUpdates request = new GetUpdates();
                 request.setLimit(100);
                 request.setTimeout(20);
                 request.setOffset(lastReceivedUpdate + 1);
-                CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).setConnectionTimeToLive(20, TimeUnit.SECONDS).build();
+                httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).setConnectionTimeToLive(20, TimeUnit.SECONDS).build();
                 String url = Constants.BASEURL + token + "/" + GetUpdates.PATH;
                 //config
                 RequestConfig defaultRequestConfig = RequestConfig.custom().build();
@@ -117,7 +138,7 @@ public class UpdatesThread {
         @Override
         public void run() {
             setPriority(Thread.MIN_PRIORITY);
-            while(true) {
+            while(running) {
                 try {
                     Update update = receivedUpdates.pollLast();
                     if (update == null) {