diff --git a/src/main/java/com/example/cosmos_serversb/CosmosServerSbApplication.java b/src/main/java/com/example/cosmos_serversb/CosmosServerSbApplication.java index 560c871..aaa3e30 100644 --- a/src/main/java/com/example/cosmos_serversb/CosmosServerSbApplication.java +++ b/src/main/java/com/example/cosmos_serversb/CosmosServerSbApplication.java @@ -2,19 +2,12 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -import org.springframework.web.socket.config.annotation.WebSocketConfigurer; -import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; - -//@SpringBootApplication -//@Configuration -//@EnableWebSocket +@SpringBootApplication public class CosmosServerSbApplication { -// public static void main(String[] args) { -// SpringApplication.run(CosmosServerSbApplication.class, args); -// } + + public static void main(String[] args) { + SpringApplication.run(CosmosServerSbApplication.class, args); + } } diff --git a/src/main/java/com/example/cosmos_serversb/ServletInitializer.java b/src/main/java/com/example/cosmos_serversb/ServletInitializer.java index 8cb10bf..015e625 100644 --- a/src/main/java/com/example/cosmos_serversb/ServletInitializer.java +++ b/src/main/java/com/example/cosmos_serversb/ServletInitializer.java @@ -1,22 +1,13 @@ package com.example.cosmos_serversb; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.EnableWebSocket; -@SpringBootApplication -@Configuration -@EnableWebSocket public class ServletInitializer extends SpringBootServletInitializer { - public static void main(String[] args) { - SpringApplication.run(ServletInitializer.class, args); - } + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(ServletInitializer.class); + return application.sources(CosmosServerSbApplication.class); } } diff --git a/src/main/java/com/example/cosmos_serversb/WebSocketConfig.java b/src/main/java/com/example/cosmos_serversb/WebSocketConfig.java deleted file mode 100644 index 896a270..0000000 --- a/src/main/java/com/example/cosmos_serversb/WebSocketConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.cosmos_serversb; - -import com.example.cosmos_serversb.resources.WebSocket; -import lombok.AllArgsConstructor; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.config.annotation.*; - - -@Configuration -@EnableWebSocket -@AllArgsConstructor -public class WebSocketConfig implements WebSocketConfigurer { - private final WebSocket websocket = new WebSocket(); - - @Override - public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { - registry.addHandler(websocket, "/websocket"); - } - -} - -//@Configuration -//@EnableWebSocketMessageBroker -//public class WebSocketConfig implements WebSocketConfigurer { -// @Override -// public void registerStompEndpoints(StompEndpointRegistry registry) { -// registry.addEndpoint("/websocket") -// .setAllowedOrigins("/websocket").withSockJS(); -// } -// @Override -// public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { -// registry.addHandler(websocket, "/endpoint"); -// } -// -//} \ No newline at end of file diff --git a/src/main/java/com/example/cosmos_serversb/resources/WebSocket.java b/src/main/java/com/example/cosmos_serversb/resources/WebSocket.java deleted file mode 100644 index 86988d3..0000000 --- a/src/main/java/com/example/cosmos_serversb/resources/WebSocket.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.example.cosmos_serversb.resources; - -import org.springframework.stereotype.Component; - -import javax.websocket.server.ServerEndpoint; -import java.util.HashSet; -import java.util.Set; - -import org.springframework.web.socket.CloseStatus; -import org.springframework.web.socket.TextMessage; -import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -@Component -//@ServerEndpoint("/websocket") -public class WebSocket extends TextWebSocketHandler { - private static final Set sessions = new HashSet<>(); - //private ConcurrentHashMap> roomSessionPool = new ConcurrentHashMap<>(); - - public WebSocket(){ - - } - - @Override - public void afterConnectionEstablished(WebSocketSession session) throws Exception { - sessions.add(session); - System.out.println("session確立しました"); -// String roomName = session.getUri().getQuery(); -// roomSessionPool.compute(roomName, (key, sessions) -> { -// if (sessions == null) { -// sessions = new CopyOnWriteArraySet<>(); -// } -// sessions.add(session); -// return sessions; -// }); - } - - @Override - protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { - String strMessage = message.getPayload(); - TextMessage hoge; - System.out.println("message( " + strMessage + " )を受信しました"); - session.sendMessage(message); - for(WebSocketSession roomsSession : sessions){ - roomsSession.sendMessage(message); - } -// String roomName = session.getUri().getQuery(); -// for (WebSocketSession roomSession : roomSessionPool.get(roomName)) { -// roomSession.sendMessage(message); -// } - } - - @Override - public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception { - sessions.remove(session); - System.out.println("session閉じました"); -// String roomName = session.getUri().getQuery(); -// roomSessionPool.compute(roomName, (key, sessions) -> { -// sessions.remove(session); -// if (sessions.isEmpty()) { -// // 1件もない場合はMapからクリア -// sessions = null; -// } -// return sessions; -// }); - - } - - -// @GET -// public String serverCheck() { -// LogUtils.info("サーバーをチェックしています。"); -// return "{\"ServerStatus\":\"200\"}"; -// } -// @OnOpen -// public void onOpen(Session session) { -// /* セッション確立時の処理 */ -// sessions.add(session); -// System.out.println("WebSocketセッション確立"); -// } -// -// @OnMessage -// public String onMessage(String message) { -// /* メッセージ受信時の処理 */ -// System.out.println("WebSocket受信：" + message); -// return "正常にメッセージを受信しました。"; -// } -// -//// @OnMessage -//// public void onMessage(String message, Session session) throws IOException { -//// //session.getBasicRemote().sendText(message); //メッセージの送信が完了するまで待機 -//// session.getAsyncRemote().sendText(message); //非同期で送信 -//// } -// -// @OnError -// public void onError(Throwable th) { -// /* エラー発生時の処理 */ -// System.out.println("WebSocketエラー：" + th.getMessage()); -// } -// -// @OnClose -// public void onClose(Session session) { -// /* セッション解放時の処理 */ -// sessions.remove(session); -// System.out.println("WebSocketセッションを削除"); -// } -// -// public static void broadcast() { -// sessions.forEach(session -> { -// session.getAsyncRemote().sendText("Broadcast : "); -// }); -// } -}