server: event handling refactoring

2 files changed, 3 insertions, 52 deletions

diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
index 2dd74b19..78838117 100644
--- a/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
+++ b/juick-server/src/main/java/com/juick/server/configuration/ApiAppConfiguration.java
@@ -22,10 +22,7 @@ import com.juick.configuration.DataConfiguration;
 import com.juick.server.WebsocketManager;
 import com.juick.server.api.rss.MessagesView;
 import com.juick.server.api.rss.RepliesView;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.*;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -54,12 +51,11 @@ import java.util.Collections;
 @EnableSwagger2
 @EnableScheduling
 @EnableWebSocket
-@Import({ApiSecurityConfig.class, BaseWebConfiguration.class, DataConfiguration.class, StorageConfiguration.class,
-EventsConfiguration.class})
+@Import({ApiSecurityConfig.class, BaseWebConfiguration.class, DataConfiguration.class, StorageConfiguration.class})
 @ComponentScan(basePackages = "com.juick.server")
 public class ApiAppConfiguration implements WebMvcConfigurer, WebSocketConfigurer {
     @Inject
-    WebsocketManager websocketManager;
+    private WebsocketManager websocketManager;
     @Bean
     public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
diff --git a/juick-server/src/main/java/com/juick/server/configuration/EventsConfiguration.java b/juick-server/src/main/java/com/juick/server/configuration/EventsConfiguration.java
deleted file mode 100644
index 63c774fa..00000000
--- a/juick-server/src/main/java/com/juick/server/configuration/EventsConfiguration.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.juick.server.configuration;
-
-import com.juick.server.TelegramBotManager;
-import com.juick.server.XMPPBot;
-import com.juick.server.component.LikeEvent;
-import com.juick.server.component.MessageEvent;
-import com.juick.server.component.SubscribeEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.inject.Inject;
-
-@Configuration
-public class EventsConfiguration {
-    private static Logger logger = LoggerFactory.getLogger(EventsConfiguration.class);
-    @Inject
-    private TelegramBotManager telegramBotManager;
-    @Inject
-    private XMPPBot bot;
-    @Bean
-    ApplicationListener<MessageEvent> messageListener() {
-        return event -> {
-            logger.info("MessageEvent: {}", event.getMessage());
-            telegramBotManager.processMessage(event.getMessage());
-            bot.processMessage(event.getMessage());
-        };
-    }
-    @Bean
-    ApplicationListener<LikeEvent> likeListener() {
-        return event -> {
-            logger.info("LikeEvent: {} -> {}", event.getUser().getName(), event.getMessage());
-            telegramBotManager.processLike(event.getUser(), event.getMessage());
-        };
-    }
-    @Bean
-    ApplicationListener<SubscribeEvent> subscribeListener() {
-        return event -> {
-            logger.info("SubscribeEvent: {} -> {}", event.getUser().getName(), event.getToUser().getName());
-            telegramBotManager.processSubscribe(event.getUser(), event.getToUser());
-        };
-    }
-}