Change MessageEntity.type to enum.

New fields: edited_message in Update, edit_date in Message, user in MessageEntity.
New value text_mention for the type field in MessageEntity.

Author: pengrad

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

@@ -16,6 +16,7 @@ public class Message {
     private Chat forward_from_chat;
     private Integer forward_date;
     private Message reply_to_message;
+    private Integer edit_date;
     private String text;
     private MessageEntity[] entities;
     private Audio audio;
@@ -72,6 +73,10 @@ public Message replyToMessage() {
         return reply_to_message;
     }
 
+    public Integer editDate() {
+        return edit_date;
+    }
+
     public String text() {
         return text;
     }
@@ -181,6 +186,7 @@ public boolean equals(Object o) {
         if (forward_date != null ? !forward_date.equals(message.forward_date) : message.forward_date != null) return false;
         if (reply_to_message != null ? !reply_to_message.equals(message.reply_to_message) : message.reply_to_message != null)
             return false;
+        if (edit_date != null ? !edit_date.equals(message.edit_date) : message.edit_date != null) return false;
         if (text != null ? !text.equals(message.text) : message.text != null) return false;
         // Probably incorrect - comparing Object[] arrays with Arrays.equals
         if (!Arrays.equals(entities, message.entities)) return false;
@@ -235,6 +241,7 @@ public String toString() {
                 ", forward_from_chat=" + forward_from_chat +
                 ", forward_date=" + forward_date +
                 ", reply_to_message=" + reply_to_message +
+                ", edit_date=" + edit_date +
                 ", text='" + text + '\'' +
                 ", entities=" + Arrays.toString(entities) +
                 ", audio=" + audio +

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

@@ -6,12 +6,17 @@
  */
 public class MessageEntity {
 
-    private String type;
+    public enum Type {
+        mention, hashtag, bot_command, url, email, bold, italic, code, pre, text_link, text_mention;
+    }
+
+    private Type type;
     private Integer offset;
     private Integer length;
     private String url;
+    private User user;
 
-    public String type() {
+    public Type type() {
         return type;
     }
 
@@ -27,17 +32,22 @@ public String url() {
         return url;
     }
 
+    public User user() {
+        return user;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
         MessageEntity that = (MessageEntity) o;
 
-        if (type != null ? !type.equals(that.type) : that.type != null) return false;
+        if (type != that.type) return false;
         if (offset != null ? !offset.equals(that.offset) : that.offset != null) return false;
         if (length != null ? !length.equals(that.length) : that.length != null) return false;
-        return url != null ? url.equals(that.url) : that.url == null;
+        if (url != null ? !url.equals(that.url) : that.url != null) return false;
+        return user != null ? user.equals(that.user) : that.user == null;
 
     }
 
@@ -47,16 +57,18 @@ public int hashCode() {
         result = 31 * result + (offset != null ? offset.hashCode() : 0);
         result = 31 * result + (length != null ? length.hashCode() : 0);
         result = 31 * result + (url != null ? url.hashCode() : 0);
+        result = 31 * result + (user != null ? user.hashCode() : 0);
         return result;
     }
 
     @Override
     public String toString() {
         return "MessageEntity{" +
-                "type='" + type + '\'' +
+                "type=" + type +
                 ", offset=" + offset +
                 ", length=" + length +
                 ", url='" + url + '\'' +
+                ", user=" + user +
                 '}';
     }
 }

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

@@ -8,6 +8,7 @@ public class Update {
 
     private Integer update_id;
     private Message message;
+    private Message edited_message;
     private InlineQuery inline_query;
     private ChosenInlineResult chosen_inline_result;
     private CallbackQuery callback_query;
@@ -20,6 +21,10 @@ public Message message() {
         return message;
     }
 
+    public Message editedMessage() {
+        return edited_message;
+    }
+
     public InlineQuery inlineQuery() {
         return inline_query;
     }
@@ -41,6 +46,8 @@ 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;
+        if (edited_message != null ? !edited_message.equals(update.edited_message) : update.edited_message != null)
+            return false;
         if (inline_query != null ? !inline_query.equals(update.inline_query) : update.inline_query != null) return false;
         if (chosen_inline_result != null ? !chosen_inline_result.equals(update.chosen_inline_result) : update.chosen_inline_result != null)
             return false;
@@ -58,6 +65,7 @@ public String toString() {
         return "Update{" +
                 "update_id=" + update_id +
                 ", message=" + message +
+                ", edited_message=" + edited_message +
                 ", inline_query=" + inline_query +
                 ", chosen_inline_result=" + chosen_inline_result +
                 ", callback_query=" + callback_query +

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

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