diff --git a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java index 76648fe..3aa4b7e 100644 --- a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java +++ b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java @@ -1,29 +1,22 @@ package com.ntlab.irisserver; -import com.ntlab.irisserver.websockets.HelloWorldWebSocket; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.config.annotation.*; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; - -@Configuration -@EnableWebSocket -public class WebSocketConfig implements WebSocketConfigurer { - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - //registry.addHandler(helloWorldWebSocket2(), "/hello-websocket2"); - } - - @Bean - public HelloWorldWebSocket helloWorldWebSocket() { - return new HelloWorldWebSocket(); - } - - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } - -} +//@Configuration +//@EnableWebSocket +//public class WebSocketConfig implements WebSocketConfigurer { +// +// @Override +// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { +// //registry.addHandler(helloWorldWebSocket2(), "/hello-websocket2"); +// } +// +// @Bean +// public HelloWorldWebSocket helloWorldWebSocket() { +// return new HelloWorldWebSocket(); +// } +// +// @Bean +// public ServerEndpointExporter serverEndpointExporter() { +// return new ServerEndpointExporter(); +// } +// +//} diff --git a/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java index 0677c5e..baf41a5 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/HelloWorldWebSocket.java @@ -1,58 +1,45 @@ package com.ntlab.irisserver.websockets; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -import javax.websocket.*; -import javax.websocket.server.ServerEndpoint; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - - // 5秒に1回HelloWorldを送るデモ -@ServerEndpoint("/hello-websocket") -public class HelloWorldWebSocket extends TextWebSocketHandler { - private static final Queue sessions = new ConcurrentLinkedQueue<>(); - - static { - ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); - service.scheduleWithFixedDelay(HelloWorldWebSocket::broadcast, 5, 5, TimeUnit.SECONDS); - } - - @OnMessage - public String onMessage(String message) { - System.out.println("WebSocketで受信したメッセージ/ " + message); - return "WebSocketでメッセージを正常に受信しました!"; - } - - @OnError - public void onError(Throwable th) { - System.out.println("WebSocketエラーが発生/ " + th.getMessage()); - } - - @OnOpen - public void onOpen(Session session) { - System.out.println("WebSocketセッション確立"); - sessions.add(session); - } - - @OnClose - public void onClose(Session session) { - System.out.println("WebSocketセッション終了"); - sessions.remove(session); - } - - public static void broadcast() { - Date now = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - +//@ServerEndpoint("/hello-websocket") +//public class HelloWorldWebSocket extends TextWebSocketHandler { +// private static final Queue sessions = new ConcurrentLinkedQueue<>(); +// +// static { +// ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); +// service.scheduleWithFixedDelay(HelloWorldWebSocket::broadcast, 5, 5, TimeUnit.SECONDS); +// } +// +// @OnMessage +// public String onMessage(String message) { +// System.out.println("WebSocketで受信したメッセージ/ " + message); +// return "WebSocketでメッセージを正常に受信しました!"; +// } +// +// @OnError +// public void onError(Throwable th) { +// System.out.println("WebSocketエラーが発生/ " + th.getMessage()); +// } +// +// @OnOpen +// public void onOpen(Session session) { +// System.out.println("WebSocketセッション確立"); +// sessions.add(session); +// } +// +// @OnClose +// public void onClose(Session session) { +// System.out.println("WebSocketセッション終了"); +// sessions.remove(session); +// } +// +// public static void broadcast() { +// Date now = new Date(); +// SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); +// // sessions.forEach(session -> { // session.getAsyncRemote().sendText("HelloWorld! : " + formatter.format(now)); // }); - } - -} \ No newline at end of file +// } +// +//} \ No newline at end of file