From 2a414b0740eced0ef84c73c6ebd6db70a299c2b1 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 7 Dec 2018 16:13:12 +0300 Subject: [PATCH] =?UTF-8?q?"=D0=BE=D0=BB=D0=BE=D0=BC=D0=B1=D0=BE=D1=87?= =?UTF-8?q?=D0=B8=D0=B2=D0=B0=D0=B5=D0=BC"=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/dmitriymx/vkapi/VkApi.java | 22 +++++-------------- .../dmitriymx/vkapi/browser/ApacheBroswe.java | 7 ++---- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/main/java/ru/dmitriymx/vkapi/VkApi.java b/src/main/java/ru/dmitriymx/vkapi/VkApi.java index a0c0e44..7542d7e 100644 --- a/src/main/java/ru/dmitriymx/vkapi/VkApi.java +++ b/src/main/java/ru/dmitriymx/vkapi/VkApi.java @@ -2,6 +2,8 @@ package ru.dmitriymx.vkapi; import com.google.gson.Gson; import com.google.gson.JsonObject; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import ru.dmitriymx.vkapi.browser.Browser; import ru.dmitriymx.vkapi.browser.Response; @@ -16,7 +18,11 @@ public class VkApi { private final String accessToken; private final Browser browser; private final Gson gson; + @Getter + @Setter private String apiVersion = "5.62"; + @Getter + @Setter private long callPause = 1200L; private long lastTime; private int call = 0; @@ -30,22 +36,6 @@ public class VkApi { this.gson = new Gson(); } - public String getApiVersion() { - return apiVersion; - } - - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - public long getCallPause() { - return callPause; - } - - public void setCallPause(long callPause) { - this.callPause = callPause; - } - public JsonObject execApi(String methodApi, Map params) throws VkApiException { checkCalls(); String url = VKAPI_URL + methodApi; diff --git a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java index 6b50102..b65ba37 100644 --- a/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java +++ b/src/main/java/ru/dmitriymx/vkapi/browser/ApacheBroswe.java @@ -1,5 +1,6 @@ package ru.dmitriymx.vkapi.browser; +import lombok.Setter; import org.apache.commons.io.IOUtils; import org.apache.http.Header; import org.apache.http.HttpMessage; @@ -16,13 +17,9 @@ import java.io.InputStream; public class ApacheBroswe implements Browser { private final HttpClient client = HttpClients.createDefault(); + @Setter private String userAgent = "Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile Safari/537.36"; - @Override - public void setUserAgent(String userAgent) { - this.userAgent = userAgent; - } - @Override public Response get(String url) throws IOException { return request(new HttpGet(url));