ChosenInlineResult support

Author: pengrad

src/main/java/com/pengrad/telegrambot/model/ChosenInlineResult.java

@@ -0,0 +1,54 @@
+package com.pengrad.telegrambot.model;
+
+/**
+ * stas
+ * 1/20/16.
+ */
+public class ChosenInlineResult {
+
+    private String result_id;
+    private User from;
+    private String query;
+
+    ChosenInlineResult() {
+    }
+
+    public String resultId() {
+        return result_id;
+    }
+
+    public User from() {
+        return from;
+    }
+
+    public String query() {
+        return query;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ChosenInlineResult that = (ChosenInlineResult) o;
+
+        if (result_id != null ? !result_id.equals(that.result_id) : that.result_id != null) return false;
+        if (from != null ? !from.equals(that.from) : that.from != null) return false;
+        return query != null ? query.equals(that.query) : that.query == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        return result_id != null ? result_id.hashCode() : 0;
+    }
+
+    @Override
+    public String toString() {
+        return "ChosenInlineResult{" +
+                "result_id='" + result_id + '\'' +
+                ", from=" + from +
+                ", query='" + query + '\'' +
+                '}';
+    }
+}

src/main/java/com/pengrad/telegrambot/model/Update.java

@@ -9,6 +9,7 @@ public class Update {
     private Integer update_id;
     private Message message;
     private InlineQuery inline_query;
+    private ChosenInlineResult chosen_inline_result;
 
     Update() {
     }
@@ -25,6 +26,10 @@ public InlineQuery inlineQuery() {
         return inline_query;
     }
 
+    public ChosenInlineResult chosenInlineResult() {
+        return chosen_inline_result;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -34,7 +39,9 @@ public boolean equals(Object o) {
 
         if (update_id != null ? !update_id.equals(update.update_id) : update.update_id != null) return false;
         if (message != null ? !message.equals(update.message) : update.message != null) return false;
-        return inline_query != null ? inline_query.equals(update.inline_query) : update.inline_query == null;
+        if (inline_query != null ? !inline_query.equals(update.inline_query) : update.inline_query != null)
+            return false;
+        return chosen_inline_result != null ? chosen_inline_result.equals(update.chosen_inline_result) : update.chosen_inline_result == null;
     }
 
     @Override
@@ -48,6 +55,7 @@ public String toString() {
                 "update_id=" + update_id +
                 ", message=" + message +
                 ", inline_query=" + inline_query +
+                ", chosen_inline_result=" + chosen_inline_result +
                 '}';
     }
 }

src/test/java/com/pengrad/telegrambot/ChosenInlineResultTest.java

@@ -0,0 +1,19 @@
+package com.pengrad.telegrambot;
+
+import com.pengrad.telegrambot.model.ChosenInlineResult;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * stas
+ * 1/20/16.
+ */
+public class ChosenInlineResultTest {
+
+    public static void check(ChosenInlineResult result) {
+        assertNotNull(result.resultId());
+        assertNotNull(result.query());
+        UserTest.checkUser(result.from());
+    }
+
+}

src/test/java/com/pengrad/telegrambot/UpdateTest.java

@@ -17,7 +17,8 @@ public static void check(List<Update> updates) {
             assertNotNull(update.updateId());
             if (update.message() != null) MessageTest.checkMessage(update.message());
             else if (update.inlineQuery() != null) InlineQueryTest.checkQuery(update.inlineQuery());
-            else throw new RuntimeException("Both message and inlineQuery are null");
+            else if (update.chosenInlineResult() != null) ChosenInlineResultTest.check(update.chosenInlineResult());
+            else throw new RuntimeException("Message and inlineQuery and chosenInlineResult are null");
         }
     }