Работа с базой и перемещение файлов

core/src/main/java/org/sadtech/consultant/database/entity/Message.java

@@ -1,8 +1,9 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 @Data
@@ -10,9 +11,11 @@ import javax.persistence.Id;
 public class Message {
 
     @Id
+    @GeneratedValue
     private Long idMess;
     private Long idUser;
     private String text;
+    private String date;
 
 
 }

core/src/main/java/org/sadtech/consultant/database/entity/NextUnit.java

@@ -1,13 +1,15 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 
 import javax.persistence.Entity;
+import javax.persistence.Id;
 
 @Entity
 @Data
 public class NextUnit {
 
+    @Id
     private Long id;
     private Long idNext;
 

core/src/main/java/org/sadtech/consultant/database/entity/SaveUnit.java

@@ -1,4 +1,4 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 

core/src/main/java/org/sadtech/consultant/database/entity/SocialNetworks.java

@@ -1,4 +1,4 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 

core/src/main/java/org/sadtech/consultant/database/entity/Unit.java

@@ -1,4 +1,4 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 

core/src/main/java/org/sadtech/consultant/database/entity/User.java

@@ -1,9 +1,8 @@
-package org.sadtech.consultant.entity;
+package org.sadtech.consultant.database.entity;
 
 import lombok.Data;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import java.util.List;
 
@@ -17,7 +16,7 @@ public class User {
     private String token;
     private String lastName;
     private String city;
-    private List<SocialNetworks> socialNetworks;
+//    private List<SocialNetworks> socialNetworks;
 
 
 }

core/src/main/java/org/sadtech/consultant/database/repository/MessageRepository.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.Message;
+import org.sadtech.consultant.database.entity.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MessageRepository extends JpaRepository<Message, Long> {

core/src/main/java/org/sadtech/consultant/database/repository/NextUnitRepositoriy.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.NextUnit;
+import org.sadtech.consultant.database.entity.NextUnit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface NextUnitRepositoriy extends JpaRepository<NextUnit, Long> {

core/src/main/java/org/sadtech/consultant/database/repository/SaveUnitRepositoriy.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.SaveUnit;
+import org.sadtech.consultant.database.entity.SaveUnit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SaveUnitRepositoriy extends JpaRepository<SaveUnit, Long> {

core/src/main/java/org/sadtech/consultant/database/repository/SocialNetworksRepositoriy.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.SocialNetworks;
+import org.sadtech.consultant.database.entity.SocialNetworks;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface SocialNetworksRepositoriy extends JpaRepository<SocialNetworks, Long> {

core/src/main/java/org/sadtech/consultant/database/repository/UnitRepositoriy.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.Unit;
+import org.sadtech.consultant.database.entity.Unit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UnitRepositoriy extends JpaRepository<Unit, Long> {

core/src/main/java/org/sadtech/consultant/database/repository/UserRepositoriy.java

@@ -1,6 +1,6 @@
-package org.sadtech.consultant.repository;
+package org.sadtech.consultant.database.repository;
 
-import org.sadtech.consultant.entity.User;
+import org.sadtech.consultant.database.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepositoriy extends JpaRepository<User, Long> {

core/src/main/java/org/sadtech/consultant/database/service/MessageService.java

@@ -0,0 +1,8 @@
+package org.sadtech.consultant.database.service;
+
+import org.sadtech.consultant.database.entity.Message;
+
+public interface MessageService {
+
+    void addMessage(Message message);
+}

core/src/main/java/org/sadtech/consultant/database/service/NextUnitService.java

@@ -0,0 +1,4 @@
+package org.sadtech.consultant.database.service;
+
+public interface NextUnitService {
+}

core/src/main/java/org/sadtech/consultant/database/service/SaveUnitService.java

@@ -0,0 +1,4 @@
+package org.sadtech.consultant.database.service;
+
+public interface SaveUnitService {
+}

core/src/main/java/org/sadtech/consultant/database/service/SocialNetworksService.java

@@ -0,0 +1,4 @@
+package org.sadtech.consultant.database.service;
+
+public interface SocialNetworksService {
+}

core/src/main/java/org/sadtech/consultant/database/service/UnitService.java

@@ -0,0 +1,10 @@
+package org.sadtech.consultant.database.service;
+
+import org.sadtech.consultant.database.entity.Unit;
+
+public interface UnitService {
+
+    void addUnit(Unit unit);
+    void removeUnit(Long id);
+
+}

core/src/main/java/org/sadtech/consultant/database/service/UserService.java

@@ -0,0 +1,10 @@
+package org.sadtech.consultant.database.service;
+
+import org.sadtech.consultant.database.entity.User;
+
+public interface UserService {
+
+    void addUser(User user);
+    void removeUser(Long id);
+
+}

core/src/main/java/org/sadtech/consultant/database/service/impl/MessageServiceImpl.java

@@ -0,0 +1,18 @@
+package org.sadtech.consultant.database.service.impl;
+
+import org.sadtech.consultant.database.entity.Message;
+import org.sadtech.consultant.database.repository.MessageRepository;
+import org.sadtech.consultant.database.service.MessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MessageServiceImpl implements MessageService {
+
+    @Autowired
+    private MessageRepository repository;
+
+    public void addMessage(Message message) {
+        repository.saveAndFlush(message);
+    }
+}

core/src/main/java/org/sadtech/consultant/database/service/impl/NextUnitServiceImpl.java

@@ -1,7 +1,7 @@
-package org.sadtech.consultant.service.impl;
+package org.sadtech.consultant.database.service.impl;
 
-import org.sadtech.consultant.repository.NextUnitRepositoriy;
+import org.sadtech.consultant.database.repository.NextUnitRepositoriy;
-import org.sadtech.consultant.service.NextUnitService;
+import org.sadtech.consultant.database.service.NextUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

core/src/main/java/org/sadtech/consultant/database/service/impl/SaveUnitServiceImpl.java

@@ -1,7 +1,7 @@
-package org.sadtech.consultant.service.impl;
+package org.sadtech.consultant.database.service.impl;
 
-import org.sadtech.consultant.repository.SaveUnitRepositoriy;
+import org.sadtech.consultant.database.repository.SaveUnitRepositoriy;
-import org.sadtech.consultant.service.SaveUnitService;
+import org.sadtech.consultant.database.service.SaveUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

core/src/main/java/org/sadtech/consultant/database/service/impl/SocialNetworksServiceImpl.java

@@ -1,7 +1,7 @@
-package org.sadtech.consultant.service.impl;
+package org.sadtech.consultant.database.service.impl;
 
-import org.sadtech.consultant.repository.SocialNetworksRepositoriy;
+import org.sadtech.consultant.database.repository.SocialNetworksRepositoriy;
-import org.sadtech.consultant.service.SocialNetworksService;
+import org.sadtech.consultant.database.service.SocialNetworksService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

core/src/main/java/org/sadtech/consultant/database/service/impl/UnitServiceImpl.java

@@ -1,8 +1,8 @@
-package org.sadtech.consultant.service.impl;
+package org.sadtech.consultant.database.service.impl;
 
-import org.sadtech.consultant.entity.Unit;
+import org.sadtech.consultant.database.entity.Unit;
-import org.sadtech.consultant.repository.UnitRepositoriy;
+import org.sadtech.consultant.database.repository.UnitRepositoriy;
-import org.sadtech.consultant.service.UnitService;
+import org.sadtech.consultant.database.service.UnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

core/src/main/java/org/sadtech/consultant/database/service/impl/UserServiceImpl.java

@@ -1,8 +1,8 @@
-package org.sadtech.consultant.service.impl;
+package org.sadtech.consultant.database.service.impl;
 
-import org.sadtech.consultant.entity.User;
+import org.sadtech.consultant.database.entity.User;
-import org.sadtech.consultant.repository.UserRepositoriy;
+import org.sadtech.consultant.database.repository.UserRepositoriy;
-import org.sadtech.consultant.service.UserService;
+import org.sadtech.consultant.database.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

core/src/main/java/org/sadtech/consultant/service/MessageService.java

@@ -1,8 +0,0 @@
-package org.sadtech.consultant.service;
-
-import org.sadtech.consultant.entity.Message;
-
-public interface MessageService {
-
-    void addMessage(Message message);
-}

core/src/main/java/org/sadtech/consultant/service/NextUnitService.java

@@ -1,4 +0,0 @@
-package org.sadtech.consultant.service;
-
-public interface NextUnitService {
-}

core/src/main/java/org/sadtech/consultant/service/SaveUnitService.java

@@ -1,4 +0,0 @@
-package org.sadtech.consultant.service;
-
-public interface SaveUnitService {
-}

core/src/main/java/org/sadtech/consultant/service/SocialNetworksService.java

@@ -1,4 +0,0 @@
-package org.sadtech.consultant.service;
-
-public interface SocialNetworksService {
-}

core/src/main/java/org/sadtech/consultant/service/UnitService.java

@@ -1,10 +0,0 @@
-package org.sadtech.consultant.service;
-
-import org.sadtech.consultant.entity.Unit;
-
-public interface UnitService {
-
-    void addUnit(Unit unit);
-    void removeUnit(Long id);
-
-}

core/src/main/java/org/sadtech/consultant/service/UserService.java

@@ -1,10 +0,0 @@
-package org.sadtech.consultant.service;
-
-import org.sadtech.consultant.entity.User;
-
-public interface UserService {
-
-    void addUser(User user);
-    void removeUser(Long id);
-
-}

core/src/main/java/org/sadtech/consultant/service/impl/MessageServiceImpl.java

@@ -1,16 +0,0 @@
-package org.sadtech.consultant.service.impl;
-
-import org.sadtech.consultant.entity.Message;
-import org.sadtech.consultant.repository.MessageRepository;
-import org.sadtech.consultant.service.MessageService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class MessageServiceImpl implements MessageService {
-
-    @Autowired
-    private MessageRepository repository;
-
-    public void addMessage(Message message) {
-        repository.saveAndFlush(message);
-    }
-}

vk-bot/pom.xml

@@ -18,8 +18,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>6</source>
+                    <source>7</source>
-                    <target>6</target>
+                    <target>7</target>
                 </configuration>
             </plugin>
 
@@ -45,7 +45,7 @@
         <spring.data>2.1.3.RELEASE</spring.data>
 
         <javax.servlet>3.1.0</javax.servlet>
-        <javax.persistance>1.0.2</javax.persistance>
+        <javax.persistance>2.2</javax.persistance>
 
         <hibernate.entitymanager>5.4.0.Final</hibernate.entitymanager>
         <hibernate.core>5.2.10.Final</hibernate.core>
@@ -81,6 +81,10 @@
             <version>${log4j}</version>
         </dependency>
 
+
+
+
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -111,6 +115,11 @@
             <artifactId>spring-data-jpa</artifactId>
             <version>${spring.data}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>5.1.3.RELEASE</version>
+        </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -138,19 +147,21 @@
 
         <dependency>
             <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
+            <artifactId>javax.persistence-api</artifactId>
             <version>${javax.persistance}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql.connector}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>${hibernate.entitymanager}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -158,6 +169,18 @@
             <version>${hibernate.core}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.sadtech</groupId>
+            <artifactId>consultant-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
 
     </dependencies>
 </project>

vk-bot/src/main/java/org/sadtech/vkbot/Main.java

@@ -1,21 +1,27 @@
-package org.sadtech.vkbot.config;
+package org.sadtech.vkbot;
 
 import lombok.extern.log4j.Log4j;
+import org.sadtech.vkbot.config.DataConfig;
+import org.sadtech.vkbot.config.SpringConfigVk;
 import org.sadtech.vkbot.listener.EventListenable;
-import org.sadtech.vkbot.listener.Observable;
+import org.sadtech.vkbot.listener.handlers.Handled;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @Log4j
-public class TestMain {
+public class Main {
     public static void main(String[] args) throws Exception {
+       Main main = new Main();
+       main.run();
+    }
+
+    public void run() throws Exception {
         log.info("\n\n\n\n=== Запуск прогарммы ===\n\n");
 
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SpringConfigVk.class);
+        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(SpringConfigVk.class, DataConfig.class);
-        context.register(DataConfig.class);
         EventListenable eventListener = context.getBean(EventListenable.class);
         eventListener.listen();
-        Observable dispetcherHandler = context.getBean(Observable.class);
+        Handled dispetcherHandler = context.getBean(Handled.class);
-        dispetcherHandler.packaging();
+        dispetcherHandler.sortAndSend();
 
         log.info("\n\n=== Конец программы ===\n\n");
     }

vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java

@@ -4,8 +4,6 @@ import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -16,8 +14,7 @@ import java.util.Properties;
 
 @Configuration
 @EnableTransactionManagement
-@EnableJpaRepositories("org.sadtech.vkbot.repo")
+
-@PropertySource("classpath:config.properties")
 public class DataConfig {
 
     @Value("${db.driver}")
@@ -38,7 +35,7 @@ public class DataConfig {
     @Value("${db.hibernate.hbm2ddl.auto}")
     private String PROPERTY_NAME_HIBERNATE_HBM2DDL_AUTO;
 
-    @Bean(name = "entityManagerFactory")
+    @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
         entityManagerFactoryBean.setDataSource(dataSource());

vk-bot/src/main/java/org/sadtech/vkbot/config/SpringConfigVk.java

@@ -9,10 +9,7 @@ import com.vk.api.sdk.exceptions.ClientException;
 import com.vk.api.sdk.httpclient.HttpTransportClient;
 import com.vk.api.sdk.objects.groups.responses.GetLongPollServerResponse;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.*;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -23,9 +20,9 @@ import java.util.concurrent.Executors;
 
 @Configuration
 @EnableAsync
+@Import({DataConfig.class})
 @PropertySource("classpath:config.properties")
 @ComponentScan("org.sadtech.vkbot.listener")
-@EnableScheduling
 public class SpringConfigVk {
 
     @Value("${vk.groupID}")

vk-bot/src/main/java/org/sadtech/vkbot/entity/User.java

@@ -1,16 +0,0 @@
-package org.sadtech.vkbot.entity;
-
-import lombok.Data;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-@Data
-public class User {
-
-    @Id
-    private long id;
-    private String name;
-
-}

vk-bot/src/main/java/org/sadtech/vkbot/listener/Observable.java

@@ -6,5 +6,4 @@ public interface Observable {
     //    void removeObserver(Observer o);
     void notifyObservers();
 
-    void packaging() throws Exception;
 }

vk-bot/src/main/java/org/sadtech/vkbot/listener/Observer.java

@@ -5,5 +5,5 @@ import com.google.gson.JsonObject;
 import java.util.List;
 
 public interface Observer {
-    void update(List<JsonObject> jsonObjects);
+    void update(JsonObject object);
 }

vk-bot/src/main/java/org/sadtech/vkbot/listener/data/impl/ResponseDataVk.java

@@ -10,7 +10,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 @Component
 public class ResponseDataVk implements ResponsibleData {
 
-    private Queue<JsonObject> jsonObjects = new ConcurrentLinkedQueue<JsonObject>();
+    private Queue<JsonObject> jsonObjects = new ConcurrentLinkedQueue<>();
 
     @Override
     public void add(JsonObject jsonObject) {

vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/Handled.java

@@ -0,0 +1,7 @@
+package org.sadtech.vkbot.listener.handlers;
+
+public interface Handled {
+
+    void sortAndSend() throws Exception;
+
+}

vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/MessageHandlerVk.java

@@ -1,21 +0,0 @@
-package org.sadtech.vkbot.listener.handlers;
-
-import com.google.gson.JsonObject;
-import org.sadtech.vkbot.listener.Observer;
-
-import java.util.List;
-
-public class MessageHandlerVk implements Observer {
-
-    private DispetcherHandler dispetcherHandler;
-
-    public MessageHandlerVk(DispetcherHandler dispetcherHandler) {
-        this.dispetcherHandler = dispetcherHandler;
-        dispetcherHandler.registerObserver(this);
-    }
-
-    @Override
-    public void update(List<JsonObject> jsonObjects) {
-
-    }
-}

vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/impl/DispetcherHandlerVk.java

@@ -1,12 +1,12 @@
-package org.sadtech.vkbot.listener.handlers;
+package org.sadtech.vkbot.listener.handlers.impl;
 
 import com.google.gson.JsonObject;
 import lombok.extern.log4j.Log4j;
 import org.sadtech.vkbot.listener.Observable;
 import org.sadtech.vkbot.listener.Observer;
 import org.sadtech.vkbot.listener.data.ResponsibleData;
+import org.sadtech.vkbot.listener.handlers.Handled;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -14,20 +14,22 @@ import java.util.List;
 
 @Log4j
 @Component
-public class DispetcherHandler implements Observable {
+public class DispetcherHandlerVk implements Observable, Handled {
 
     private ResponsibleData date;
     private List<Observer> observers = new ArrayList<Observer>();
+    private JsonObject event;
 
-    public DispetcherHandler(ResponsibleData date) {
+    public DispetcherHandlerVk(ResponsibleData date) {
         this.date = date;
     }
 
     @Async
-    public void packaging() {
+    public void sortAndSend() {
         while (true) {
             if (date.getJsonObjects().peek() != null) {
-                log.info(date.getJsonObjects().poll());
+                event = date.getJsonObjects().poll();
+                notifyObservers();
             }
         }
     }
@@ -40,7 +42,7 @@ public class DispetcherHandler implements Observable {
     @Override
     public void notifyObservers() {
         for (Observer observer : observers) {
-            //observer.update();
+            observer.update(event);
         }
     }
 }

vk-bot/src/main/java/org/sadtech/vkbot/listener/handlers/impl/MessageHandlerVk.java

@@ -0,0 +1,39 @@
+package org.sadtech.vkbot.listener.handlers.impl;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.vk.api.sdk.objects.messages.Message;
+import lombok.extern.log4j.Log4j;
+import org.sadtech.consultant.database.service.MessageService;
+import org.sadtech.consultant.database.service.impl.MessageServiceImpl;
+import org.sadtech.vkbot.listener.Observable;
+import org.sadtech.vkbot.listener.Observer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Log4j
+@Component
+public class MessageHandlerVk implements Observer {
+
+    private Observable dispetcherHandler;
+//    @Autowired
+//    private MessageService service;
+
+    public MessageHandlerVk(Observable dispetcherHandler) {
+        this.dispetcherHandler = dispetcherHandler;
+        dispetcherHandler.registerObserver(this);
+    }
+
+    @Override
+    public void update(JsonObject object) {
+        if (object.get("type").toString().equals("\"message_new\"")) {
+            Gson gson = new Gson();
+            Message message = gson.fromJson(object.getAsJsonObject("object"), Message.class);
+            send(message);
+        }
+    }
+
+    private void send(Message message) {
+        log.info(message.getBody());
+    }
+}

vk-bot/src/main/java/org/sadtech/vkbot/listener/impl/EventListenerVk.java

@@ -59,8 +59,6 @@ public class EventListenerVk implements EventListenable {
                 String test = "{\"one_time\":false,\"buttons\":[[{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"1\\\"}\",\"label\":\"Red2\"},\"color\":\"negative\"},{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"2\\\"}\",\"label\":\"Green\"},\"color\":\"positive\"}],[{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"3\\\"}\",\"label\":\"White\"},\"color\":\"default\"},{\"action\":{\"type\":\"text\",\"payload\":\"{\\\"button\\\": \\\"4\\\"}\",\"label\":\"Blue\"},\"color\":\"primary\"}]]}";
                 vk.messages().send(actor).peerId(244319573).keyboard(test).message("Сообщение получено").execute();
 
-
-
             }
             longPollEventsQuery = longPoll.getEvents(server.getServer(), server.getKey(), eventsResponse.getTs()).waitTime(20);
         } while (true);

vk-bot/src/main/java/org/sadtech/vkbot/repo/UserRepository.java

@@ -1,9 +0,0 @@
-package org.sadtech.vkbot.repo;
-
-import org.sadtech.vkbot.entity.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserRepository extends JpaRepository<User, Long> {
-
-
-}

vk-bot/src/main/java/org/sadtech/vkbot/service/UserService.java

@@ -1,11 +0,0 @@
-package org.sadtech.vkbot.service;
-
-import org.sadtech.vkbot.entity.User;
-
-public interface UserService {
-
-    User addUser(User user);
-
-    void removeUser(long id);
-
-}

vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java

@@ -1,26 +0,0 @@
-package org.sadtech.vkbot.service.impl;
-
-import org.sadtech.vkbot.entity.User;
-import org.sadtech.vkbot.repo.UserRepository;
-import org.sadtech.vkbot.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-@Service
-public class UserServiceImpl implements UserService {
-
-    @Autowired
-    private UserRepository userRepository;
-
-    @Override
-    public User addUser(User user) {
-        User savedUser = userRepository.saveAndFlush(user);
-        return savedUser;
-    }
-
-    @Override
-    public void removeUser(long id) {
-        userRepository.deleteById(id);
-    }
-}