From 593e5f8c34c5b2453897dd08bf58150dabe5088d Mon Sep 17 00:00:00 2001
From: Mark Struchkov <upagge@icloud.com>
Date: Wed, 8 May 2019 17:14:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  5 +++--
 .../sadtech/vkbot/core/keyboard/ButtonKeyBoard.java    |  8 ++++----
 .../java/org/sadtech/vkbot/core/keyboard/KeyBoard.java |  9 ++++-----
 .../core/service/distribution/CommentService.java      | 10 ----------
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/org/sadtech/vkbot/core/service/distribution/CommentService.java

diff --git a/pom.xml b/pom.xml
index af7e00f..fbb1acf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.sadtech.vkbot</groupId>
     <artifactId>vkbot-core</artifactId>
-    <version>0.1.0-RELEASE</version>
+    <version>0.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -23,6 +23,7 @@
     </build>
 
     <properties>
+        <bot.core.ver>0.5.2-SNAPSHOT</bot.core.ver>
         <vksdk.ver>0.5.13-SNAPSHOT</vksdk.ver>
         <log4j.ver>1.2.17</log4j.ver>
     </properties>
@@ -43,7 +44,7 @@
         <dependency>
             <groupId>org.sadtech.bot</groupId>
             <artifactId>bot-core</artifactId>
-            <version>0.4.3-SNAPSHOT</version>
+            <version>${bot.core.ver}</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoard.java b/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoard.java
index 58802e4..77b6ed1 100644
--- a/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoard.java
+++ b/src/main/java/org/sadtech/vkbot/core/keyboard/ButtonKeyBoard.java
@@ -4,13 +4,13 @@ import com.google.gson.JsonObject;
 
 public class ButtonKeyBoard {
 
-    private String type;
+    private String type = "text";
     private String payload;
     private String label;
-    private ColorButton color;
+    private ColorButton color = ColorButton.DEFAULT;
+
+    public ButtonKeyBoard() {
 
-    private ButtonKeyBoard() {
-        throw new IllegalStateException();
     }
 
     public JsonObject getButton() {
diff --git a/src/main/java/org/sadtech/vkbot/core/keyboard/KeyBoard.java b/src/main/java/org/sadtech/vkbot/core/keyboard/KeyBoard.java
index 537b05e..d139675 100644
--- a/src/main/java/org/sadtech/vkbot/core/keyboard/KeyBoard.java
+++ b/src/main/java/org/sadtech/vkbot/core/keyboard/KeyBoard.java
@@ -8,12 +8,11 @@ import java.util.List;
 
 public class KeyBoard {
 
-    private List<LineKeyBoard> lineKeyBoards;
-    private boolean oneTime;
+    private List<LineKeyBoard> lineKeyBoards = new ArrayList<>();
+    private boolean oneTime = true;
+
+    public KeyBoard() {
 
-    private KeyBoard() {
-        lineKeyBoards = new ArrayList<>();
-        throw new IllegalStateException();
     }
 
     public JsonObject getKeyboard() {
diff --git a/src/main/java/org/sadtech/vkbot/core/service/distribution/CommentService.java b/src/main/java/org/sadtech/vkbot/core/service/distribution/CommentService.java
deleted file mode 100644
index 6830e21..0000000
--- a/src/main/java/org/sadtech/vkbot/core/service/distribution/CommentService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.sadtech.vkbot.core.service.distribution;
-
-import org.sadtech.bot.core.domain.Comment;
-import org.sadtech.bot.core.service.EventService;
-
-//@TODO: Дописать класс
-public interface CommentService extends EventService<Comment> {
-
-
-}