diff --git a/build.gradle b/build.gradle index 3fc1875..65f0778 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,16 @@ id 'war' } +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + group = 'com.ntlab' version = '0.0.1-SNAPSHOT' -sourceCompatibility = '11' +sourceCompatibility = '17' +//ext['tomcat.version'] = '9.0.62' repositories { mavenCentral() diff --git a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java index 1796387..20edbf3 100644 --- a/src/main/java/com/ntlab/irisserver/WebSocketConfig.java +++ b/src/main/java/com/ntlab/irisserver/WebSocketConfig.java @@ -1,17 +1,13 @@ package com.ntlab.irisserver; -//import com.ntlab.irisserver.websockets.HelloWorldWebSocket; import com.ntlab.irisserver.websockets.HelloWebSocket; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Controller; -import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.*; import org.springframework.web.socket.server.standard.ServerEndpointExporter; @Configuration @EnableWebSocket -@Controller public class WebSocketConfig implements WebSocketConfigurer { @Override @@ -19,10 +15,10 @@ //registry.addHandler(helloWorldWebSocket2(), "/hello-websocket2"); } - @Bean - public HelloWebSocket helloWebSocket() { - return new HelloWebSocket(); - } +// @Bean +// public HelloWebSocket helloWebSocket() { +// return new HelloWebSocket(); +// } @Bean public ServerEndpointExporter serverEndpointExporter() { diff --git a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java index 51f7f5f..35edc49 100644 --- a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java @@ -12,12 +12,10 @@ @Component @Path("/rooms") - - public class RoomsRest { @POST //部屋の作成,オーナーを設定 - @Path("/") + @Path("/a") @Produces(MediaType.APPLICATION_JSON) public RoomJson makeRooms(@FormParam("nickname") String owner){ RoomManager rm = RoomManager.getInstance(); @@ -55,7 +53,7 @@ //--------------------------------------テスト用------------------------------------------- @GET //すべての部屋の情報を表示 - @Path("/") + @Path("/aa") @Produces(MediaType.APPLICATION_JSON) public List getRoomsInfo() { RoomManager rm = RoomManager.getInstance(); diff --git a/src/main/java/com/ntlab/irisserver/websockets/HelloWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/HelloWebSocket.java index 2eceb16..221ad9a 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/HelloWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/HelloWebSocket.java @@ -1,9 +1,10 @@ package com.ntlab.irisserver.websockets; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.handler.TextWebSocketHandler; - -import javax.websocket.*; +import javax.websocket.OnClose; +import javax.websocket.OnMessage; +import javax.websocket.OnError; +import javax.websocket.OnOpen; +import javax.websocket.Session; import javax.websocket.server.ServerEndpoint; import java.text.SimpleDateFormat; import java.util.Date; @@ -38,13 +39,13 @@ @OnOpen public void onOpen(Session session) { System.out.println("WebSocketセッション確立"); - sessions.add(session); + //sessions.add(session); } @OnClose public void onClose(Session session) { System.out.println("WebSocketセッション終了"); - sessions.remove(session); + //sessions.remove(session); } public static void broadcast() {