diff --git a/build.gradle b/build.gradle index 94afc70..4d78ed7 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,4 @@ compile("com.fasterxml.jackson.core:jackson-databind") compile("org.hibernate:hibernate-core:5.4.2.Final") compileOnly('org.projectlombok:lombok:1.16.10') - providedCompile 'javax.websocket:javax.websocket-api:1.1' - implementation 'org.glassfish.tyrus:tyrus-container-grizzly-server:1.13.1' - implementation 'com.squareup.okhttp3:okhttp:3.12.0' - implementation 'org.springframework.boot:spring-boot-starter-websocket' } diff --git a/src/main/java/com/example/cosmos_serversb/JerseyConfig.java b/src/main/java/com/example/cosmos_serversb/JerseyConfig.java index c3bf828..37ed2ee 100644 --- a/src/main/java/com/example/cosmos_serversb/JerseyConfig.java +++ b/src/main/java/com/example/cosmos_serversb/JerseyConfig.java @@ -1,14 +1,11 @@ package com.example.cosmos_serversb; - import javax.ws.rs.ApplicationPath; -import javax.ws.rs.Path; import org.glassfish.jersey.server.ResourceConfig; import org.springframework.stereotype.Component; @Component -//@ApplicationPath("/rest") public class JerseyConfig extends ResourceConfig { public JerseyConfig() { packages("com.example.cosmos_serversb.resources"); diff --git a/src/test/java/WebSocketTest/SampleClient.java b/src/test/java/WebSocketTest/SampleClient.java deleted file mode 100644 index a37c7c8..0000000 --- a/src/test/java/WebSocketTest/SampleClient.java +++ /dev/null @@ -1,110 +0,0 @@ -package WebSocketTest; - -import java.net.URI; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; - -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.WebSocket; -import okhttp3.WebSocketListener; -import okio.ByteString; - -public class SampleClient { - public static void main(String[] args) { - - WebSocket ws; - final Request request = new Request.Builder() -// .url("http://localhost:8081/WebSocketServer") //テスト用 - .url("http://localhost:8080/websocket") - .build(); - final OkHttpClient client = new OkHttpClient.Builder() - .build(); - final WebSocketListener listener = new WebSocketListener() { - @Override - // 接続 - public void onOpen(WebSocket webSocket, Response response) { - } - - @Override - //Serverからのメッセージの受信 - public void onMessage(WebSocket webSocket, final String text) { - } - - @Override - public void onMessage(WebSocket webSocket, ByteString bytes) { - System.out.println("MESSAGE: " + bytes.hex()); - } - - @Override - public void onClosing(WebSocket webSocket, int code, String reason) { - webSocket.close(1000, null); - System.out.println("CLOSE: " + code + " " + reason); - } - - @Override - //Serverの切断 - public void onClosed(WebSocket webSocket, int code, String reason) { - } - - public void onFailure(WebSocket webSocket, Throwable t, Response response) { - t.printStackTrace(); - } - }; - - ws = client.newWebSocket(request, listener); - ws.send("Hello"); - client.dispatcher().executorService().shutdown(); - } -} - -//@ClientEndpoint -//public class SampleClient { -// -// public SampleClient() { -// super(); -// } -// -// @OnOpen -// public void onOpen(Session session) { -// /* セッション確立時の処理 */ -// System.out.println("WebSocketセッション確立"); -// } -// -// @OnMessage -// public void onMessage(String message) { -// /* メッセージ受信時の処理 */ -// System.out.println("WebSocket受信："); -// } -// -// @OnError -// public void onError(Throwable th) { -// /* エラー発生時の処理 */ -// System.out.println("WebSocketエラー：" + th.getMessage()); -// } -// -// @OnClose -// public void onClose(Session session) { -// /* セッション解放時の処理 */ -// System.out.println("WebSocketセッション確立"); -// } -// -// -// public static void main(String[] args) throws Exception { -// // 初期化のためWebSocketコンテナのオブジェクトを取得する -// WebSocketContainer container = ContainerProvider.getWebSocketContainer(); -// // サーバー・エンドポイントのURI -// URI uri = URI.create("ws://localhost:8080/websocket"); -// // サーバー・エンドポイントとのセッションを確立する -// Session session = container.connectToServer(new SampleClient(),uri); -// // メッセージをサーバへ送る -// session.getBasicRemote().sendText("Hello World!!"); -// } -//} diff --git a/src/test/java/WebSocketTest/WebSocket.java b/src/test/java/WebSocketTest/WebSocket.java deleted file mode 100644 index 632831f..0000000 --- a/src/test/java/WebSocketTest/WebSocket.java +++ /dev/null @@ -1,14 +0,0 @@ -package WebSocketTest; - -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; - -@ServerEndpoint("/WebSocket") -public class WebSocket { - - @OnMessage - public String echo(String message) { - System.out.println("メッセージを受信しました。：" + message); - return message; - } -} \ No newline at end of file diff --git a/src/test/java/WebSocketTest/WebSocketSampleServer.java b/src/test/java/WebSocketTest/WebSocketSampleServer.java deleted file mode 100644 index 77720a6..0000000 --- a/src/test/java/WebSocketTest/WebSocketSampleServer.java +++ /dev/null @@ -1,43 +0,0 @@ -package WebSocketTest; - -import org.springframework.web.socket.WebSocketSession; - -import javax.websocket.*; -import javax.websocket.server.ServerEndpoint; -import java.util.HashSet; -import java.util.Set; - -@ServerEndpoint("/WebSocketServer") -public class WebSocketSampleServer { - private static final Set sessions = new HashSet<>(); - - @OnOpen - public void onOpen(Session session) { - /* セッション確立時の処理 */ - System.out.println("WebSocketセッション確立"); - sessions.add(session); - } - - @OnMessage - public String onMessage(String message) { - /* メッセージ受信時の処理 */ - System.out.println("WebSocket受信：" + message); - for(Session session : sessions){ - session.getAsyncRemote().sendText(message); - //session.getBasicRemote().sendText(message); - } - return "正常にメッセージを受信しました。"; - } - - @OnError - public void onError(Throwable th) { - /* エラー発生時の処理 */ - System.out.println("WebSocketエラー：" + th.getMessage()); - } - - @OnClose - public void onClose(Session session) { - /* セッション解放時の処理 */ - System.out.println("WebSocketセッション確立"); - } -}