chore(deps): bump dependencies

3 files changed, 56 insertions, 46 deletions

diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
index f7d33e9e..043d318c 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
@@ -8,10 +8,10 @@ package tools.refinery.language.web.xtext.servlet;
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonParseException;
-import org.eclipse.jetty.ee10.websocket.api.Session;
-import org.eclipse.jetty.ee10.websocket.api.StatusCode;
-import org.eclipse.jetty.ee10.websocket.api.WriteCallback;
-import org.eclipse.jetty.ee10.websocket.api.annotations.*;
+import org.eclipse.jetty.websocket.api.Callback;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.StatusCode;
+import org.eclipse.jetty.websocket.api.annotations.*;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.web.server.ISession;
 import org.slf4j.Logger;
@@ -25,7 +25,7 @@ import tools.refinery.language.web.xtext.server.message.XtextWebResponse;
 import java.io.Reader;
 
 @WebSocket
-public class XtextWebSocket implements WriteCallback, ResponseHandler {
+public class XtextWebSocket implements ResponseHandler {
         private static final Logger LOG = LoggerFactory.getLogger(XtextWebSocket.class);
 
         private final Gson gson = new Gson();
@@ -43,13 +43,13 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                 this(new TransactionExecutor(session, resourceServiceProviderRegistry));
         }
 
-        @OnWebSocketConnect
-        public void onConnect(Session webSocketSession) {
+        @OnWebSocketOpen
+        public void onOpen(Session webSocketSession) {
                 if (this.webSocketSession != null) {
                         LOG.error("Websocket session onConnect when already connected");
                         return;
                 }
-                LOG.debug("New websocket connection from {}", webSocketSession.getRemoteAddress());
+                LOG.debug("New websocket connection from {}", webSocketSession.getRemoteSocketAddress());
                 this.webSocketSession = webSocketSession;
         }
 
@@ -60,10 +60,10 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                         return;
                 }
                 if (statusCode == StatusCode.NORMAL || statusCode == StatusCode.SHUTDOWN) {
-                        LOG.debug("{} closed connection normally: {}", webSocketSession.getRemoteAddress(), reason);
+                        LOG.debug("{} closed connection normally: {}", webSocketSession.getRemoteSocketAddress(), reason);
                 } else {
-                        LOG.warn("{} closed connection with status code {}: {}", webSocketSession.getRemoteAddress(), statusCode,
-                                        reason);
+                        LOG.warn("{} closed connection with status code {}: {}", webSocketSession.getRemoteSocketAddress(),
+                                        statusCode, reason);
                 }
                 webSocketSession = null;
         }
@@ -73,7 +73,7 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                 if (webSocketSession == null) {
                         return;
                 }
-                LOG.error("Internal websocket error in connection from" + webSocketSession.getRemoteAddress(), error);
+                LOG.error("Internal websocket error in connection from" + webSocketSession.getRemoteSocketAddress(), error);
         }
 
         @OnWebSocketMessage
@@ -86,14 +86,14 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                 try {
                         request = gson.fromJson(reader, XtextWebRequest.class);
                 } catch (JsonIOException e) {
-                        LOG.error("Cannot read from websocket from" + webSocketSession.getRemoteAddress(), e);
+                        LOG.error("Cannot read from websocket from" + webSocketSession.getRemoteSocketAddress(), e);
                         if (webSocketSession.isOpen()) {
-                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot read payload");
+                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot read payload", Callback.NOOP);
                         }
                         return;
                 } catch (JsonParseException e) {
-                        LOG.warn("Malformed websocket request from" + webSocketSession.getRemoteAddress(), e);
-                        webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload");
+                        LOG.warn("Malformed websocket request from" + webSocketSession.getRemoteSocketAddress(), e);
+                        webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload", Callback.NOOP);
                         return;
                 }
                 try {
@@ -101,7 +101,7 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                 } catch (ResponseHandlerException e) {
                         LOG.warn("Cannot write websocket response", e);
                         if (webSocketSession.isOpen()) {
-                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot write response");
+                                webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot write response", Callback.NOOP);
                         }
                 }
         }
@@ -112,15 +112,14 @@ public class XtextWebSocket implements WriteCallback, ResponseHandler {
                         throw new ResponseHandlerException("Trying to send message when websocket is disconnected");
                 }
                 var responseString = gson.toJson(response);
-                webSocketSession.getRemote().sendPartialString(responseString, true, this);
+                webSocketSession.sendText(responseString, Callback.from(() -> {}, this::writeFailed));
         }
 
-        @Override
         public void writeFailed(Throwable x) {
                 if (webSocketSession == null) {
                         LOG.error("Cannot complete async write to disconnected websocket", x);
                         return;
                 }
-                LOG.warn("Cannot complete async write to websocket " + webSocketSession.getRemoteAddress(), x);
+                LOG.warn("Cannot complete async write to websocket " + webSocketSession.getRemoteSocketAddress(), x);
         }
 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
index 40f5281d..927eeab1 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
@@ -7,17 +7,18 @@ package tools.refinery.language.web;
 
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
-import org.eclipse.jetty.ee10.websocket.api.Session;
-import org.eclipse.jetty.ee10.websocket.api.StatusCode;
-import org.eclipse.jetty.ee10.websocket.api.annotations.WebSocket;
-import org.eclipse.jetty.ee10.websocket.api.exceptions.UpgradeException;
-import org.eclipse.jetty.ee10.websocket.client.ClientUpgradeRequest;
-import org.eclipse.jetty.ee10.websocket.client.WebSocketClient;
 import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.websocket.api.Callback;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.StatusCode;
+import org.eclipse.jetty.websocket.api.annotations.WebSocket;
+import org.eclipse.jetty.websocket.api.exceptions.UpgradeException;
+import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.xtext.testing.GlobalRegistries;
 import org.eclipse.xtext.testing.GlobalRegistries.GlobalStateMemento;
 import org.junit.jupiter.api.AfterEach;
@@ -95,23 +96,34 @@ class ProblemWebSocketServletIntegrationTest {
                 assertThat(responses, hasSize(5));
                 assertThat(responses.get(0), equalTo("{\"id\":\"foo\",\"response\":{\"stateId\":\"-80000000\"}}"));
                 assertThat(responses.get(1), startsWith(
-                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"highlight\",\"push\":{\"regions\":["));
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"highlight\"," +
+                                                "\"push\":{\"regions\":["));
                 assertThat(responses.get(2), equalTo(
-                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"validate\",\"push\":{\"issues\":[]}}"));
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"validate\"," +
+                                                "\"push\":{\"issues\":[]}}"));
                 assertThat(responses.get(3), equalTo("{\"id\":\"bar\",\"response\":{\"stateId\":\"-7fffffff\"}}"));
                 assertThat(responses.get(4), startsWith(
-                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"highlight\",\"push\":{\"regions\":["));
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"highlight\"," +
+                                                "\"push\":{\"regions\":["));
         }
 
         @WebSocket
         public static class UpdateTestClient extends WebSocketIntegrationTestClient {
                 @Override
-                protected void arrange(Session session, int responsesReceived) throws IOException {
+                protected void arrange(Session session, int responsesReceived) {
                         switch (responsesReceived) {
-                        case 0 -> session.getRemote().sendString(
-                                        "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}");
-                        case 3 -> session.getRemote().sendString(
-                                        "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}");
+                        case 0 -> session.sendText(
+                                        "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," +
+                                                        "\"fullText\":\"class Person.\n\"}}",
+                                        Callback.NOOP
+                        );
+                        case 3 -> //noinspection TextBlockMigration
+                                        session.sendText(
+                                        "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," +
+                                                        "\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\"," +
+                                                        "\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}",
+                                        Callback.NOOP
+                        );
                         case 5 -> session.close();
                         }
                 }
@@ -161,13 +173,13 @@ class ProblemWebSocketServletIntegrationTest {
         @WebSocket
         public static class InvalidJsonTestClient extends WebSocketIntegrationTestClient {
                 @Override
-                protected void arrange(Session session, int responsesReceived) throws IOException {
-                        session.getRemote().sendString("<invalid json>");
+                protected void arrange(Session session, int responsesReceived) {
+                        session.sendText("<invalid json>", Callback.NOOP);
                 }
         }
 
         @ParameterizedTest(name = "validOriginTest(\"{0}\")")
-        @ValueSource(strings = { "https://refinery.example", "https://refinery.example:443", "HTTPS://REFINERY.EXAMPLE" })
+        @ValueSource(strings = {"https://refinery.example", "https://refinery.example:443", "HTTPS://REFINERY.EXAMPLE"})
         void validOriginTest(String origin) {
                 startServer("https://refinery.example,https://refinery.example:443");
                 var clientSocket = new CloseImmediatelyTestClient();
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
index 46220777..6ccf1760 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
@@ -5,13 +5,12 @@
  */
 package tools.refinery.language.web.tests;
 
-import org.eclipse.jetty.ee10.websocket.api.Session;
-import org.eclipse.jetty.ee10.websocket.api.annotations.OnWebSocketClose;
-import org.eclipse.jetty.ee10.websocket.api.annotations.OnWebSocketConnect;
-import org.eclipse.jetty.ee10.websocket.api.annotations.OnWebSocketError;
-import org.eclipse.jetty.ee10.websocket.api.annotations.OnWebSocketMessage;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketOpen;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,8 +38,8 @@ public abstract class WebSocketIntegrationTestClient {
                 return responses;
         }
 
-        @OnWebSocketConnect
-        public void onConnect(Session session) {
+        @OnWebSocketOpen
+        public void onOpen(Session session) {
                 arrangeAndCatchErrors(session);
         }
 
@@ -52,7 +51,7 @@ public abstract class WebSocketIntegrationTestClient {
                 }
         }
 
-        protected abstract void arrange(Session session, int responsesReceived) throws IOException;
+        protected abstract void arrange(Session session, int responsesReceived);
 
         @OnWebSocketClose
         public void onClose(int statusCode, String reason) {