Merge pull request #42 from rubenlagus/dev

Fix CallbackQuery bug

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

@@ -51,22 +51,6 @@ 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);
@@ -80,6 +64,26 @@ public class CallbackQuery implements IBotApiObject {
         data = jsonObject.getString(DATA_FIELD);
     }
 
+    public String getId() {
+        return this.id;
+    }
+
+    public User getFrom() {
+        return this.from;
+    }
+
+    public Message getMessage() {
+        return this.message;
+    }
+
+    public String getInlineMessageId() {
+        return this.inlineMessageId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();