diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9a7fbcaf..bb403d051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ Breaking API changes:
* Removed deprecated static methods in the Either class, instead use TypeUtils helper methods [#877](https://github.com/eclipse-lsp4j/lsp4j/issues/877)
* Removed deprecated factories [#878](https://github.com/eclipse-lsp4j/lsp4j/issues/878)
* Removed deprecated ResponseErrorCode.serverNotInitialized, use ResponseErrorCode.ServerNotInitialized instead [#879](https://github.com/eclipse-lsp4j/lsp4j/issues/879)
+ * Removed deprecated org.eclipse.lsp4j.websocket. Please upgrade to using Jakarta or remain with LSP4J version 0.x.x [#647](https://github.com/eclipse-lsp4j/lsp4j/issues/647)
japicmp report: =UTF-8
diff --git a/org.eclipse.lsp4j.websocket/build.gradle b/org.eclipse.lsp4j.websocket/build.gradle
deleted file mode 100644
index 8875245bd..000000000
--- a/org.eclipse.lsp4j.websocket/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-
-ext.title = 'LSP4J WebSocket'
-description = 'WebSocket support for LSP4J (deprecated, please migrate to org.eclipse.lsp4j.websocket.jakarta)'
-
-dependencies {
- api project(":org.eclipse.lsp4j.jsonrpc")
- api "javax.websocket:javax.websocket-api:${versions.websocket}"
- testImplementation "junit:junit:$versions.junit"
-}
-
-jar.bundle.bnd(
- 'Import-Package': '*'
-)
diff --git a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketEndpoint.java b/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketEndpoint.java
deleted file mode 100644
index cfeb323c8..000000000
--- a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketEndpoint.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket;
-
-import java.util.Collection;
-
-import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-
-/**
- * WebSocket endpoint implementation that connects to a JSON-RPC service.
- *
- * @param remote service interface type
- * @deprecated Please migrate to org.eclipse.lsp4j.websocket.jakarta
- */
-@Deprecated(forRemoval = true)
-public abstract class WebSocketEndpoint extends Endpoint {
-
- @Override
- public void onOpen(Session session, EndpointConfig config) {
- WebSocketLauncherBuilder builder = new WebSocketLauncherBuilder<>();
- builder.setSession(session);
- configure(builder);
- Launcher launcher = builder.create();
- connect(builder.getLocalServices(), launcher.getRemoteProxy());
- }
-
- /**
- * Configure the JSON-RPC launcher. Implementations should set at least the
- * {@link Launcher.Builder#setLocalService(Object) local service} and the
- * {@link Launcher.Builder#setRemoteInterface(Class) remote interface}.
- */
- abstract protected void configure(Launcher.Builder builder);
-
- /**
- * Override this in order to connect the local services to the remote service proxy.
- */
- protected void connect(Collection localServices, T remoteProxy) {
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketLauncherBuilder.java b/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketLauncherBuilder.java
deleted file mode 100644
index 3b2de0439..000000000
--- a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketLauncherBuilder.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket;
-
-import java.util.Collection;
-
-import javax.websocket.Session;
-
-import org.eclipse.lsp4j.jsonrpc.Endpoint;
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
-import org.eclipse.lsp4j.jsonrpc.RemoteEndpoint;
-import org.eclipse.lsp4j.jsonrpc.json.MessageJsonHandler;
-import org.eclipse.lsp4j.jsonrpc.services.ServiceEndpoints;
-
-/**
- * JSON-RPC launcher builder for use in {@link WebSocketEndpoint}.
- *
- * @param remote service interface type
- * @deprecated Please migrate to org.eclipse.lsp4j.websocket.jakarta
- */
-@Deprecated(forRemoval = true)
-public class WebSocketLauncherBuilder extends Launcher.Builder {
-
- protected Session session;
-
- public Collection getLocalServices() {
- return localServices;
- }
-
- public WebSocketLauncherBuilder setSession(Session session) {
- this.session = session;
- return this;
- }
-
- @Override
- public Launcher create() {
- if (localServices == null)
- throw new IllegalStateException("Local service must be configured.");
- if (remoteInterfaces == null)
- throw new IllegalStateException("Remote interface must be configured.");
-
- MessageJsonHandler jsonHandler = createJsonHandler();
- if (messageTracer != null) {
- messageTracer.setJsonHandler(jsonHandler);
- }
- RemoteEndpoint remoteEndpoint = createRemoteEndpoint(jsonHandler);
- addMessageHandlers(jsonHandler, remoteEndpoint);
- T remoteProxy = createProxy(remoteEndpoint);
- return createLauncher(null, remoteProxy, remoteEndpoint, null);
- }
-
- @Override
- protected RemoteEndpoint createRemoteEndpoint(MessageJsonHandler jsonHandler) {
- MessageConsumer outgoingMessageStream = new WebSocketMessageConsumer(session, jsonHandler);
- outgoingMessageStream = wrapMessageConsumer(outgoingMessageStream);
- Endpoint localEndpoint = ServiceEndpoints.toEndpoint(localServices);
- RemoteEndpoint remoteEndpoint;
- if (exceptionHandler == null)
- remoteEndpoint = new RemoteEndpoint(outgoingMessageStream, localEndpoint);
- else
- remoteEndpoint = new RemoteEndpoint(outgoingMessageStream, localEndpoint, exceptionHandler);
- jsonHandler.setMethodProvider(remoteEndpoint);
- remoteEndpoint.setJsonHandler(jsonHandler);
- return remoteEndpoint;
- }
-
- protected void addMessageHandlers(MessageJsonHandler jsonHandler, RemoteEndpoint remoteEndpoint) {
- MessageConsumer messageConsumer = wrapMessageConsumer(remoteEndpoint);
- session.addMessageHandler(new WebSocketMessageHandler(messageConsumer, jsonHandler, remoteEndpoint));
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageConsumer.java b/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageConsumer.java
deleted file mode 100644
index fdb2ed0b4..000000000
--- a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageConsumer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket;
-
-import java.io.IOException;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
-
-import org.eclipse.lsp4j.jsonrpc.JsonRpcException;
-import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
-import org.eclipse.lsp4j.jsonrpc.json.MessageJsonHandler;
-import org.eclipse.lsp4j.jsonrpc.messages.Message;
-
-/**
- * Message consumer that sends messages via a WebSocket session.
- * @deprecated Please migrate to org.eclipse.lsp4j.websocket.jakarta
- */
-@Deprecated(forRemoval = true)
-public class WebSocketMessageConsumer implements MessageConsumer {
-
- private static final Logger LOG = Logger.getLogger(WebSocketMessageConsumer.class.getName());
-
- private final Session session;
- private final MessageJsonHandler jsonHandler;
- private final ConcurrentLinkedQueue messageQueue = new ConcurrentLinkedQueue<>();
- private final WebSocketSendHandler handler = new WebSocketSendHandler();
-
- public WebSocketMessageConsumer(Session session, MessageJsonHandler jsonHandler) {
- this.session = session;
- this.jsonHandler = jsonHandler;
- }
-
- public Session getSession() {
- return session;
- }
-
- @Override
- public void consume(Message message) {
- String content = jsonHandler.serialize(message);
- try {
- sendMessage(content);
- } catch (IOException exception) {
- throw new JsonRpcException(exception);
- }
- }
-
- protected void sendMessage(String message) throws IOException {
- if (session.isOpen()) {
- int length = message.length();
- if (length <= session.getMaxTextMessageBufferSize()) {
- messageQueue.add(message);
- handler.handleNextMessage();
- } else {
- int currentOffset = 0;
- while (currentOffset < length) {
- int currentEnd = Math.min(currentOffset + session.getMaxTextMessageBufferSize(), length);
- session.getBasicRemote().sendText(message.substring(currentOffset, currentEnd), currentEnd == length);
- currentOffset = currentEnd;
- }
- }
- } else {
- LOG.info("Ignoring message due to closed session: " + message);
- }
- }
-
- private class WebSocketSendHandler implements SendHandler {
- private final AtomicBoolean isSending = new AtomicBoolean();
-
- @Override
- public void onResult(SendResult result) {
- isSending.set(false);
- handleNextMessage();
- }
-
- void handleNextMessage() {
- if (session.isOpen() && !messageQueue.isEmpty() && isSending.compareAndSet(false, true)) {
- session.getAsyncRemote().sendText(messageQueue.poll(), this);
- }
- }
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageHandler.java b/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageHandler.java
deleted file mode 100644
index 332e7f66d..000000000
--- a/org.eclipse.lsp4j.websocket/src/main/java/org/eclipse/lsp4j/websocket/WebSocketMessageHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket;
-
-import javax.websocket.MessageHandler;
-
-import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
-import org.eclipse.lsp4j.jsonrpc.MessageIssueException;
-import org.eclipse.lsp4j.jsonrpc.MessageIssueHandler;
-import org.eclipse.lsp4j.jsonrpc.json.MessageJsonHandler;
-import org.eclipse.lsp4j.jsonrpc.messages.Message;
-
-/**
- * WebSocket message handler that parses JSON messages and forwards them to a {@link MessageConsumer}.
- * @deprecated Please migrate to org.eclipse.lsp4j.websocket.jakarta
- */
-@Deprecated(forRemoval = true)
-public class WebSocketMessageHandler implements MessageHandler.Whole {
-
- private final MessageConsumer callback;
- private final MessageJsonHandler jsonHandler;
- private final MessageIssueHandler issueHandler;
-
- public WebSocketMessageHandler(MessageConsumer callback, MessageJsonHandler jsonHandler, MessageIssueHandler issueHandler) {
- this.callback = callback;
- this.jsonHandler = jsonHandler;
- this.issueHandler = issueHandler;
- }
-
- @Override
- public void onMessage(String content) {
- try {
- Message message = jsonHandler.parseMessage(content);
- callback.consume(message);
- } catch (MessageIssueException exception) {
- // An issue was found while parsing or validating the message
- issueHandler.handle(exception.getRpcMessage(), exception.getIssues());
- }
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockConnectionTest.java b/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockConnectionTest.java
deleted file mode 100644
index 67b846232..000000000
--- a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockConnectionTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket.test;
-
-import java.util.Collection;
-import java.util.Random;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import org.eclipse.lsp4j.jsonrpc.Launcher;
-import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
-import org.eclipse.lsp4j.websocket.WebSocketEndpoint;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class MockConnectionTest {
-
- private static final long TIMEOUT = 2000;
-
- private Client client;
- private Server server;
-
- @SuppressWarnings("resource")
- @Before
- public void setup() {
- client = new Client();
- server = new Server();
- MockSession clientSession = new MockSession();
- MockSession serverSession = new MockSession();
- clientSession.connect(serverSession);
- clientSession.open(new ClientSideEndpoint());
- serverSession.open(new ServerSideEndpoint());
- }
-
- @Test
- public void testClientRequest() throws Exception {
- CompletableFuture future = client.server.request("foo");
- String result = future.get(TIMEOUT, TimeUnit.MILLISECONDS);
- Assert.assertEquals("foobar", result);
- }
-
- @Test
- public void testNotifications() throws Exception {
- server.client.notify("12");
- await(() -> client.result.length() == 2);
- client.server.notify("foo");
- await(() -> server.result.length() == 3);
- server.client.notify("34");
- await(() -> client.result.length() == 4);
- client.server.notify("bar");
- await(() -> server.result.length() == 6);
- server.client.notify("56");
- await(() -> client.result.length() == 6);
-
- Assert.assertEquals("foobar", server.result);
- Assert.assertEquals("123456", client.result);
- }
-
- @Test
- public void testManyConcurrentNotifications() throws Exception {
- String expectedResult = "";
- for (char i = 'a'; i <= 'z'; i ++) {
- String x = Character.toString(i);
- client.server.notify(x);
- expectedResult += x;
- }
- int expectedResultLenght = expectedResult.length();
- try {
- await(() -> server.result.length() == expectedResultLenght);
- } catch (Error e) {
- // discard this error so that the nice error displays in the assertEquals
- }
- Assert.assertEquals(expectedResult, server.result);
- }
-
- @Test
- public void testChunkedNotification() throws Exception {
- StringBuilder messageBuilder = new StringBuilder();
- Random random = new Random(1);
- for (int i = 0; i < 3 * MockSession.MAX_CHUNK_SIZE; i++) {
- messageBuilder.append((char) ('a' + random.nextInt('z' - 'a' + 1)));
- }
- String message = messageBuilder.toString();
-
- server.client.notify(message);
- await(() -> client.result.length() == message.length());
-
- Assert.assertEquals(message, client.result);
- }
-
- private void await(Supplier condition) throws InterruptedException {
- long startTime = System.currentTimeMillis();
- while (!condition.get()) {
- Thread.sleep(20);
- if (System.currentTimeMillis() - startTime > TIMEOUT) {
- Assert.fail("Timeout elapsed while waiting for condition.\n");
- }
- }
- }
-
- private interface ClientInterface {
-
- @JsonNotification("client/notify")
- void notify(String arg);
-
- }
-
- private static class Client implements ClientInterface {
- ServerInterface server;
- String result = "";
-
- @Override
- public void notify(String arg) {
- this.result += arg;
- }
- }
-
- private interface ServerInterface {
-
- @JsonRequest("server/request")
- CompletableFuture request(String arg);
-
- @JsonNotification("server/notify")
- void notify(String arg);
-
- }
-
- private static class Server implements ServerInterface {
- ClientInterface client;
- String result = "";
-
- @Override
- public CompletableFuture request(String arg) {
- return CompletableFuture.supplyAsync(() -> arg + "bar");
- }
-
- @Override
- public void notify(String arg) {
- this.result += arg;
- }
- }
-
- private class ClientSideEndpoint extends WebSocketEndpoint {
-
- @Override
- protected void configure(Launcher.Builder builder) {
- builder
- .setLocalService(client)
- .setRemoteInterface(ServerInterface.class);
- }
-
- @Override
- protected void connect(Collection localServices, ServerInterface remoteProxy) {
- localServices.forEach(s -> ((Client) s).server = remoteProxy);
- }
-
- }
-
- private class ServerSideEndpoint extends WebSocketEndpoint {
-
- @Override
- protected void configure(Launcher.Builder builder) {
- builder
- .setLocalService(server)
- .setRemoteInterface(ClientInterface.class);
- }
-
- @Override
- protected void connect(Collection localServices, ClientInterface remoteProxy) {
- localServices.forEach(s -> ((Server) s).client = remoteProxy);
- }
-
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockEndpointConfig.java b/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockEndpointConfig.java
deleted file mode 100644
index 72101cfbd..000000000
--- a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockEndpointConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket.test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.websocket.Decoder;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-
-public class MockEndpointConfig implements EndpointConfig {
-
- @Override
- public List> getEncoders() {
- return Collections.emptyList();
- }
-
- @Override
- public List> getDecoders() {
- return Collections.emptyList();
- }
-
- @Override
- public Map getUserProperties() {
- return Collections.emptyMap();
- }
-
-}
diff --git a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockSession.java b/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockSession.java
deleted file mode 100644
index 6ec812cb0..000000000
--- a/org.eclipse.lsp4j.websocket/src/test/java/org/eclipse/lsp4j/websocket/test/MockSession.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2019 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0,
- * or the Eclipse Distribution License v. 1.0 which is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
- ******************************************************************************/
-package org.eclipse.lsp4j.websocket.test;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.ByteBuffer;
-import java.security.Principal;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
-
-import javax.websocket.CloseReason;
-import javax.websocket.EncodeException;
-import javax.websocket.Endpoint;
-import javax.websocket.Extension;
-import javax.websocket.MessageHandler;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.SendHandler;
-import javax.websocket.SendResult;
-import javax.websocket.Session;
-import javax.websocket.WebSocketContainer;
-
-public class MockSession implements Session {
-
- public static final int MAX_CHUNK_SIZE = 100;
-
- private final BasicRemote basicRemote = new BasicRemote();
- private final AsyncRemote asyncRemote = new AsyncRemote();
- private final Set messageHandlers = new HashSet<>();
- private Endpoint endpoint;
- private MockSession connectedSession;
- private boolean isClosed;
- private StringBuilder partialMessage;
-
- public void connect(MockSession other) {
- this.connectedSession = other;
- other.connectedSession = this;
- }
-
- @Override
- public RemoteEndpoint.Async getAsyncRemote() {
- return asyncRemote;
- }
-
- @Override
- public RemoteEndpoint.Basic getBasicRemote() {
- return basicRemote;
- }
-
- public void open(Endpoint endpoint) {
- this.endpoint = endpoint;
- endpoint.onOpen(this, new MockEndpointConfig());
- }
-
- @Override
- public void close() throws IOException {
- close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "OK"));
- }
-
- @Override
- public void close(CloseReason closeReason) throws IOException {
- isClosed = true;
- endpoint.onClose(this, closeReason);
- }
-
- @Override
- public void addMessageHandler(MessageHandler handler) throws IllegalStateException {
- if (!messageHandlers.add(handler))
- throw new IllegalStateException();
- }
-
- @Override
- public Set getMessageHandlers() {
- return messageHandlers;
- }
-
- @Override
- public void removeMessageHandler(MessageHandler handler) {
- messageHandlers.remove(handler);
- }
-
- @SuppressWarnings("unchecked")
- protected void dispatch(String message, boolean lastChunk) {
- if (lastChunk) {
- String wholeMessage = message;
- if (partialMessage != null) {
- partialMessage.append(message);
- wholeMessage = partialMessage.toString();
- partialMessage = null;
- }
- for (MessageHandler h : connectedSession.messageHandlers) {
- if (h instanceof MessageHandler.Whole)
- ((MessageHandler.Whole) h).onMessage(wholeMessage);
- else
- ((MessageHandler.Partial) h).onMessage(message, true);
- }
- } else {
- if (partialMessage == null) {
- partialMessage = new StringBuilder();
- }
- for (MessageHandler h : connectedSession.messageHandlers) {
- if (h instanceof MessageHandler.Partial)
- ((MessageHandler.Partial) h).onMessage(message, false);
- }
- partialMessage.append(message);
- }
- }
-
- @Override
- public WebSocketContainer getContainer() {
- return null;
- }
-
- @Override
- public String getProtocolVersion() {
- return "13";
- }
-
- @Override
- public String getNegotiatedSubprotocol() {
- return null;
- }
-
- @Override
- public List getNegotiatedExtensions() {
- return Collections.emptyList();
- }
-
- @Override
- public boolean isSecure() {
- return true;
- }
-
- @Override
- public boolean isOpen() {
- return !isClosed;
- }
-
- @Override
- public long getMaxIdleTimeout() {
- return 10000;
- }
-
- @Override
- public void setMaxIdleTimeout(long milliseconds) {
- }
-
- @Override
- public void setMaxBinaryMessageBufferSize(int length) {
- }
-
- @Override
- public int getMaxBinaryMessageBufferSize() {
- return 100;
- }
-
- @Override
- public void setMaxTextMessageBufferSize(int length) {
- }
-
- @Override
- public int getMaxTextMessageBufferSize() {
- return MAX_CHUNK_SIZE;
- }
-
- @Override
- public String getId() {
- return "mock";
- }
-
- @Override
- public URI getRequestURI() {
- try {
- return new URI("http://localhost:8080/mock");
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public Map> getRequestParameterMap() {
- return Collections.emptyMap();
- }
-
- @Override
- public String getQueryString() {
- return "";
- }
-
- @Override
- public Map getPathParameters() {
- return Collections.emptyMap();
- }
-
- @Override
- public Map getUserProperties() {
- return Collections.emptyMap();
- }
-
- @Override
- public Principal getUserPrincipal() {
- return null;
- }
-
- @Override
- public Set getOpenSessions() {
- return Collections.singleton(this);
- }
-
- private class BasicRemote extends AbstractRemoteEndpoint implements RemoteEndpoint.Basic {
-
- @Override
- public void sendText(String text) throws IOException {
- dispatch(text, true);
- }
-
- @Override
- public void sendBinary(ByteBuffer data) throws IOException {
- }
-
- @Override
- public void sendText(String partialMessage, boolean isLast) throws IOException {
- dispatch(partialMessage, isLast);
- }
-
- @Override
- public void sendBinary(ByteBuffer partialByte, boolean isLast) throws IOException {
- }
-
- @Override
- public OutputStream getSendStream() throws IOException {
- return null;
- }
-
- @Override
- public Writer getSendWriter() throws IOException {
- return null;
- }
-
- @Override
- public void sendObject(Object data) throws IOException, EncodeException {
- }
-
- }
-
- private class AsyncRemote extends AbstractRemoteEndpoint implements RemoteEndpoint.Async {
-
- @Override
- public long getSendTimeout() {
- return 1000;
- }
-
- @Override
- public void setSendTimeout(long timeoutmillis) {
- }
-
- @Override
- public void sendText(String text, SendHandler handler) {
- sendText(text).thenRun(() -> {
- handler.onResult(new SendResult());
- });
- }
-
- @Override
- public CompletableFuture sendText(String text) {
- return CompletableFuture.runAsync(() -> {
- dispatch(text, true);
- });
- }
-
- @Override
- public Future sendBinary(ByteBuffer data) {
- return null;
- }
-
- @Override
- public void sendBinary(ByteBuffer data, SendHandler handler) {
- }
-
- @Override
- public Future sendObject(Object data) {
- return null;
- }
-
- @Override
- public void sendObject(Object data, SendHandler handler) {
- }
-
- }
-
- private static abstract class AbstractRemoteEndpoint implements RemoteEndpoint {
-
- @Override
- public void setBatchingAllowed(boolean allowed) throws IOException {
- }
-
- @Override
- public boolean getBatchingAllowed() {
- return false;
- }
-
- @Override
- public void flushBatch() throws IOException {
- }
-
- @Override
- public void sendPing(ByteBuffer applicationData) throws IOException, IllegalArgumentException {
- }
-
- @Override
- public void sendPong(ByteBuffer applicationData) throws IOException, IllegalArgumentException {
- }
-
- }
-
-}
diff --git a/releng/p2/category.xml b/releng/p2/category.xml
index 3ba74bea0..a38dbfebf 100644
--- a/releng/p2/category.xml
+++ b/releng/p2/category.xml
@@ -11,8 +11,5 @@
1.0.0-SNAPSHOT
sources
-
- org.eclipse.lsp4j
- org.eclipse.lsp4j.websocket
- 1.0.0-SNAPSHOT
-
-
- org.eclipse.lsp4j
- org.eclipse.lsp4j.websocket
- 1.0.0-SNAPSHOT
- sources
-
diff --git a/releng/releng-target/lsp4j.target.target b/releng/releng-target/lsp4j.target.target
index fb6bdc35c..b443845f9 100644
--- a/releng/releng-target/lsp4j.target.target
+++ b/releng/releng-target/lsp4j.target.target
@@ -13,12 +13,6 @@
-