Merge pull request #134 from yvasyliev/dev

Dev

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.4.7</version>
+  <version>3.5.0</version>
 </dependency>
 ```
 4. Extend `LongPollBot` class and override necessary methods:
@@ -86,7 +86,7 @@ Find more examples of bot usage [here](https://github.com/yvasyliev/java-vk-bots
 ## Async execution
 Each API method can be executed asynchronously:
 ```java
-CompletableFuture<Send.Response> future = vk.messages.send()
+CompletableFuture<Send.ResponseBody> future = vk.messages.send()
         .setPeerId(peerId)
         .setMessage("Sending message asynchronously...")
         .executeAsync();
@@ -126,6 +126,7 @@ CompletableFuture<Send.Response> future = vk.messages.send()
 |      `photo_comment_new` | `public void onPhotoCommentNew(PhotoComment photoComment)`                   |
 |  `photo_comment_restore` | `public void onPhotoCommentRestore(PhotoComment photoComment)`               |
 |      `photo_comment_new` | `public void onPhotoNew(Photo photo)`                                        |
+|          `poll_vote_new` | `public void onPollVoteNew(PollVoteNew pollVoteNew)`                         |
 |             `user_block` | `public void onUserBlock(UserBlock userBlock)`                               |
 |           `user_unblock` | `public void onUserUnblock(UserUnblock userUnblock)`                         |
 |   `video_comment_delete` | `public void onVideoCommentDelete(VideoCommentDelete videoCommentDelete)`    |
@@ -140,7 +141,6 @@ CompletableFuture<Send.Response> future = vk.messages.send()
 |         `wall_reply_new` | `public void onWallReplyNew(WallReply wallReply)`                            |
 |     `wall_reply_restore` | `public void onWallReplyRestore(WallReply wallReply)`                        |
 |            `wall_repost` | `public void onWallRepost(WallPost wallPost)`                                |
-|          `poll_vote_new` | `public void onPollVoteNew(PollVoteNew pollVoteNew)`                         |
 
 ## Logging
 This library uses `SLF4J` API to log all events. You can add any `SLF4J` binding to your project to register events the way you want.

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.github.yvasyliev</groupId>
     <artifactId>java-vk-bots-longpoll-api</artifactId>
     <packaging>jar</packaging>
-    <version>3.4.7</version>
+    <version>3.5.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>
@@ -34,18 +34,24 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>2.19.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <version>2.19.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -67,17 +73,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.3.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
             </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -88,7 +94,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M1</version>
+                <version>3.0.0-M6</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -99,7 +105,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -112,7 +118,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -125,7 +131,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -140,7 +146,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -183,14 +189,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.junit.platform</groupId>
-                        <artifactId>junit-platform-surefire-provider</artifactId>
-                        <version>1.1.0</version>
-                    </dependency>
-                </dependencies>
+                <version>3.0.0-M7</version>
             </plugin>
         </plugins>
         <resources>

src/main/java/api/longpoll/bots/adapters/deserializers/UpdateDeserializer.java

@@ -45,6 +45,9 @@
  * Deserializes JSON objects to {@link Update}.
  */
 public class UpdateDeserializer implements JsonDeserializer<Update> {
+    /**
+     * {@link Gson} object.
+     */
     private final Gson gson = new Gson();
 
     @Override
@@ -55,7 +58,7 @@ public final Update deserialize(JsonElement jsonElement, Type type, JsonDeserial
         update.setType(context.deserialize(jsonUpdate.get("type"), Update.Type.class));
 
         if (update.getType() == null) {
-            throw new IllegalArgumentException("Cannot deserialize '" + jsonUpdate.get("type") + "'. JSON: " + gson.toJson(jsonElement));
+            throw new IllegalArgumentException("There is no mapping for event '" + jsonUpdate.get("type") + "'. JSON: " + gson.toJson(jsonElement));
         }
 
         update.setGroupId(jsonUpdate.get("group_id").getAsInt());

src/main/java/api/longpoll/bots/helpers/attachments/UploadableMessageDoc.java

@@ -39,26 +39,11 @@ public UploadedFile uploadFile(String filename, InputStream inputStream) throws
 
         Save.ResponseBody savedFile = save.setFile(uploadedDoc.getFile()).execute();
         Doc doc = savedFile.getResponse().getDoc();
-        return new UploadedFile() {
-            @Override
-            public String getType() {
-                return "doc";
-            }
-
-            @Override
-            public int getOwnerId() {
-                return doc.getOwnerId();
-            }
-
-            @Override
-            public int getMediaId() {
-                return doc.getId();
-            }
-
-            @Override
-            public String getAccessKey() {
-                return doc.getAccessKey();
-            }
-        };
+        return new UploadedFile(
+                "doc",
+                doc.getOwnerId(),
+                doc.getId(),
+                doc.getAccessKey()
+        );
     }
 }

src/main/java/api/longpoll/bots/helpers/attachments/UploadableMessagePhoto.java

@@ -42,26 +42,11 @@ public UploadedFile uploadFile(String filename, InputStream inputStream) throws
                 .setHash(uploadedPhoto.getHash())
                 .execute();
         SaveMessagesPhoto.ResponseBody.Response photo = savedPhoto.getResponse().get(0);
-        return new UploadedFile() {
-            @Override
-            public String getType() {
-                return "photo";
-            }
-
-            @Override
-            public int getOwnerId() {
-                return photo.getOwnerId();
-            }
-
-            @Override
-            public int getMediaId() {
-                return photo.getId();
-            }
-
-            @Override
-            public String getAccessKey() {
-                return photo.getAccessKey();
-            }
-        };
+        return new UploadedFile(
+                "photo",
+                photo.getOwnerId(),
+                photo.getId(),
+                photo.getAccessKey()
+        );
     }
 }

src/main/java/api/longpoll/bots/http/impl/PostRequest.java

@@ -89,6 +89,15 @@ public RequestBody getRequestBody() {
         return requestBody;
     }
 
+    @Override
+    public String toString() {
+        return "PostRequest{" +
+                "uri='" + uri + '\'' +
+                ", headers=" + headers +
+                ", requestBody=" + requestBody +
+                '}';
+    }
+
     /**
      * PostRequest builder.
      */

src/main/java/api/longpoll/bots/model/objects/additional/UploadedFile.java

@@ -3,34 +3,69 @@
 /**
  * An uploaded to VK server file.
  */
-public abstract class UploadedFile {
+public class UploadedFile {
+    /**
+     * File type.
+     */
+    private final String type;
+
+    /**
+     * Owner ID.
+     */
+    private final int ownerId;
+
+    /**
+     * File ID.
+     */
+    private final int mediaId;
+
+    /**
+     * file <i>access_key</i>.
+     */
+    private final String accessKey;
+
+    public UploadedFile(String type, int ownerId, int mediaId, String accessKey) {
+        this.type = type;
+        this.ownerId = ownerId;
+        this.mediaId = mediaId;
+        this.accessKey = accessKey;
+    }
+
     /**
      * Gets file type.
      *
      * @return file type.
      */
-    public abstract String getType();
+    public String getType() {
+        return type;
+    }
 
     /**
      * Gets owner ID.
      *
      * @return owner ID.
      */
-    public abstract int getOwnerId();
+    public int getOwnerId() {
+        return ownerId;
+    }
 
     /**
      * Gets file ID.
      *
      * @return file ID.
      */
-    public abstract int getMediaId();
+    public int getMediaId() {
+        return mediaId;
+    }
 
     /**
      * Gets file <i>access_key</i>.
      *
      * @return file <i>access_key</i>.
      */
-    public abstract String getAccessKey();
+    public String getAccessKey() {
+        return accessKey;
+    }
 
     @Override
     public String toString() {