Skip to content

fix api compatibility with latest api version #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Denire wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix api compatibility with latest api version #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c2b103
fix api compatibility with latest api version
Denire May 25, 2021
2f7b7f8
minor improvements with logging and generics
Denire May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;

}
Expand Down
14 changes: 7 additions & 7 deletions sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand All @@ -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);
}
Expand Down
5 changes: 3 additions & 2 deletions sdk/src/main/java/com/vk/api/sdk/objects/callback/messages/CallbackMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -31,7 +32,7 @@ public Integer getGroupId() {
}

public T getObject() {
return object;
return object.getMessage();
}

public String getSecret() {
Expand Down