Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6968 from eclipse/jetty-10.0.x-6965-WebSocketProg…
…rammaticUpgrade Issue #6965 - support programmatic upgrade for javax/jakarta websockets (10)
- Loading branch information
Showing
6 changed files
with
237 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
170 changes: 170 additions & 0 deletions
170
...c/test/java/org/eclipse/jetty/websocket/javax/tests/ProgrammaticWebSocketUpgradeTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| // | ||
| // ======================================================================== | ||
| // Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd 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 | ||
| // https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 | ||
| // which is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| // | ||
| // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 | ||
| // ======================================================================== | ||
| // | ||
|
|
||
| package org.eclipse.jetty.websocket.javax.tests; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.servlet.ServletConfig; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServlet; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import javax.websocket.CloseReason; | ||
| import javax.websocket.DeploymentException; | ||
| import javax.websocket.Endpoint; | ||
| import javax.websocket.EndpointConfig; | ||
| import javax.websocket.Session; | ||
| import javax.websocket.server.ServerEndpointConfig; | ||
|
|
||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.ServerConnector; | ||
| import org.eclipse.jetty.servlet.ServletContextHandler; | ||
| import org.eclipse.jetty.servlet.ServletHolder; | ||
| import org.eclipse.jetty.util.ajax.JSON; | ||
| import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; | ||
| import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; | ||
| import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| public class ProgrammaticWebSocketUpgradeTest | ||
| { | ||
| private static final Map<String, String> PATH_PARAMS = Map.of("param1", "value1", "param2", "value2"); | ||
| private static final JSON JSON = new JSON(); | ||
| private Server server; | ||
| private ServerConnector connector; | ||
| private JavaxWebSocketClientContainer client; | ||
|
|
||
| @BeforeEach | ||
| public void before() throws Exception | ||
| { | ||
| client = new JavaxWebSocketClientContainer(); | ||
| server = new Server(); | ||
| connector = new ServerConnector(server); | ||
| server.addConnector(connector); | ||
|
|
||
| ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); | ||
| contextHandler.setContextPath("/"); | ||
| contextHandler.addServlet(new ServletHolder(new CustomUpgradeServlet()), "/"); | ||
| server.setHandler(contextHandler); | ||
|
|
||
| JavaxWebSocketServletContainerInitializer.configure(contextHandler, null); | ||
|
|
||
| server.start(); | ||
| client.start(); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void stop() throws Exception | ||
| { | ||
| client.stop(); | ||
| server.stop(); | ||
| } | ||
|
|
||
| public static class PathParamsEndpoint extends Endpoint | ||
| { | ||
| @Override | ||
| public void onOpen(Session session, EndpointConfig config) | ||
| { | ||
| try | ||
| { | ||
| session.getBasicRemote().sendText(JSON.toJSON(session.getPathParameters())); | ||
| session.close(); | ||
| } | ||
| catch (IOException e) | ||
| { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static class CustomUpgradeServlet extends HttpServlet | ||
| { | ||
| private JavaxWebSocketServerContainer container; | ||
|
|
||
| @Override | ||
| public void init(ServletConfig config) throws ServletException | ||
| { | ||
| super.init(config); | ||
| container = JavaxWebSocketServerContainer.getContainer(getServletContext()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException | ||
| { | ||
| try | ||
| { | ||
| switch (request.getServletPath()) | ||
| { | ||
| case "/echo": | ||
| { | ||
| ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(EchoSocket.class, "/").build(); | ||
| HashMap<String, String> pathParams = new HashMap<>(); | ||
| container.upgradeHttpToWebSocket(request, response, sec, pathParams); | ||
| break; | ||
| } | ||
| case "/pathParams": | ||
| { | ||
| ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(PathParamsEndpoint.class, "/").build(); | ||
| container.upgradeHttpToWebSocket(request, response, sec, PATH_PARAMS); | ||
| break; | ||
| } | ||
| default: | ||
| throw new IllegalStateException(); | ||
| } | ||
| } | ||
| catch (DeploymentException e) | ||
| { | ||
| throw new ServletException(e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testWebSocketUpgrade() throws Exception | ||
| { | ||
| URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/echo"); | ||
| EventSocket socket = new EventSocket(); | ||
| try (Session session = client.connectToServer(socket, uri)) | ||
| { | ||
| session.getBasicRemote().sendText("hello world"); | ||
| } | ||
| assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS)); | ||
|
|
||
| String msg = socket.textMessages.poll(); | ||
| assertThat(msg, is("hello world")); | ||
| assertThat(socket.closeReason.getCloseCode(), is(CloseReason.CloseCodes.NORMAL_CLOSURE)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPathParameters() throws Exception | ||
| { | ||
| URI uri = URI.create("ws://localhost:" + connector.getLocalPort() + "/pathParams"); | ||
| EventSocket socket = new EventSocket(); | ||
| client.connectToServer(socket, uri); | ||
| assertTrue(socket.closeLatch.await(5, TimeUnit.SECONDS)); | ||
|
|
||
| String msg = socket.textMessages.poll(); | ||
| assertThat(JSON.fromJSON(msg), is(PATH_PARAMS)); | ||
| assertThat(socket.closeReason.getCloseCode(), is(CloseReason.CloseCodes.NORMAL_CLOSURE)); | ||
| } | ||
| } |