Update README.md

Author: Stanislav Parshin

README.md

@@ -1,46 +1,67 @@
-## Simple Java API for [Telegram Bots][1]
+## Java API for [Telegram Bots][1]
 
-Full support of all Bot API functions
+Full support of all Bot API 2.0 functions
 
 Download
 -------
-Download the latest version via Gradle:
+Gradle:
 ```groovy
-compile 'com.github.pengrad:java-telegram-bot-api:1.3.3'
+compile 'com.github.pengrad:java-telegram-bot-api:2.0.0'
 ```
-or Maven:
+Maven:
 ```xml
 <dependency>
   <groupId>com.github.pengrad</groupId>
   <artifactId>java-telegram-bot-api</artifactId>
-  <version>1.3.3</version>
+  <version>2.0.0</version>
 </dependency>
 ```
-
+JAR-files:  
+https://oss.sonatype.org/content/repositories/releases/com/github/pengrad/java-telegram-bot-api/
 
 Usage
 -------
 #### Create bot
 ```java
 TelegramBot bot = TelegramBotAdapter.build("BOT_TOKEN");
 ```
-**All bot methods have the same signature as original ones.**  
-**You can pass `null` as any _Optional_ parameter**
+#### Execute methods
+```java
+// sync
+BaseResponse response = bot.execute(request);
+
+// async
+bot.execute(request, new Callback() {
+    @Override
+    public void onResponse(BaseRequest request, BaseResponse response) {
+    }
+    @Override
+    public void onFailure(BaseRequest request, IOException e) {
+    }
+});
+```
+**All request methods have the same names as original ones.**  
+**Required params should be passed in constructor.**  
+**Optional params can be added in chains.**
 
 #### Send message
 ```java
-// short syntax
-bot.sendMessage(chatId, "short message sending");
-bot.sendMessage("@mychannel", "short message sending");
+bot.execute(new SendMessage(chatId, "message text"));
 
-// full
-bot.sendMessage(
-    chatId,                    // chat_id
-    "Hello _italic_ *bold*!",  // text
-    ParseMode.Markdown,        // Markdown text or null
-    false,                     // disable_web_page_preview
-    replyMessageId,            // reply_to_message_id
-    new ReplyKeyboardMarkup(new String[]{"ok", "cancel"}).oneTimeKeyboard(true));  // keyboard
+bot.execute(
+        new SendMessage(chatId, "message <b>bold</b> text")
+                .parseMode(ParseMode.HTML)
+                .replyMarkup(new ReplyKeyboardMarkup(new String[]{"button 1", "button 2"}))
+);
+
+bot.execute(new SendMessage("@mychannel", "message text"), new Callback<SendMessage, SendResponse>() {
+    @Override
+    public void onResponse(SendMessage request, SendResponse response) {
+    }
+    @Override
+    public void onFailure(SendMessage request, IOException e) {
+    }
+});
 ```
 #### Keyboards
 ```java
@@ -56,67 +77,12 @@ Keyboard replyKeyboardHide = new ReplyKeyboardHide(); // new ReplyKeyboardHide(i
 ```
 #### Getting response to sending methods
 ```java
-SendResponse sendResponse = bot.sendMessage(chatId, "short message sending");
+SendResponse sendResponse = bot.execute(new SendMessage(chatId, "text"));
 Message message = sendResponse.message();
 ```
-#### Send files
-3 options to sending files
-```java
-// as String, resending existing file
-String fileId;
-
-// as File
-InputFile.photo(file);
-InputFile.audio(file);
-InputFile.video(file);
-InputFile.voice(file);
-new InputFile("text/plain", file); 
-
-// as byte[]
-InputFileBytes.photo(bytes);
-InputFileBytes.audio(bytes);
-InputFileBytes.video(bytes);
-InputFileBytes.voice(bytes);
-new InputFileBytes("text/plain", bytes, "my-file.txt");
-```
-Examples
-```java
-// Photo
-String fileId = // resending fileId
-bot.sendPhoto(chatId, fileId, "caption", null, null);
-bot.sendPhoto(chatId, InputFile.photo(imageFile), "caption", replyMessageId, new ForceReply());
-bot.sendPhoto(chatId, InputFileBytes.photo(bytes), "caption", null, new ReplyKeyboardHide());
-
-// Same options for all types 
-// Audio
-bot.sendAudio(chatId, InputFile.audio(audioFile), duration, performer, title, null, null);
-
-// Video
-bot.sendVideo(chatId, InputFile.video(videoFile), duration, "caption", null, null);
-
-// Document
-bot.sendDocument(chatId, new InputFile("text/plain", docFile), null, null);
-
-// Sticker
-bot.sendSticker(chatId, stickerId, null, null);
-
-// Voice
-bot.sendVoice(chatId, InputFileBytes.voice(bytes), duration, null, null);
-```
-#### Send chat action
-```java
-bot.sendChatAction(chatId, ChatAction.find_location);
-bot.sendChatAction(chatId, ChatAction.typing);
-bot.sendChatAction(chatId, ChatAction.record_audio);
-bot.sendChatAction(chatId, ChatAction.record_video);
-bot.sendChatAction("@channel", ChatAction.upload_audio);
-bot.sendChatAction("@channel", ChatAction.upload_document);
-bot.sendChatAction("@channel", ChatAction.upload_photo);
-bot.sendChatAction("@channel", ChatAction.upload_video);
-```
 #### Get updates 
 ```java
-GetUpdatesResponse updatesResponse = bot.getUpdates(offset, limit, timeout);
+GetUpdatesResponse updatesResponse = bot.execute(new GetUpdates().limit(0).offset(0).timeout(0));
 List<Update> updates = updatesResponse.updates();
 ...
 Message message = update.message()
@@ -129,15 +95,14 @@ Message message = update.message();
 ```
 #### Get file
 ```java
-GetFileResponse getFileResponse = bot.getFile("fileId");
+GetFileResponse getFileResponse = bot.execute(new GetFile("fileId"));
 File file = getFileResponse.file(); // com.pengrad.telegrambot.model.File
 file.fileId();
 file.filePath();  // relative path
 file.fileSize();
 ```
 To get downloading link as `https://api.telegram.org/file/bot<token>/<file_path>`
 ```java
-String fullPath = bot.getFullFilePath("fileId");
 String fullPath = bot.getFullFilePath(file);  // com.pengrad.telegrambot.model.File
 ```
 #### Inline mode
@@ -164,9 +129,16 @@ InlineQueryResult r5 = new InlineQueryResultVideo("id", "videoUrl", InlineQueryR
 ```
 Send query
 ```java
-bot.answerInlineQuery(inlineQuery.id(), r1, r2, r3, r4, r5);
+bot.execute(new AnswerInlineQuery(inlineQuery.id(), r1, r2, r3, r4, r5));
 // or full
-bot.answerInlineQuery(inlineQuery.id(), new InlineQueryResult[]{r1, r2, r3, r4, r5}, cacheTime, isPersonal, nextOffset);
+bot.execute(
+        new AnswerInlineQuery(inlineQuery.id(), new InlineQueryResult[]{r1, r2, r3, r4, r5})
+                .cacheTime(cacheTime)
+                .isPersonal(isPersonal)
+                .nextOffset("offset")
+                .switchPmParameter("pmParam")
+                .switchPmText("pmText")
+);
 ```