Archived
0

множество мелких изменений

This commit is contained in:
2018-12-07 16:06:20 +03:00
parent ed2fbf3e0b
commit 50a43b09ea
12 changed files with 13 additions and 56 deletions

5
.gitignore vendored
View File

@@ -12,13 +12,8 @@ bin/
.classpath
.project
## GRADLE ##
.gradle/
build/
## MAVEN ##
target/
## OTHER ##
lib/

View File

@@ -25,6 +25,12 @@
</dependency>
<!-- COMPONENTS -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>

View File

@@ -1,13 +1,8 @@
/*
* DmitriyMX <mail@dmitriymx.ru>
* 2017-04-10
*/
package ru.dmitriymx.vkapi;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;
import ru.dmitriymx.vkapi.browser.Browser;
import ru.dmitriymx.vkapi.browser.Response;
@@ -15,9 +10,9 @@ import java.io.IOException;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
public class VkApi {
private static final String VKAPI_URL = "https://api.vk.com/method/";
private final Logger logger = LoggerFactory.getLogger(VkApi.class);
private final String accessToken;
private final Browser browser;
private final Gson gson;
@@ -136,9 +131,7 @@ public class VkApi {
throw new IllegalStateException("content is empty");
}
if (logger.isDebugEnabled()) {
logger.debug(response.getContent().trim());
}
log.debug(response.getContent().trim());
}
private void safeSleep(long ms) {

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <mail@dmitriymx.ru>
* 2017-04-10
*/
package ru.dmitriymx.vkapi;
import com.google.gson.JsonObject;

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-10
*/
package ru.dmitriymx.vkapi.browser;
import org.apache.commons.io.IOUtils;

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-10
*/
package ru.dmitriymx.vkapi.browser;
public class ApacheResponse implements Response {

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <mail@dmitriymx.ru>
* 2017-04-10
*/
package ru.dmitriymx.vkapi.browser;
import java.io.IOException;

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <mail@dmitriymx.ru>
* 2017-04-10
*/
package ru.dmitriymx.vkapi.browser;
public interface Response {

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-11
*/
package ru.dmitriymx.vkapi.longpoll;
import com.google.gson.JsonArray;

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-11
*/
package ru.dmitriymx.vkapi.longpoll;
public interface EventListener {

View File

@@ -1,11 +1,8 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-11
*/
package ru.dmitriymx.vkapi.longpoll;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.dmitriymx.vkapi.VkApi;
@@ -16,8 +13,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
class LPRunner implements Runnable {
private final Logger logger = LoggerFactory.getLogger(LPRunner.class);
private final VkApi vkApi;
private final String server;
private final String key;
@@ -34,9 +31,7 @@ class LPRunner implements Runnable {
@Override
public void run() {
while (!Thread.currentThread().isInterrupted()) {
if (logger.isDebugEnabled()) {
logger.debug("next loop...");
}
log.debug("next loop...");
try {
JsonObject jsonObject = vkApi.longExecApi(
@@ -53,7 +48,7 @@ class LPRunner implements Runnable {
this.ts = jsonObject.get("ts").getAsLong();
} catch (VkApiException e) {
logger.error("Oops!", e);
log.error("Oops!", e);
}
}
}

View File

@@ -1,7 +1,3 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-04-11
*/
package ru.dmitriymx.vkapi.longpoll;
import com.google.gson.JsonObject;