From f203b7d6605d55a1857b6ee42a93350a7f66937a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 22 Mar 2018 01:29:31 +0300
Subject: juick-server: move websocket client to notifications server

---
 .../server/component/JuickServerComponent.java     | 73 ----------------------
 .../component/JuickServerReconnectManager.java     | 22 -------
 2 files changed, 95 deletions(-)
 delete mode 100644 juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
 delete mode 100644 juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java

(limited to 'juick-common/src/main/java/com')

diff --git a/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java b/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
deleted file mode 100644
index dba1f480..00000000
--- a/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.juick.server.component;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.CloseStatus;
-import org.springframework.web.socket.PingMessage;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.handler.TextWebSocketHandler;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@Component
-public class JuickServerComponent extends TextWebSocketHandler {
-    private static Logger logger = LoggerFactory.getLogger(JuickServerComponent.class);
-    @Inject
-    private ApplicationEventPublisher applicationEventPublisher;
-    @Inject
-    private ObjectMapper jsonMapper;
-
-    private WebSocketSession session;
-    private final AtomicBoolean closeFlag = new AtomicBoolean(false);
-
-    @PostConstruct
-    public void init() {
-        closeFlag.set(false);
-    }
-    @Override
-    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-        logger.info("WebSocket connected");
-        this.session = session;
-    }
-
-    @Override
-    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
-        logger.info("WebSocket disconnected with code {}: {}", status.getCode(), status.getReason());
-        applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
-    }
-
-    @Override
-    protected void handleTextMessage(WebSocketSession session, TextMessage text) throws Exception {
-        com.juick.Message jmsg = jsonMapper.readValue(text.asBytes(), com.juick.Message.class);
-
-        if (logger.isInfoEnabled()) // prevent writeValueAsString execution if logger disabled
-            logger.info("got jmsg: {}", jsonMapper.writeValueAsString(jmsg));
-        if (!closeFlag.get()) {
-            applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
-        }
-    }
-
-    @Scheduled(fixedRate = 30000, initialDelay = 30000)
-    public void ping() throws IOException {
-        if (session != null && session.isOpen()) {
-            logger.debug("Sending WebSocket ping");
-            session.sendMessage(new PingMessage());
-        } else if (!closeFlag.get()) {
-            applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
-        }
-    }
-    @PreDestroy
-    public void close() {
-        closeFlag.set(true);
-    }
-
-}
diff --git a/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java b/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
deleted file mode 100644
index a662e4fb..00000000
--- a/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.juick.server.component;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.client.WebSocketConnectionManager;
-
-import javax.inject.Inject;
-
-@Component
-public class JuickServerReconnectManager implements ApplicationListener<DisconnectedEvent> {
-    private static Logger logger = LoggerFactory.getLogger(JuickServerReconnectManager.class);
-    @Inject
-    private WebSocketConnectionManager webSocketConnectionManager;
-    @Override
-    public void onApplicationEvent(DisconnectedEvent event) {
-        logger.info("retrying...");
-        webSocketConnectionManager.stop();
-        webSocketConnectionManager.start();
-    }
-}
-- 
cgit v1.2.3