From aa205509820b526bf21dfedebfd798ded0d763e7 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 24 Oct 2021 01:19:02 +0200 Subject: test(web): websockets fixes and tests --- .../src/main/java/tools/refinery/language/web/ServerLauncher.java | 2 ++ .../language/web/xtext/server/push/PushWebDocumentAccess.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'language-web/src/main') diff --git a/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java b/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java index a71d8e93..cde7278f 100644 --- a/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java +++ b/language-web/src/main/java/tools/refinery/language/web/ServerLauncher.java @@ -18,6 +18,7 @@ import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.resource.Resource; +import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,6 +74,7 @@ public class ServerLauncher { allowedOriginsString); } handler.addServlet(problemServletHolder, "/xtext-service/*"); + JettyWebSocketServletContainerInitializer.configure(handler, null); } private void addDefaultServlet(ServletContextHandler handler) { diff --git a/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java b/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java index ff4bb035..b3666a86 100644 --- a/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java +++ b/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java @@ -58,10 +58,10 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess { protected String getPrecomputedServiceName(AbstractCachedService service) { if (service instanceof ValidationService) { - return "validation"; + return "validate"; } if (service instanceof HighlightingService) { - return "highlighting"; + return "highlight"; } throw new IllegalArgumentException("Unknown precomputed service: " + service); } -- cgit v1.2.3-70-g09d2