From 0c2b103d35c6b9fd6c2319c752fc46e2fbb26597 Mon Sep 17 00:00:00 2001
From: Vladislav Metelyagin <v.metelyagin@just-ai.com>
Date: Tue, 25 May 2021 17:38:33 +0300
Subject: [PATCH 1/2] fix api compatibility with latest api version

---
 .../vk/api/sdk/objects/callback/MessageData.java   | 14 +++++++-------
 .../objects/callback/messages/CallbackMessage.java |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageData.java b/sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageData.java
index 7bcb45c2..c87cec75 100644
--- a/sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageData.java
+++ b/sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageData.java
@@ -1,36 +1,36 @@
 package com.vk.api.sdk.objects.callback;
 
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import com.vk.api.sdk.objects.Validable;
 import com.vk.api.sdk.objects.client.InfoForBots;
+
 import java.util.Objects;
 
 /**
  * MessageData object
  */
-public class MessageData implements Validable {
+public class MessageData<T> implements Validable {
     @SerializedName("client_info")
     private InfoForBots clientInfo;
 
     @SerializedName("message")
-    private JsonObject message;
+    private T message;
 
     public InfoForBots getClientInfo() {
         return clientInfo;
     }
 
-    public MessageData setClientInfo(InfoForBots clientInfo) {
+    public MessageData<T> setClientInfo(InfoForBots clientInfo) {
         this.clientInfo = clientInfo;
         return this;
     }
 
-    public JsonObject getMessage() {
+    public T getMessage() {
         return message;
     }
 
-    public MessageData setMessage(JsonObject message) {
+    public MessageData<T> setMessage(T message) {
         this.message = message;
         return this;
     }
@@ -44,7 +44,7 @@ public int hashCode() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        MessageData messageData = (MessageData) o;
+        MessageData<?> messageData = (MessageData<?>) o;
         return Objects.equals(clientInfo, messageData.clientInfo) &&
                 Objects.equals(message, messageData.message);
     }
diff --git a/sdk/src/main/java/com/vk/api/sdk/objects/callback/messages/CallbackMessage.java b/sdk/src/main/java/com/vk/api/sdk/objects/callback/messages/CallbackMessage.java
index 7efeb321..469410e0 100644
--- a/sdk/src/main/java/com/vk/api/sdk/objects/callback/messages/CallbackMessage.java
+++ b/sdk/src/main/java/com/vk/api/sdk/objects/callback/messages/CallbackMessage.java
@@ -1,6 +1,7 @@
 package com.vk.api.sdk.objects.callback.messages;
 
 import com.google.gson.annotations.SerializedName;
+import com.vk.api.sdk.objects.callback.MessageData;
 import com.vk.api.sdk.objects.callback.MessageType;
 
 import java.util.Objects;
@@ -17,7 +18,7 @@ public class CallbackMessage<T> {
     private Integer groupId;
 
     @SerializedName("object")
-    private T object;
+    private MessageData<T> object;
 
     @SerializedName("secret")
     private String secret;
@@ -31,7 +32,7 @@ public Integer getGroupId() {
     }
 
     public T getObject() {
-        return object;
+        return object.getMessage();
     }
 
     public String getSecret() {

From 2f7b7f8d636b7e6b669972e4df94e53d773a6e3e Mon Sep 17 00:00:00 2001
From: Vladislav Metelyagin <v.metelyagin@just-ai.com>
Date: Tue, 25 May 2021 18:38:08 +0300
Subject: [PATCH 2/2] minor improvements with logging and generics

---
 sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java b/sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java
index c9dfd0a0..4c7e7476 100644
--- a/sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java
+++ b/sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java
@@ -455,11 +455,11 @@ public boolean parse(JsonObject json) {
 
         Type typeOfClass = CALLBACK_TYPES.get(type);
         if (typeOfClass == null) {
-            LOG.warn("Unsupported callback event", type);
+            LOG.warn("Unsupported callback event: {}", type);
             return false;
         }
 
-        CallbackMessage message = gson.fromJson(json, typeOfClass);
+        CallbackMessage<?> message = gson.fromJson(json, typeOfClass);
 
         switch (type) {
             case CALLBACK_EVENT_MESSAGE_NEW:
@@ -615,7 +615,7 @@ public boolean parse(JsonObject json) {
                 break;
 
             default:
-                LOG.warn("Unsupported callback event", type);
+                LOG.warn("Unsupported callback event: {}", type);
                 return false;
 
         }