Merge pull request #145 from yvasyliev/OkHttp_migration

Magrated to OkHttp. Global refactoring.

Author: yvasyliev

README.md

@@ -31,7 +31,7 @@ This library uses the next third-party dependencies:
 <dependency>
   <groupId>com.github.yvasyliev</groupId>
   <artifactId>java-vk-bots-longpoll-api</artifactId>
-  <version>3.5.3</version>
+  <version>4.0.0</version>
 </dependency>
 ```
 4. Extend `LongPollBot` class and override necessary methods:

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.github.yvasyliev</groupId>
     <artifactId>java-vk-bots-longpoll-api</artifactId>
     <packaging>jar</packaging>
-    <version>3.5.4-beta-1</version>
+    <version>4.0.0</version>
     <name>Java VK Bots Long Poll API</name>
     <description>A Java library to create VK bots using Bots Long Poll API</description>
     <url>https://github.com/yvasyliev/java-vk-bots-long-poll-api</url>
@@ -29,12 +29,17 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -51,7 +56,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -94,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M6</version>
+                <version>3.0.0-M7</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -189,7 +194,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.0.0-M8</version>
             </plugin>
         </plugins>
         <resources>

src/main/java/api/longpoll/bots/LongPollBot.java

@@ -1,12 +1,9 @@
 package api.longpoll.bots;
 
 import api.longpoll.bots.exceptions.VkApiException;
-import api.longpoll.bots.exceptions.VkApiHttpException;
-import api.longpoll.bots.exceptions.VkApiResponseException;
+import api.longpoll.bots.exceptions.VkResponseException;
 import api.longpoll.bots.methods.impl.events.GetUpdates;
 import api.longpoll.bots.methods.impl.groups.GetLongPollServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -15,11 +12,6 @@
  * Abstract bot to handle VK events.
  */
 public abstract class LongPollBot extends VkBot {
-    /**
-     * {@link Logger} object.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(LongPollBot.class);
-
     /**
      * Default session time.
      *
@@ -40,7 +32,7 @@ public abstract class LongPollBot extends VkBot {
     /**
      * Gets VK updates.
      */
-    private final GetUpdates getUpdates = new GetUpdates();
+    private GetUpdates getUpdates;
 
     /**
      * Whether infinite loop should be continued.
@@ -73,9 +65,8 @@ public void startPolling() throws VkApiException {
                 GetUpdates.ResponseBody updates = getUpdates.execute();
                 getUpdates.setTs(updates.getTs());
                 handle(updates.getEvents());
-            } catch (VkApiHttpException | VkApiResponseException e) {
-                LOGGER.warn("Failed to get events from VK Long Poll Server.", e);
-                if (e instanceof VkApiResponseException && !e.getMessage().contains("failed")) {
+            } catch (VkResponseException e) {
+                if (!e.getMessage().contains("failed")) {
                     throw e;
                 }
                 initialize();
@@ -111,7 +102,7 @@ public void initialize() throws VkApiException {
         }
 
         GetLongPollServer.ResponseBody longPollServer = getLongPollServer.setGroupId(groupId).execute();
-        getUpdates.setServer(longPollServer.getResponse().getServer())
+        getUpdates = new GetUpdates(longPollServer.getResponse().getServer())
                 .setKey(longPollServer.getResponse().getKey())
                 .setTs(longPollServer.getResponse().getTs());
     }

src/main/java/api/longpoll/bots/async/AsyncCaller.java

@@ -0,0 +1,10 @@
+package api.longpoll.bots.exceptions;
+
+/**
+ * Occurs when VK returns "error" of "failed" response.
+ */
+public class VkResponseException extends VkApiException {
+    public VkResponseException(String message) {
+        super(message);
+    }
+}