Skip to content

Commit 0d27833

Browse files
committed
SDK v1.0.8 based on v5.126.10 API schema
1 parent f5ba289 commit 0d27833

File tree

77 files changed

+1087
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1087
-264
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ Override methods from CallbackApi class for handling events
345345
public class CallbackApiHandler extends CallbackApi {
346346
@Override
347347
public void messageNew(Integer groupId, Message message) {
348-
System.out.println(message.getBody());
348+
System.out.println(message.getText());
349349
}
350350
}
351351
```

examples/callback-api-group-bot/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ dependencies {
1010
compile project(':sdk')
1111

1212
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion
13-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
14-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
1513
}

examples/callback-api-group-bot/src/main/java/com/vk/api/examples/group/bot/Application.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.vk.api.sdk.exceptions.ApiException;
66
import com.vk.api.sdk.exceptions.ClientException;
77
import com.vk.api.sdk.httpclient.HttpTransportClient;
8-
import com.vk.api.sdk.objects.base.BoolInt;
9-
import com.vk.api.sdk.objects.base.responses.OkResponse;
108

119
import java.io.FileNotFoundException;
1210
import java.io.IOException;

examples/group-oauth/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ repositories {
1111
dependencies {
1212
compile project(':sdk')
1313

14-
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: jacksonVersion
1514
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
1615
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion
17-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
1816
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: jettyVersion
1917

2018
testCompile group: 'org.testng', name: 'testng', version: testngVersion

examples/group-oauth/src/main/java/com/vk/api/examples/oauth/group/Application.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
import java.io.InputStream;
1414
import java.util.Properties;
1515

16-
/**
17-
* Created by Anton Tsivarev on 15.10.16.
18-
*/
1916
public class Application {
2017

2118
private static final Logger LOG = LoggerFactory.getLogger(Application.class);
@@ -26,10 +23,10 @@ public static void main(String[] args) throws Exception {
2623
}
2724

2825
private static void initServer(Properties properties) throws Exception {
29-
Integer port = Integer.valueOf(properties.getProperty("server.port"));
3026
String host = properties.getProperty("server.host");
27+
int port = Integer.parseInt(properties.getProperty("server.port"));
3128

32-
Integer clientId = Integer.valueOf(properties.getProperty("client.id"));
29+
int clientId = Integer.parseInt(properties.getProperty("client.id"));
3330
String clientSecret = properties.getProperty("client.secret");
3431

3532
HandlerCollection handlers = new HandlerCollection();

examples/group-oauth/src/main/java/com/vk/api/examples/oauth/group/RequestHandler.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.vk.api.sdk.objects.UserAuthResponse;
88
import com.vk.api.sdk.objects.groups.Filter;
99
import com.vk.api.sdk.objects.groups.Group;
10-
import com.vk.api.sdk.objects.groups.GroupFull;
10+
import com.vk.api.sdk.objects.groups.responses.GetByIdLegacyResponse;
1111
import com.vk.api.sdk.objects.groups.responses.GetResponse;
1212
import org.eclipse.jetty.server.Request;
1313
import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -18,9 +18,6 @@
1818
import java.io.IOException;
1919
import java.util.List;
2020

21-
/**
22-
* Created by Anton Tsivarev on 15.10.16.
23-
*/
2421
public class RequestHandler extends AbstractHandler {
2522

2623
private final static String CONTENT_TYPE = "text/html;charset=utf-8";
@@ -45,7 +42,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
4542
GroupAuthResponse groupAuthResponse = vk.oAuth().groupAuthorizationCodeFlow(clientId, clientSecret, getGroupRedirectUri(groupId), baseRequest.getParameter("code")).execute();
4643
GroupActor groupActor = new GroupActor(groupId, groupAuthResponse.getAccessTokens().get(groupId));
4744

48-
List<GroupFull> groups = vk.groups().getById(groupActor).groupId(groupId.toString()).execute();
45+
List<GetByIdLegacyResponse> groups = vk.groups().getByIdLegacy(groupActor).groupId(groupId.toString()).execute();
4946

5047
response.setContentType(CONTENT_TYPE);
5148
response.setStatus(HttpServletResponse.SC_OK);

examples/hello-bot/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ dependencies {
1919
compile project(':sdk')
2020

2121
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion
22-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
23-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
2422
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: jettyVersion
2523
}
2624

examples/user-oauth/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ repositories {
1111
dependencies {
1212
compile project(':sdk')
1313

14-
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: jacksonVersion
1514
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
1615
compile group: 'org.eclipse.jetty', name: 'jetty-server', version: jettyVersion
1716
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4jVersion
18-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4jVersion
19-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4jVersion
2017
testCompile group: 'org.testng', name: 'testng', version: testngVersion
2118
}
2219

examples/user-oauth/src/main/java/com/vk/api/examples/oauth/user/Application.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
import java.io.InputStream;
1414
import java.util.Properties;
1515

16-
/**
17-
* Created by Anton Tsivarev on 15.10.16.
18-
*/
1916
public class Application {
2017

2118
private static final Logger LOG = LoggerFactory.getLogger(Application.class);
@@ -26,10 +23,10 @@ public static void main(String[] args) throws Exception {
2623
}
2724

2825
private static void initServer(Properties properties) throws Exception {
29-
Integer port = Integer.valueOf(properties.getProperty("server.port"));
3026
String host = properties.getProperty("server.host");
27+
int port = Integer.parseInt(properties.getProperty("server.port"));
3128

32-
Integer clientId = Integer.valueOf(properties.getProperty("client.id"));
29+
int clientId = Integer.parseInt(properties.getProperty("client.id"));
3330
String clientSecret = properties.getProperty("client.secret");
3431

3532
HandlerCollection handlers = new HandlerCollection();
@@ -40,7 +37,7 @@ private static void initServer(Properties properties) throws Exception {
4037
resourceHandler.setResourceBase(Application.class.getResource("/static").getPath());
4138

4239
VkApiClient vk = new VkApiClient(new HttpTransportClient());
43-
handlers.setHandlers(new Handler[]{resourceHandler, new RequestHandler(vk, clientId, clientSecret, host)});
40+
handlers.setHandlers(new Handler[]{resourceHandler, new RequestHandler(vk, clientId, clientSecret, host, port)});
4441

4542
Server server = new Server(port);
4643
server.setHandler(handlers);

examples/user-oauth/src/main/java/com/vk/api/examples/oauth/user/RequestHandler.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import com.vk.api.sdk.client.VkApiClient;
44
import com.vk.api.sdk.client.actors.UserActor;
55
import com.vk.api.sdk.objects.UserAuthResponse;
6-
import com.vk.api.sdk.objects.users.UserXtrCounters;
6+
import com.vk.api.sdk.objects.users.responses.GetResponse;
77
import org.eclipse.jetty.server.Request;
88
import org.eclipse.jetty.server.handler.AbstractHandler;
99

10-
import javax.servlet.ServletException;
1110
import javax.servlet.http.HttpServletRequest;
1211
import javax.servlet.http.HttpServletResponse;
1312
import java.io.IOException;
@@ -21,23 +20,25 @@ public class RequestHandler extends AbstractHandler {
2120
private final String clientSecret;
2221
private final int clientId;
2322
private final String host;
23+
private final Integer port;
2424
private final VkApiClient vk;
2525

26-
public RequestHandler(VkApiClient vk, int clientId, String clientSecret, String host) {
26+
public RequestHandler(VkApiClient vk, int clientId, String clientSecret, String host, Integer port) {
2727
this.vk = vk;
2828
this.clientId = clientId;
2929
this.clientSecret = clientSecret;
3030
this.host = host;
31+
this.port = port;
3132
}
3233

3334
@Override
34-
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
35+
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
3536
switch (target) {
3637
case "/info":
3738
try {
3839
UserActor actor = new UserActor(Integer.parseInt(baseRequest.getParameter("user")), baseRequest.getParameter("token"));
39-
List<UserXtrCounters> getUsersResponse = vk.users().get(actor).userIds(baseRequest.getParameter("user")).execute();
40-
UserXtrCounters user = getUsersResponse.get(0);
40+
List<GetResponse> getUsersResponse = vk.users().get(actor).userIds(baseRequest.getParameter("user")).execute();
41+
GetResponse user = getUsersResponse.get(0);
4142

4243
response.setContentType("text/html;charset=utf-8");
4344
response.setStatus(HttpServletResponse.SC_OK);
@@ -79,10 +80,10 @@ private String getOAuthUrl() {
7980
}
8081

8182
private String getRedirectUri() {
82-
return host + "/callback";
83+
return String.format("http://%s:%d", host, port) + "/callback";
8384
}
8485

85-
private String getInfoPage(UserXtrCounters user) {
86+
private String getInfoPage(GetResponse user) {
8687
return "Hello <a href='https://vk.com/id" + user.getId() + "'>" + user.getFirstName() + "</a>";
8788
}
8889
}

0 commit comments

Comments
 (0)