diff --git a/.gitignore b/.gitignore index a44b3d1..0688536 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,8 @@ bin/ .classpath .project -## GRADLE ## -.gradle/ -build/ - ## MAVEN ## target/ ## OTHER ## lib/ - diff --git a/pom.xml b/pom.xml index 2f22b4d..ee2083a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,12 @@ + + org.projectlombok + lombok + 1.18.2 + provided + com.google.code.gson gson diff --git a/src/main/java/ru/dmitriymx/vkapi/VkApi.java b/src/main/java/ru/dmitriymx/vkapi/VkApi.java index ef152ae..a0c0e44 100644 --- a/src/main/java/ru/dmitriymx/vkapi/VkApi.java +++ b/src/main/java/ru/dmitriymx/vkapi/VkApi.java @@ -1,13 +1,8 @@ -/* - * DmitriyMX - * 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) { diff --git a/src/main/java/ru/dmitriymx/vkapi/VkApiException.java b/src/main/java/ru/dmitriymx/vkapi/VkApiException.java index baf2f86..d732bbd 100644 --- a/src/main/java/ru/dmitriymx/vkapi/VkApiException.java +++ b/src/main/java/ru/dmitriymx/vkapi/VkApiException.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-10 - */ package ru.dmitriymx.vkapi; import com.google.gson.JsonObject; diff --git a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java index deae5d4..6b50102 100644 --- a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java +++ b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-10 - */ package ru.dmitriymx.vkapi.browser; import org.apache.commons.io.IOUtils; diff --git a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheResponse.java b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheResponse.java index 91613b2..2ff2453 100644 --- a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheResponse.java +++ b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheResponse.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-10 - */ package ru.dmitriymx.vkapi.browser; public class ApacheResponse implements Response { diff --git a/src/main/java/ru/dmitriymx/vkapi/browser/Browser.java b/src/main/java/ru/dmitriymx/vkapi/browser/Browser.java index 2281a4f..dcb9538 100644 --- a/src/main/java/ru/dmitriymx/vkapi/browser/Browser.java +++ b/src/main/java/ru/dmitriymx/vkapi/browser/Browser.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-10 - */ package ru.dmitriymx.vkapi.browser; import java.io.IOException; diff --git a/src/main/java/ru/dmitriymx/vkapi/browser/Response.java b/src/main/java/ru/dmitriymx/vkapi/browser/Response.java index 8496471..c87989f 100644 --- a/src/main/java/ru/dmitriymx/vkapi/browser/Response.java +++ b/src/main/java/ru/dmitriymx/vkapi/browser/Response.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-10 - */ package ru.dmitriymx.vkapi.browser; public interface Response { diff --git a/src/main/java/ru/dmitriymx/vkapi/longpoll/Event.java b/src/main/java/ru/dmitriymx/vkapi/longpoll/Event.java index f818fda..8b341f3 100644 --- a/src/main/java/ru/dmitriymx/vkapi/longpoll/Event.java +++ b/src/main/java/ru/dmitriymx/vkapi/longpoll/Event.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-11 - */ package ru.dmitriymx.vkapi.longpoll; import com.google.gson.JsonArray; diff --git a/src/main/java/ru/dmitriymx/vkapi/longpoll/EventListener.java b/src/main/java/ru/dmitriymx/vkapi/longpoll/EventListener.java index a467460..c11763b 100644 --- a/src/main/java/ru/dmitriymx/vkapi/longpoll/EventListener.java +++ b/src/main/java/ru/dmitriymx/vkapi/longpoll/EventListener.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-11 - */ package ru.dmitriymx.vkapi.longpoll; public interface EventListener { diff --git a/src/main/java/ru/dmitriymx/vkapi/longpoll/LPRunner.java b/src/main/java/ru/dmitriymx/vkapi/longpoll/LPRunner.java index b945f6e..854b8a3 100644 --- a/src/main/java/ru/dmitriymx/vkapi/longpoll/LPRunner.java +++ b/src/main/java/ru/dmitriymx/vkapi/longpoll/LPRunner.java @@ -1,11 +1,8 @@ -/* - * DmitriyMX - * 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); } } } diff --git a/src/main/java/ru/dmitriymx/vkapi/longpoll/LongPollListener.java b/src/main/java/ru/dmitriymx/vkapi/longpoll/LongPollListener.java index 7b6506f..c0b8e8b 100644 --- a/src/main/java/ru/dmitriymx/vkapi/longpoll/LongPollListener.java +++ b/src/main/java/ru/dmitriymx/vkapi/longpoll/LongPollListener.java @@ -1,7 +1,3 @@ -/* - * DmitriyMX - * 2017-04-11 - */ package ru.dmitriymx.vkapi.longpoll; import com.google.gson.JsonObject;