diff --git a/src/main/java/ru/dmitriymx/vkapi/VkApi.java b/src/main/java/ru/dmitriymx/vkapi/VkApi.java index 535037f..c8199af 100644 --- a/src/main/java/ru/dmitriymx/vkapi/VkApi.java +++ b/src/main/java/ru/dmitriymx/vkapi/VkApi.java @@ -2,8 +2,6 @@ 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.ApacheBroswe; import ru.dmitriymx.vkapi.browser.Browser; @@ -24,9 +22,7 @@ public class VkApi implements Runnable { private final String accessToken; private final Browser browser; private final Gson gson = new Gson(); - @Getter - @Setter - private String apiVersion; + private final String apiVersion; private Timer timer = new Timer(); private int countCallApiPerSecond = 0; @@ -45,6 +41,7 @@ public class VkApi implements Runnable { this.accessToken = accessToken; this.browser = browser; + this.apiVersion = apiVersion; timer.reset(); } @@ -137,7 +134,9 @@ public class VkApi implements Runnable { private String paramsToString(Map params) { final StringJoiner sj = new StringJoiner("&"); - sj.add("access_token=" + accessToken).add("v=" + apiVersion); + sj.add("access_token=" + accessToken); + if (!params.containsKey("v")) sj.add("v=" + apiVersion); + params.forEach((key, value) -> sj.add(key + "=" + value)); return sj.toString();