diff --git a/Jenkinsfile b/Jenkinsfile index 4477293c51ea..78d314f7f2c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,7 +116,7 @@ def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) { mavenOpts: mavenOpts, mavenLocalRepo: localRepo) { // Some common Maven command line + provided command line - sh "mvn -Pci -V -B -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME + sh "mvn -Pci -Psnapshot-repositories -V -U -B -e -fae -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME } } diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 954b90a009c3..ecca390b3bd9 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -183,7 +183,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} @@ -210,7 +210,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.eclipse.jetty.toolchain diff --git a/aggregates/jetty-websocket-all/pom.xml b/aggregates/jetty-websocket-all/pom.xml index fec0ba1be952..9bac51774596 100644 --- a/aggregates/jetty-websocket-all/pom.xml +++ b/aggregates/jetty-websocket-all/pom.xml @@ -113,7 +113,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} provided @@ -144,7 +144,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api compile diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 8da7484243be..9f18574a38c5 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -61,7 +61,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java similarity index 79% rename from examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java rename to examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java index 86c88c703e35..c94213c66736 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJakartaServer.java @@ -18,20 +18,19 @@ package org.eclipse.jetty.embedded; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; - +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; /** - * Example of setting up a javax.websocket server with Jetty embedded + * Example of setting up a jakarta.websocket server with Jetty embedded */ -public class WebSocketJsrServer +public class WebSocketJakartaServer { /** * A server socket endpoint @@ -56,11 +55,11 @@ public static Server createServer(int port) context.setContextPath("/"); handlers.addHandler(context); - // Enable javax.websocket configuration for the context - JavaxWebSocketServletContainerInitializer.configure(context, + // Enable jakarta.websocket configuration for the context + JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, serverContainer) -> { - // Add your websocket to the javax.websocket.server.ServerContainer + // Add your websocket to the jakarta.websocket.server.ServerContainer serverContainer.addEndpoint(EchoJsrSocket.class); } ); diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java index 8b5d3a34ad34..f6b7d811d4e5 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketServer.java @@ -31,7 +31,7 @@ /** * Example of setting up a Jetty WebSocket server *

- * Note: this uses the Jetty WebSocket API, not the javax.websocket API. + * Note: this uses the Jetty WebSocket API, not the jakarta.websocket API. */ public class WebSocketServer { diff --git a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java similarity index 80% rename from examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java rename to examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java index 4ee58f65fbc0..442533d334d9 100644 --- a/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJsrServerTest.java +++ b/examples/embedded/src/test/java/org/eclipse/jetty/embedded/WebSocketJakartaServerTest.java @@ -20,14 +20,14 @@ import java.net.URI; import java.util.concurrent.LinkedBlockingQueue; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.websocket.api.util.WSURI; @@ -39,14 +39,14 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class WebSocketJsrServerTest +public class WebSocketJakartaServerTest { private Server server; @BeforeEach public void startServer() throws Exception { - server = WebSocketJsrServer.createServer(0); + server = WebSocketJakartaServer.createServer(0); server.start(); } @@ -59,15 +59,15 @@ public void stopServer() throws Exception @Test public void testGetEcho() throws Exception { - WebSocketContainer javaxWebSocketClient = ContainerProvider.getWebSocketContainer(); - javaxWebSocketClient.setDefaultMaxSessionIdleTimeout(2000); + WebSocketContainer jakartaWebSocketClient = ContainerProvider.getWebSocketContainer(); + jakartaWebSocketClient.setDefaultMaxSessionIdleTimeout(2000); try { URI wsUri = WSURI.toWebsocket(server.getURI().resolve("/echo")); TrackingClientEndpoint clientEndpoint = new TrackingClientEndpoint(); - Session session = javaxWebSocketClient.connectToServer(clientEndpoint, null, wsUri); + Session session = jakartaWebSocketClient.connectToServer(clientEndpoint, null, wsUri); session.getBasicRemote().sendText("Hello World"); String response = clientEndpoint.messages.poll(2, SECONDS); @@ -75,7 +75,7 @@ public void testGetEcho() throws Exception } finally { - LifeCycle.stop(javaxWebSocketClient); + LifeCycle.stop(jakartaWebSocketClient); } } diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 8391bfe2680f..f6f62da38a92 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -341,17 +341,17 @@ org.eclipse.jetty.websocket - websocket-javax-client + websocket-jakarta-client 11.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server 11.0.0-SNAPSHOT org.eclipse.jetty.websocket - websocket-javax-common + websocket-jakarta-common 11.0.0-SNAPSHOT diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc index 93eb15c82efb..88e412d272b3 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/annotations/using-annotations.adoc @@ -139,7 +139,7 @@ Here is an example, setting the context attribute in code (although you can also ---- WebAppContext context = new WebAppContext(); context.setAttribute("org.eclipse.jetty.containerInitializerOrder", - "org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServletContainerInitializer, com.acme.Foo.MySCI, *"); + "org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer, com.acme.Foo.MySCI, *"); ---- In this example, we ensure that the `WebSocketServerContainerInitializer` is the very first `ServletContainerInitializer` that is called, followed by MySCI and then any other `ServletContainerInitializer` instances that were discovered but not yet called. diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc index 3795f3d049ba..1e4c19ea15df 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-base-vs-home.adoc @@ -145,7 +145,7 @@ Properties: jetty.secure.port = 8443 jetty.truststore = etc/keystore jetty.truststore.password = OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 - org.eclipse.jetty.websocket.javax = false + org.eclipse.jetty.websocket.jakarta = false threads.max = 200 threads.min = 10 threads.timeout = 60000 @@ -189,8 +189,8 @@ Note: order presented here is how they would appear on the classpath. 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar 34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar -35: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar -36: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar +35: {VERSION} | ${jetty.home}/lib/websocket/websocket-jakarta-client-{VERSION}.jar +36: {VERSION} | ${jetty.home}/lib/websocket/websocket-jakarta-server-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar @@ -235,7 +235,7 @@ etc/demo-rewrite-rules.xml # Websocket chat examples needs websocket enabled # Don't start for all contexts (set to true in test.xml context) -org.eclipse.jetty.websocket.javax=false +org.eclipse.jetty.websocket.jakarta=false --module=websocket # Create and configure the test realm diff --git a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc index 67e7a3594f37..81eb42018d23 100644 --- a/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc +++ b/jetty-documentation/src/main/asciidoc/distribution-guide/startup/startup-classpath.adoc @@ -97,9 +97,9 @@ Note: order presented here is how they would appear on the classpath. 31: 4.1 | ${jetty.home}/lib/annotations/asm-commons-4.1.jar 32: 1.2 | ${jetty.home}/lib/annotations/javax.annotation-api-1.2.jar 33: {VERSION} | ${jetty.home}/lib/jetty-deploy-{VERSION}.jar -34: 1.0 | ${jetty.home}/lib/websocket/javax.websocket-api-1.0.jar -35: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-client-{VERSION}.jar -36: {VERSION} | ${jetty.home}/lib/websocket/websocket-javax-server-{VERSION}.jar +34: 1.0 | ${jetty.home}/lib/websocket/jakarta.websocket-api-1.0.jar +35: {VERSION} | ${jetty.home}/lib/websocket/websocket-jakarta-client-{VERSION}.jar +36: {VERSION} | ${jetty.home}/lib/websocket/websocket-jakarta-server-{VERSION}.jar 37: {VERSION} | ${jetty.home}/lib/websocket/websocket-api-{VERSION}.jar 38: {VERSION} | ${jetty.home}/lib/websocket/websocket-client-{VERSION}.jar 39: {VERSION} | ${jetty.home}/lib/websocket/websocket-common-{VERSION}.jar diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc index dc0493dabee9..9039b85a4d17 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/frameworks/osgi.adoc @@ -1150,13 +1150,13 @@ There is a list of Eclipse P2 sites for the jetty releases maintained at http:// Each P2 repo has one big feature group that defines most of the Jetty jars. *Beware: No 3rd party dependency jars are included, so you will need to have installed the dependencies listed previously in this document.* -In addition, as the feature group includes websocket, you will need to download and have installed the `javax.websocket-api` jar: +In addition, as the feature group includes websocket, you will need to download and have installed the `jakarta.websocket-api` jar: .Extra Jars Required for Websocket [cols=",,",options="header",] |======================================================================= |Jar |Bundle Symbolic Name |Location -|javax.websocket-api |javax.websocket-api -|https://repo1.maven.org/maven2/javax/websocket/websocket-api[Maven +|jakarta.websocket-api |jakarta.websocket-api +|https://repo1.maven.org/maven2/jakarta/websocket/jakarta.websocket-api/[Maven central] |======================================================================= diff --git a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc index defa91f5730b..12d99819ccc0 100644 --- a/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc +++ b/jetty-documentation/src/main/asciidoc/embedded-guide/server/websockets/intro/chapter.adoc @@ -65,7 +65,7 @@ Use http://caniuse.com/websockets[caniuse.com/websockets] to find out. ____ http://www.jcp.org/en/jsr/detail?id=356[JSR-356]:: - The Java WebSocket API (`javax.websocket`) + The Java WebSocket API (`jakarta.websocket`) + This is the official Java API for working with WebSockets. @@ -97,9 +97,9 @@ Jetty WebSocket Server API:: Jetty WebSocket Client API:: Connect to WebSocket servers with Jetty. Java WebSocket Client API:: - The new standard Java WebSocket Client API (`javax.websocket`) [JSR-356] + The new standard Java WebSocket Client API (`jakarta.websocket`) [JSR-356] Java WebSocket Server API:: - The new standard Java WebSocket Server API (`javax.websocket.server`) [JSR-356] + The new standard Java WebSocket Server API (`jakarta.websocket.server`) [JSR-356] === Enabling WebSocket @@ -108,17 +108,17 @@ To enable Websocket, you need to enable the `websocket` link:#enabling-modules[m Once this module is enabled for your Jetty base, it will apply to all webapps deployed to that base. If you want to be more selective about which webapps use Websocket, then you can: Disable Websocket for a particular webapp::: - You can disable jsr-356 for a particular webapp by setting the link:#context_attributes[context attribute] `org.eclipse.jetty.websocket.javax` to `false`. + You can disable jsr-356 for a particular webapp by setting the link:#context_attributes[context attribute] `org.eclipse.jetty.websocket.jakarta` to `false`. This will mean that websockets are not available to your webapp, however deployment time scanning for websocket-related classes such as endpoints will still occur. This can be a significant impost if your webapp contains a lot of classes and/or jar files. To completely disable websockets and avoid all setup costs associated with it for a particular webapp, use instead the context attribute `org.eclipse.jetty.containerInitializerExclusionPattern`, described next, which allows you to exclude the websocket ServletContainerInitializer that causes the scanning. Completely disable Websocket for a particular webapp::: - Set the `org.eclipse.jetty.containerInitializerExclusionPattern` link:#context_attributes[context attribute] to include `org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServletContainerInitializer`. + Set the `org.eclipse.jetty.containerInitializerExclusionPattern` link:#context_attributes[context attribute] to include `org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer`. Here's an example of doing this in code, although you can do the link:#intro-jetty-configuration-webapps[same in xml]: + [source, java, subs="{sub-order}"] ---- WebAppContext context = new WebAppContext(); context.setAttribute("org.eclipse.jetty.containerInitializerExclusionPattern", - "org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServletContainerInitializer|com.acme.*"); + "org.eclipse.jetty.websocket.jakarta.server.JakartaWebSocketServletContainerInitializer|com.acme.*"); ---- diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index a4b827c6db90..afc5df6cedec 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -223,27 +223,27 @@ - copy-lib-javax-websocket-deps + copy-lib-jakarta-websocket-deps generate-resources copy-dependencies org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api jar ${assembly-directory}/lib/websocket - copy-lib-javax-websocket-src-deps + copy-lib-jakarta-websocket-src-deps generate-resources copy-dependencies org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api jar sources ${source-assembly-directory}/lib/websocket @@ -673,7 +673,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 4bf2d79084be..cd546e1cce35 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -218,7 +218,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index d4bac27248f0..588836cac06a 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -96,7 +96,7 @@ org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration + org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 0e7c90f608cf..cc61b52905d1 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -298,7 +298,7 @@ org.eclipse.jetty.websocket - websocket-javax-client + websocket-jakarta-client ${project.version} runtime @@ -316,12 +316,12 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api runtime org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} runtime diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml similarity index 96% rename from jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml rename to jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml index 4ff583996c4f..f2ca0bdbd7af 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml @@ -34,7 +34,7 @@ - boot.javax.websocket.port + boot.jakarta.websocket.port diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml index 6c2b9d68082e..5ad6483ad9aa 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml @@ -82,7 +82,7 @@ org.eclipse.jetty.plus.webapp.EnvConfiguration org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration + org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml index 25f831c57c54..8daff94e1a12 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml @@ -85,7 +85,7 @@ org.eclipse.jetty.webapp.JmxConfiguration org.eclipse.jetty.osgi.annotations.AnnotationConfiguration org.eclipse.jetty.websocket.server.config.JettyWebSocketConfiguration - org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration + org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJavaxWebSocket.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJakartaWebSocket.java similarity index 86% rename from jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJavaxWebSocket.java rename to jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJakartaWebSocket.java index 3406dc7aff32..2c8c8ad8bd6a 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJavaxWebSocket.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/SimpleJakartaWebSocket.java @@ -19,19 +19,20 @@ package org.eclipse.jetty.osgi.test; import java.util.concurrent.CountDownLatch; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import static org.junit.Assert.fail; @ClientEndpoint( subprotocols = {"chat"}) -public class SimpleJavaxWebSocket +public class SimpleJakartaWebSocket { private Session session; public CountDownLatch messageLatch = new CountDownLatch(1); diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java similarity index 90% rename from jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java rename to jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java index ddff23f9f303..0355be2dec9b 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJakartaWebSocket.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.inject.Inject; -import javax.websocket.ContainerProvider; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -47,7 +47,7 @@ * Test using websocket in osgi */ @RunWith(PaxExam.class) -public class TestJettyOSGiBootWithJavaxWebSocket +public class TestJettyOSGiBootWithJakartaWebSocket { private static final String LOG_LEVEL = "WARN"; @@ -60,7 +60,7 @@ public static Option[] configure() ArrayList

*

Configuration instances are discovered by the {@link Configurations} class using either the * {@link ServiceLoader} mechanism or by an explicit call to {@link Configurations#setKnown(String...)}. diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 11cfd45f593e..9c48073ac2dd 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -23,11 +23,11 @@ websocket-jetty-client websocket-jetty-server websocket-jetty-tests - - websocket-javax-common - websocket-javax-client - websocket-javax-server - websocket-javax-tests + + websocket-jakarta-common + websocket-jakarta-client + websocket-jakarta-server + websocket-jakarta-tests diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml index afded076e979..abdd77248aa8 100644 --- a/jetty-websocket/websocket-core/pom.xml +++ b/jetty-websocket/websocket-core/pom.xml @@ -79,7 +79,7 @@ org.eclipse.jetty.websocket:websocket-jetty-api - javax.websocket + jakarta.websocket diff --git a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod index da53af6d2e2a..4c3adf4949b3 100644 --- a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod +++ b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod @@ -1,11 +1,11 @@ DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] -Enable both jetty and javax websocket modules for deployed web applications. +Enable both jetty and jakarta websocket modules for deployed web applications. [tags] websocket [depend] websocket-jetty -websocket-javax +websocket-jakarta diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-jakarta-client/pom.xml similarity index 82% rename from jetty-websocket/websocket-javax-client/pom.xml rename to jetty-websocket/websocket-jakarta-client/pom.xml index 3169b9530869..bf217e12af5f 100644 --- a/jetty-websocket/websocket-javax-client/pom.xml +++ b/jetty-websocket/websocket-jakarta-client/pom.xml @@ -7,11 +7,11 @@ 4.0.0 - websocket-javax-client - Jetty :: Websocket :: javax.websocket :: Client + websocket-jakarta-client + Jetty :: Websocket :: jakarta.websocket :: Client - ${project.groupId}.javax.client + ${project.groupId}.jakarta.client @@ -22,7 +22,7 @@ org.eclipse.jetty.websocket - websocket-javax-common + websocket-jakarta-common ${project.version} @@ -32,7 +32,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.eclipse.jetty @@ -60,15 +60,15 @@ - javax.websocket.client Implementation + jakarta.websocket.client Implementation - org.eclipse.jetty.websocket.javax.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.websocket.jakarta.client.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=javax.websocket.ContainerProvider + osgi.serviceloader;osgi.serviceloader=jakarta.websocket.ContainerProvider diff --git a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java similarity index 64% rename from jetty-websocket/websocket-javax-client/src/main/java/module-info.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java index eb58cdef38e6..a14efa5944d4 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/module-info.java @@ -16,18 +16,18 @@ // ======================================================================== // -import javax.websocket.ContainerProvider; +import jakarta.websocket.ContainerProvider; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider; -import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; - -module org.eclipse.jetty.websocket.javax.client +module org.eclipse.jetty.websocket.jakarta.client { - exports org.eclipse.jetty.websocket.javax.client; - exports org.eclipse.jetty.websocket.javax.client.internal to org.eclipse.jetty.websocket.javax.server; + exports org.eclipse.jetty.websocket.jakarta.client; requires transitive jetty.websocket.api; requires transitive org.eclipse.jetty.client; - requires org.eclipse.jetty.websocket.javax.common; + requires transitive org.eclipse.jetty.websocket.jakarta.common; + requires org.eclipse.jetty.websocket.core; + requires org.eclipse.jetty.websocket.util; - provides ContainerProvider with JavaxWebSocketClientContainerProvider; + provides ContainerProvider with JakartaWebSocketClientContainerProvider; } diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java similarity index 89% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java index 6a207d9223cf..8265b0362991 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/AnnotatedClientEndpointConfig.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; import java.util.Collections; import java.util.List; -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.ClientEndpointConfigWrapper; import org.eclipse.jetty.websocket.util.InvalidWebSocketException; public class AnnotatedClientEndpointConfig extends ClientEndpointConfigWrapper diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/BasicClientEndpointConfig.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java similarity index 87% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/BasicClientEndpointConfig.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java index 21456f05e3f7..60418ef71e21 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/BasicClientEndpointConfig.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/BasicClientEndpointConfig.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; -import org.eclipse.jetty.websocket.javax.common.ClientEndpointConfigWrapper; +import org.eclipse.jetty.websocket.jakarta.common.ClientEndpointConfigWrapper; public class BasicClientEndpointConfig extends ClientEndpointConfigWrapper { diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/EmptyConfigurator.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java similarity index 88% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/EmptyConfigurator.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java index c05d66796b89..4404be035fcb 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/EmptyConfigurator.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/EmptyConfigurator.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; import java.util.List; import java.util.Map; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.HandshakeResponse; + +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.HandshakeResponse; public class EmptyConfigurator extends ClientEndpointConfig.Configurator { diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxClientUpgradeRequest.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java similarity index 77% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxClientUpgradeRequest.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java index b2fd4d5ae521..7d9f450bb478 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxClientUpgradeRequest.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaClientUpgradeRequest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; import java.net.URI; import java.security.Principal; @@ -26,14 +26,14 @@ import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; -public class JavaxClientUpgradeRequest extends ClientUpgradeRequest implements UpgradeRequest +public class JakartaClientUpgradeRequest extends ClientUpgradeRequest implements UpgradeRequest { - private final JavaxWebSocketFrameHandler frameHandler; + private final JakartaWebSocketFrameHandler frameHandler; - public JavaxClientUpgradeRequest(JavaxWebSocketClientContainer clientContainer, WebSocketCoreClient coreClient, URI requestURI, Object websocketPojo) + public JakartaClientUpgradeRequest(JakartaWebSocketClientContainer clientContainer, WebSocketCoreClient coreClient, URI requestURI, Object websocketPojo) { super(coreClient, requestURI); frameHandler = clientContainer.newFrameHandler(websocketPojo, this); diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java similarity index 77% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java index bdf93ba6dcdb..3c85aa4639cf 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientContainer.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; import java.io.IOException; import java.net.URI; @@ -28,73 +28,73 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Function; -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.DeploymentException; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Extension; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Extension; +import jakarta.websocket.Session; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketExtensionConfig; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory; /** - * Container for Client use of the javax.websocket API. + * Container for Client use of the jakarta.websocket API. *

* This should be specific to a JVM if run in a standalone mode. or specific to a WebAppContext if running on the Jetty server. */ @ManagedObject("JSR356 Client Container") -public class JavaxWebSocketClientContainer extends JavaxWebSocketContainer implements javax.websocket.WebSocketContainer +public class JakartaWebSocketClientContainer extends JakartaWebSocketContainer implements jakarta.websocket.WebSocketContainer { protected WebSocketCoreClient coreClient; protected Function coreClientFactory; - private final JavaxWebSocketClientFrameHandlerFactory frameHandlerFactory; + private final JakartaWebSocketClientFrameHandlerFactory frameHandlerFactory; - public JavaxWebSocketClientContainer() + public JakartaWebSocketClientContainer() { this(new WebSocketComponents()); } /** - * Create a {@link javax.websocket.WebSocketContainer} using the supplied + * Create a {@link jakarta.websocket.WebSocketContainer} using the supplied * {@link HttpClient} for environments where you want to configure * SSL/TLS or Proxy behaviors. * * @param httpClient the HttpClient instance to use */ - public JavaxWebSocketClientContainer(final HttpClient httpClient) + public JakartaWebSocketClientContainer(final HttpClient httpClient) { this(new WebSocketComponents(), (wsComponents) -> { WebSocketCoreClient coreClient = new WebSocketCoreClient(httpClient, wsComponents); - coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); + coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); return coreClient; }); } - public JavaxWebSocketClientContainer(WebSocketComponents components) + public JakartaWebSocketClientContainer(WebSocketComponents components) { this(components, (wsComponents) -> { WebSocketCoreClient coreClient = new WebSocketCoreClient(wsComponents); - coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); + coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); return coreClient; }); } - public JavaxWebSocketClientContainer(WebSocketComponents components, Function coreClientFactory) + public JakartaWebSocketClientContainer(WebSocketComponents components, Function coreClientFactory) { super(components); this.coreClientFactory = coreClientFactory; - this.frameHandlerFactory = new JavaxWebSocketClientFrameHandlerFactory(this); + this.frameHandlerFactory = new JakartaWebSocketClientFrameHandlerFactory(this); } protected HttpClient getHttpClient() @@ -119,7 +119,7 @@ protected WebSocketCoreClient getWebSocketCoreClient() * @param upgradeRequest the upgrade request information * @return the future for the session, available on success of connect */ - private CompletableFuture connect(JavaxClientUpgradeRequest upgradeRequest) + private CompletableFuture connect(JakartaClientUpgradeRequest upgradeRequest) { upgradeRequest.setConfiguration(defaultCustomizer); CompletableFuture futureSession = new CompletableFuture<>(); @@ -135,7 +135,7 @@ private CompletableFuture connect(JavaxClientUpgradeRequest upgradeRequ return; } - JavaxWebSocketFrameHandler frameHandler = (JavaxWebSocketFrameHandler)upgradeRequest.getFrameHandler(); + JakartaWebSocketFrameHandler frameHandler = (JakartaWebSocketFrameHandler)upgradeRequest.getFrameHandler(); futureSession.complete(frameHandler.getSession()); }); } @@ -152,7 +152,7 @@ private Session connect(ConfiguredEndpoint configuredEndpoint, URI destURI) thro Objects.requireNonNull(configuredEndpoint, "WebSocket configured endpoint cannot be null"); Objects.requireNonNull(destURI, "Destination URI cannot be null"); - JavaxClientUpgradeRequest upgradeRequest = new JavaxClientUpgradeRequest(this, getWebSocketCoreClient(), destURI, configuredEndpoint); + JakartaClientUpgradeRequest upgradeRequest = new JakartaClientUpgradeRequest(this, getWebSocketCoreClient(), destURI, configuredEndpoint); EndpointConfig config = configuredEndpoint.getConfig(); if (config instanceof ClientEndpointConfig) @@ -164,7 +164,7 @@ private Session connect(ConfiguredEndpoint configuredEndpoint, URI destURI) thro for (Extension ext : clientEndpointConfig.getExtensions()) { - upgradeRequest.addExtensions(new JavaxWebSocketExtensionConfig(ext)); + upgradeRequest.addExtensions(new JakartaWebSocketExtensionConfig(ext)); } if (clientEndpointConfig.getPreferredSubprotocols().size() > 0) @@ -230,7 +230,7 @@ public Session connectToServer(Object endpoint, URI path) throws DeploymentExcep } @Override - public JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory() + public JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory() { return frameHandlerFactory; } diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java similarity index 83% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java index 6e619ce2f818..047433548b48 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client; - -import javax.websocket.ContainerProvider; -import javax.websocket.WebSocketContainer; +package org.eclipse.jetty.websocket.jakarta.client; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; @@ -29,10 +28,10 @@ * Client {@link ContainerProvider} implementation. *

* Created by a {@link java.util.ServiceLoader} call in the - * {@link javax.websocket.ContainerProvider#getWebSocketContainer()} call. + * {@link jakarta.websocket.ContainerProvider#getWebSocketContainer()} call. *

*/ -public class JavaxWebSocketClientContainerProvider extends ContainerProvider +public class JakartaWebSocketClientContainerProvider extends ContainerProvider { public static void stop(WebSocketContainer container) throws Exception { @@ -48,9 +47,9 @@ public static void stop(WebSocketContainer container) throws Exception *

* NOTE: A WebSocket Client Container is a heavyweight object. * It is dangerous to repeatedly request a new container, or to manage many containers. - * The existing javax.websocket API has no lifecycle for a ClientContainer, once started + * The existing jakarta.websocket API has no lifecycle for a ClientContainer, once started * they exist for the duration of the JVM with no ability to stop them. - * See/Comment on javax.websocket Issue #212 + * See/Comment on jakarta.websocket Issue #212 * if this is a big concern for you. *

*/ @@ -63,7 +62,7 @@ protected WebSocketContainer getContainer() // TODO: on multiple executions, do we share bufferPool/executors/etc? // TODO: do we want to provide a non-standard way to configure to always return the same clientContainer based on a config somewhere? (system.property?) - JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer(); + JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer(); // Register as JVM runtime shutdown hook? ShutdownThread.register(clientContainer); diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java similarity index 54% rename from jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java rename to jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java index 39f3221b8772..3455ac5934b2 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JavaxWebSocketClientFrameHandlerFactory.java +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java @@ -16,25 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.client.internal; +package org.eclipse.jetty.websocket.jakarta.client; -import javax.websocket.ClientEndpoint; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata; import org.eclipse.jetty.websocket.util.InvokerUtils; -public class JavaxWebSocketClientFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory +public class JakartaWebSocketClientFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory { - public JavaxWebSocketClientFrameHandlerFactory(JavaxWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier) + public JakartaWebSocketClientFrameHandlerFactory(JakartaWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier) { super(container, paramIdentifier); } - public JavaxWebSocketClientFrameHandlerFactory(JavaxWebSocketContainer container) + public JakartaWebSocketClientFrameHandlerFactory(JakartaWebSocketContainer container) { super(container, InvokerUtils.PARAM_IDENTITY); } @@ -46,9 +46,9 @@ public EndpointConfig newDefaultEndpointConfig(Class endpointClass, String pa } @Override - public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) + public JakartaWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) { - if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass)) + if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass)) { return createEndpointMetadata((Class)endpointClass, endpointConfig); } @@ -58,7 +58,7 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, En return null; } - JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig); - return discoverJavaxFrameHandlerMetadata(endpointClass, metadata); + JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig); + return discoverJakartaFrameHandlerMetadata(endpointClass, metadata); } } diff --git a/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java new file mode 100644 index 000000000000..d2fa9df8a981 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java @@ -0,0 +1,92 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under +// the terms of the Eclipse Public License 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0 +// +// This Source Code may also be made available under the following +// Secondary Licenses when the conditions for such availability set +// forth in the Eclipse Public License, v. 2.0 are satisfied: +// the Apache License v2.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.jakarta.client; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +import jakarta.websocket.ClientEndpointConfig.Configurator; +import jakarta.websocket.HandshakeResponse; +import org.eclipse.jetty.client.HttpRequest; +import org.eclipse.jetty.client.HttpResponse; +import org.eclipse.jetty.http.HttpFields; +import org.eclipse.jetty.websocket.core.client.UpgradeListener; + +public class JsrUpgradeListener implements UpgradeListener +{ + private Configurator configurator; + + public JsrUpgradeListener(Configurator configurator) + { + this.configurator = configurator; + } + + @Override + public void onHandshakeRequest(HttpRequest request) + { + if (configurator == null) + { + return; + } + + HttpFields fields = request.getHeaders(); + + Map> originalHeaders = new HashMap<>(); + fields.forEach((field) -> + { + List values = new ArrayList<>(); + Stream.of(field.getValues()).forEach((val) -> values.add(val)); + originalHeaders.put(field.getName(), values); + }); + + // Give headers to configurator + configurator.beforeRequest(originalHeaders); + + // Reset headers on HttpRequest per configurator + fields.clear(); + originalHeaders.forEach((name, values) -> fields.put(name, values)); + } + + @Override + public void onHandshakeResponse(HttpRequest request, HttpResponse response) + { + if (configurator == null) + { + return; + } + + HandshakeResponse handshakeResponse = () -> + { + HttpFields fields = response.getHeaders(); + Map> ret = new HashMap<>(); + fields.forEach((field) -> + { + List values = new ArrayList<>(); + Stream.of(field.getValues()).forEach((val) -> values.add(val)); + ret.put(field.getName(), values); + }); + return ret; + }; + + configurator.afterResponse(handshakeResponse); + } +} diff --git a/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider b/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider new file mode 100644 index 000000000000..25dcc3f91152 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-client/src/main/resources/META-INF/services/jakarta.websocket.ContainerProvider @@ -0,0 +1 @@ +org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider \ No newline at end of file diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java similarity index 93% rename from jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java index a373d6b09e49..81384fce3063 100644 --- a/jetty-websocket/websocket-javax-client/src/test/java/examples/EchoEndpoint.java +++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/EchoEndpoint.java @@ -21,11 +21,12 @@ import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; /** * Basic Echo Client Endpoint diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java similarity index 96% rename from jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java index 44c6c705c90e..2440644669b1 100644 --- a/jetty-websocket/websocket-javax-client/src/test/java/examples/OriginServerConfigurator.java +++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/OriginServerConfigurator.java @@ -21,7 +21,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.websocket.ClientEndpointConfig; + +import jakarta.websocket.ClientEndpointConfig; /** * Provide a means to set the `Origin` header for outgoing WebSocket upgrade requests diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java similarity index 84% rename from jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java index b41d66e1336b..3f06f125bd2b 100644 --- a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java +++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java @@ -20,15 +20,15 @@ import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.ssl.SslContextFactory; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; public class SecureClientContainerExample { @@ -56,7 +56,7 @@ public static void main(String[] args) } finally { - /* Since javax.websocket clients have no defined LifeCycle we + /* Since jakarta.websocket clients have no defined LifeCycle we * want to either close/stop the client, or exit the JVM * via a System.exit(), otherwise the threads this client keeps * open will prevent the JVM from terminating naturally. @@ -67,11 +67,11 @@ public static void main(String[] args) } /** - * Since javax.websocket does not have an API for configuring SSL, each implementation - * of javax.websocket has to come up with their own SSL configuration mechanism. + * Since jakarta.websocket does not have an API for configuring SSL, each implementation + * of jakarta.websocket has to come up with their own SSL configuration mechanism. * * @return the client WebSocketContainer - * @see javax.websocket issue #210 + * @see jakarta.websocket issue #210 */ public static WebSocketContainer getConfiguredWebSocketContainer() throws Exception { @@ -81,7 +81,7 @@ public static WebSocketContainer getConfiguredWebSocketContainer() throws Except clientConnector.setSslContextFactory(ssl); HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP(clientConnector)); - JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer(httpClient); + JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer(httpClient); clientContainer.addManaged(httpClient); // allow clientContainer to own httpClient (for start/stop lifecycle) clientContainer.start(); return clientContainer; diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java similarity index 88% rename from jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java rename to jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java index 85680ae634a1..04bd23d2ff73 100644 --- a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureWebSocketContainerExample.java +++ b/jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureWebSocketContainerExample.java @@ -22,10 +22,10 @@ import java.net.URI; import java.net.URL; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.component.LifeCycle; public class SecureWebSocketContainerExample @@ -53,7 +53,7 @@ public static void main(String[] args) } finally { - /* Since javax.websocket clients have no defined LifeCycle we + /* Since jakarta.websocket clients have no defined LifeCycle we * want to either close/stop the client, or exit the JVM * via a System.exit(), otherwise the threads this client keeps * open will prevent the JVM from terminating naturally. @@ -64,8 +64,8 @@ public static void main(String[] args) } /** - * Since javax.websocket does not have an API for configuring SSL, each implementation - * of javax.websocket has to come up with their own SSL configuration mechanism. + * Since jakarta.websocket does not have an API for configuring SSL, each implementation + * of jakarta.websocket has to come up with their own SSL configuration mechanism. *

* When the {@link WebSocketContainer} is used it will need to create and start a Jetty WebSocket Client. * The {@code WebSocketClient} must use a Jetty {@code HttpClient} which can be configured for SSL, this @@ -76,7 +76,7 @@ public static void main(String[] args) * along with the jetty-xml artifact. *

* @return the client WebSocketContainer - * @see javax.websocket issue #210 + * @see jakarta.websocket issue #210 */ public static WebSocketContainer getConfiguredWebSocketContainer() throws Exception { diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/websocket-javax-client/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/websocket-javax-client/src/test/resources/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-jakarta-client/src/test/resources/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-jakarta-common/pom.xml similarity index 84% rename from jetty-websocket/websocket-javax-common/pom.xml rename to jetty-websocket/websocket-jakarta-common/pom.xml index b9e55fea3b0a..6273360108b6 100644 --- a/jetty-websocket/websocket-javax-common/pom.xml +++ b/jetty-websocket/websocket-jakarta-common/pom.xml @@ -7,11 +7,11 @@ 4.0.0 - websocket-javax-common - Jetty :: Websocket :: javax.websocket :: Common + websocket-jakarta-common + Jetty :: Websocket :: jakarta.websocket :: Common - ${project.groupId}.javax.common + ${project.groupId}.jakarta.common @@ -27,9 +27,9 @@ - javax.websocket.client Implementation + jakarta.websocket.client Implementation - org.eclipse.jetty.websocket.javax.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.websocket.jakarta.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" @@ -78,7 +78,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.slf4j diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java similarity index 77% rename from jetty-websocket/websocket-javax-common/src/main/java/module-info.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java index 08b85dda8626..bf34e1c7f2b8 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java @@ -16,12 +16,12 @@ // ======================================================================== // -module org.eclipse.jetty.websocket.javax.common +module org.eclipse.jetty.websocket.jakarta.common { - exports org.eclipse.jetty.websocket.javax.common; - exports org.eclipse.jetty.websocket.javax.common.decoders; - exports org.eclipse.jetty.websocket.javax.common.encoders; - exports org.eclipse.jetty.websocket.javax.common.messages; + exports org.eclipse.jetty.websocket.jakarta.common; + exports org.eclipse.jetty.websocket.jakarta.common.decoders; + exports org.eclipse.jetty.websocket.jakarta.common.encoders; + exports org.eclipse.jetty.websocket.jakarta.common.messages; requires transitive jetty.websocket.api; requires transitive org.eclipse.jetty.http; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java index dac3b9bed89c..55cfc065dbc5 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ClientEndpointConfigWrapper.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ClientEndpointConfigWrapper.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.List; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.Extension; + +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.Extension; public class ClientEndpointConfigWrapper extends EndpointConfigWrapper implements ClientEndpointConfig { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java similarity index 94% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java index bd4770e241a5..bf021c4f5496 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ConfiguredEndpoint.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EndpointConfig; /** * Associate a JSR Endpoint with its optional {@link EndpointConfig} diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java index 665b3873e899..3edd822e9c4b 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/EndpointConfigWrapper.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/EndpointConfigWrapper.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.websocket.Decoder; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.Decoder; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public abstract class EndpointConfigWrapper implements EndpointConfig, PathParamProvider { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java index 80f12bdfce45..dc7ccc8aef8b 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/InitException.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; /** * Exception during initialization of the Endpoint diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java index ab86f54b4bd7..9976b767f05c 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.Future; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.SendHandler; -import javax.websocket.SendResult; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.SendHandler; +import jakarta.websocket.SendResult; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.CoreSession; @@ -37,11 +37,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaxWebSocketAsyncRemote extends JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint.Async +public class JakartaWebSocketAsyncRemote extends JakartaWebSocketRemoteEndpoint implements jakarta.websocket.RemoteEndpoint.Async { - static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketAsyncRemote.class); + static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketAsyncRemote.class); - protected JavaxWebSocketAsyncRemote(JavaxWebSocketSession session, CoreSession coreSession) + protected JakartaWebSocketAsyncRemote(JakartaWebSocketSession session, CoreSession coreSession) { super(session, coreSession); } @@ -72,7 +72,7 @@ public Future sendBinary(ByteBuffer data) } @Override - public void sendBinary(ByteBuffer data, javax.websocket.SendHandler handler) + public void sendBinary(ByteBuffer data, jakarta.websocket.SendHandler handler) { assertMessageNotNull(data); assertSendHandlerNotNull(handler); diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java index a119ebf1f9cf..52de96989289 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.io.OutputStream; import java.io.Writer; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; -import javax.websocket.EncodeException; -import javax.websocket.RemoteEndpoint; +import jakarta.websocket.EncodeException; +import jakarta.websocket.RemoteEndpoint; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.CoreSession; @@ -37,11 +37,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; -public class JavaxWebSocketBasicRemote extends JavaxWebSocketRemoteEndpoint implements RemoteEndpoint.Basic +public class JakartaWebSocketBasicRemote extends JakartaWebSocketRemoteEndpoint implements RemoteEndpoint.Basic { - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketBasicRemote.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketBasicRemote.class); - protected JavaxWebSocketBasicRemote(JavaxWebSocketSession session, CoreSession coreSession) + protected JakartaWebSocketBasicRemote(JakartaWebSocketSession session, CoreSession coreSession) { super(session, coreSession); } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java similarity index 79% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java index 44c07a2815bb..70aebb69b25c 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.time.Duration; import java.util.ArrayList; @@ -25,9 +25,9 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.function.Consumer; -import javax.websocket.Extension; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.Extension; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.component.ContainerLifeCycle; @@ -37,15 +37,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class JavaxWebSocketContainer extends ContainerLifeCycle implements javax.websocket.WebSocketContainer +public abstract class JakartaWebSocketContainer extends ContainerLifeCycle implements jakarta.websocket.WebSocketContainer { - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketContainer.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketContainer.class); private final SessionTracker sessionTracker = new SessionTracker(); - private final List sessionListeners = new ArrayList<>(); + private final List sessionListeners = new ArrayList<>(); protected final Configuration.ConfigurationCustomizer defaultCustomizer = new Configuration.ConfigurationCustomizer(); protected final WebSocketComponents components; - public JavaxWebSocketContainer(WebSocketComponents components) + public JakartaWebSocketContainer(WebSocketComponents components) { this.components = components; addSessionListener(sessionTracker); @@ -54,7 +54,7 @@ public JavaxWebSocketContainer(WebSocketComponents components) public abstract Executor getExecutor(); - protected abstract JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory(); + protected abstract JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory(); public ByteBufferPool getBufferPool() { @@ -137,25 +137,25 @@ public Set getInstalledExtensions() for (String name : getExtensionRegistry().getAvailableExtensionNames()) { - ret.add(new JavaxWebSocketExtension(name)); + ret.add(new JakartaWebSocketExtension(name)); } return ret; } /** - * Used in {@link javax.websocket.Session#getOpenSessions()} + * Used in {@link jakarta.websocket.Session#getOpenSessions()} * * @return the set of open sessions */ - public Set getOpenSessions() + public Set getOpenSessions() { return sessionTracker.getSessions(); } - public JavaxWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeRequest upgradeRequest) + public JakartaWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeRequest upgradeRequest) { - return getFrameHandlerFactory().newJavaxWebSocketFrameHandler(websocketPojo, upgradeRequest); + return getFrameHandlerFactory().newJakartaWebSocketFrameHandler(websocketPojo, upgradeRequest); } /** @@ -163,7 +163,7 @@ public JavaxWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeR * * @param listener the listener */ - public void addSessionListener(JavaxWebSocketSessionListener listener) + public void addSessionListener(JakartaWebSocketSessionListener listener) { sessionListeners.add(listener); } @@ -174,7 +174,7 @@ public void addSessionListener(JavaxWebSocketSessionListener listener) * @param listener the listener * @return true if listener was present and removed */ - public boolean removeSessionListener(JavaxWebSocketSessionListener listener) + public boolean removeSessionListener(JakartaWebSocketSessionListener listener) { return sessionListeners.remove(listener); } @@ -184,9 +184,9 @@ public boolean removeSessionListener(JavaxWebSocketSessionListener listener) * * @param consumer the consumer to pass to each listener */ - public void notifySessionListeners(Consumer consumer) + public void notifySessionListeners(Consumer consumer) { - for (JavaxWebSocketSessionListener listener : sessionListeners) + for (JakartaWebSocketSessionListener listener : sessionListeners) { try { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java index cf62895ac0c1..a5d1135a1d2b 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtension.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.websocket.Extension; +import jakarta.websocket.Extension; import org.eclipse.jetty.websocket.core.ExtensionConfig; -public class JavaxWebSocketExtension implements Extension +public class JakartaWebSocketExtension implements Extension { private static class JsrParameter implements Extension.Parameter { @@ -59,7 +59,7 @@ public String getValue() * * @param cfg the configuration for the extension */ - public JavaxWebSocketExtension(ExtensionConfig cfg) + public JakartaWebSocketExtension(ExtensionConfig cfg) { this.name = cfg.getName(); if (cfg.getParameters() != null) @@ -76,7 +76,7 @@ public JavaxWebSocketExtension(ExtensionConfig cfg) * * @param name the name of the extension */ - public JavaxWebSocketExtension(String name) + public JakartaWebSocketExtension(String name) { this.name = name; } @@ -101,7 +101,7 @@ public boolean equals(Object o) if (o == null || getClass() != o.getClass()) return false; - JavaxWebSocketExtension that = (JavaxWebSocketExtension)o; + JakartaWebSocketExtension that = (JakartaWebSocketExtension)o; return name != null ? name.equals(that.name) : that.name == null; } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java similarity index 82% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java index 814f150e47ae..7e99cd5216a4 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketExtensionConfig.java @@ -16,15 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; - -import javax.websocket.Extension; +package org.eclipse.jetty.websocket.jakarta.common; +import jakarta.websocket.Extension; import org.eclipse.jetty.websocket.core.ExtensionConfig; -public class JavaxWebSocketExtensionConfig extends ExtensionConfig +public class JakartaWebSocketExtensionConfig extends ExtensionConfig { - public JavaxWebSocketExtensionConfig(Extension ext) + public JakartaWebSocketExtensionConfig(Extension ext) { super(ext.getName()); for (Extension.Parameter param : ext.getParameters()) diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java index dcd6ad1189bf..6f07aa1be070 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -28,14 +28,14 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.CloseReason; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.PongMessage; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.CloseReason; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; @@ -45,11 +45,11 @@ import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.exception.ProtocolException; import org.eclipse.jetty.websocket.core.exception.WebSocketException; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryStreamMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.util.InvokerUtils; import org.eclipse.jetty.websocket.util.messages.MessageSink; import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink; @@ -58,10 +58,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaxWebSocketFrameHandler implements FrameHandler +public class JakartaWebSocketFrameHandler implements FrameHandler { private final Logger logger; - private final JavaxWebSocketContainer container; + private final JakartaWebSocketContainer container; private final Object endpointInstance; private final AtomicBoolean closeNotified = new AtomicBoolean(); @@ -83,7 +83,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler *

*

* The values are represented as {@link String} and are essentially static for this - * instance of the the JavaxWebSocketFrameHandler. They will be converted to the + * instance of the the JakartaWebSocketFrameHandler. They will be converted to the * type declared by the {@code @PathParam} annotations following the JSR356 advice * to only support String, Java Primitives (or their Boxed version). *

@@ -95,8 +95,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler private MethodHandle openHandle; private MethodHandle closeHandle; private MethodHandle errorHandle; - private JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata; - private JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata; + private JakartaWebSocketFrameHandlerMetadata.MessageMetadata textMetadata; + private JakartaWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata; private MethodHandle pongHandle; private UpgradeRequest upgradeRequest; @@ -106,18 +106,18 @@ public class JavaxWebSocketFrameHandler implements FrameHandler private MessageSink textSink; private MessageSink binarySink; private MessageSink activeMessageSink; - private JavaxWebSocketSession session; + private JakartaWebSocketSession session; private CoreSession coreSession; protected byte dataType = OpCode.UNDEFINED; - public JavaxWebSocketFrameHandler(JavaxWebSocketContainer container, - Object endpointInstance, - MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle, - JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata, - JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata, - MethodHandle pongHandle, - EndpointConfig endpointConfig) + public JakartaWebSocketFrameHandler(JakartaWebSocketContainer container, + Object endpointInstance, + MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle, + JakartaWebSocketFrameHandlerMetadata.MessageMetadata textMetadata, + JakartaWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata, + MethodHandle pongHandle, + EndpointConfig endpointConfig) { this.logger = LoggerFactory.getLogger(endpointInstance.getClass()); @@ -150,7 +150,7 @@ public EndpointConfig getEndpointConfig() return endpointConfig; } - public JavaxWebSocketSession getSession() + public JakartaWebSocketSession getSession() { return session; } @@ -164,40 +164,40 @@ public void onOpen(CoreSession coreSession, Callback callback) { // Rewire EndpointConfig to call CoreSession setters if Jetty specific properties are set. endpointConfig = getWrappedEndpointConfig(); - session = new JavaxWebSocketSession(container, coreSession, this, endpointConfig); + session = new JakartaWebSocketSession(container, coreSession, this, endpointConfig); openHandle = InvokerUtils.bindTo(openHandle, session, endpointConfig); closeHandle = InvokerUtils.bindTo(closeHandle, session); errorHandle = InvokerUtils.bindTo(errorHandle, session); pongHandle = InvokerUtils.bindTo(pongHandle, session); - JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JakartaWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata); if (actualTextMetadata != null) { if (actualTextMetadata.isMaxMessageSizeSet()) session.setMaxTextMessageBufferSize(actualTextMetadata.maxMessageSize); actualTextMetadata.handle = InvokerUtils.bindTo(actualTextMetadata.handle, endpointInstance, endpointConfig, session); - actualTextMetadata.handle = JavaxWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualTextMetadata.handle, session); - textSink = JavaxWebSocketFrameHandlerFactory.createMessageSink(session, actualTextMetadata); + actualTextMetadata.handle = JakartaWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualTextMetadata.handle, session); + textSink = JakartaWebSocketFrameHandlerFactory.createMessageSink(session, actualTextMetadata); textMetadata = actualTextMetadata; } - JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JakartaWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata); if (actualBinaryMetadata != null) { if (actualBinaryMetadata.isMaxMessageSizeSet()) session.setMaxBinaryMessageBufferSize(actualBinaryMetadata.maxMessageSize); actualBinaryMetadata.handle = InvokerUtils.bindTo(actualBinaryMetadata.handle, endpointInstance, endpointConfig, session); - actualBinaryMetadata.handle = JavaxWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualBinaryMetadata.handle, session); - binarySink = JavaxWebSocketFrameHandlerFactory.createMessageSink(session, actualBinaryMetadata); + actualBinaryMetadata.handle = JakartaWebSocketFrameHandlerFactory.wrapNonVoidReturnType(actualBinaryMetadata.handle, session); + binarySink = JakartaWebSocketFrameHandlerFactory.createMessageSink(session, actualBinaryMetadata); binaryMetadata = actualBinaryMetadata; } if (openHandle != null) openHandle.invoke(); - container.notifySessionListeners((listener) -> listener.onJavaxWebSocketSessionOpened(session)); + container.notifySessionListeners((listener) -> listener.onJakartaWebSocketSessionOpened(session)); callback.succeeded(); } catch (Throwable cause) @@ -291,7 +291,7 @@ public void onClose(Frame frame, Callback callback) public void onClosed(CloseStatus closeStatus, Callback callback) { notifyOnClose(closeStatus, callback); - container.notifySessionListeners((listener) -> listener.onJavaxWebSocketSessionClosed(session)); + container.notifySessionListeners((listener) -> listener.onJakartaWebSocketSessionClosed(session)); } private void notifyOnClose(CloseStatus closeStatus, Callback callback) @@ -350,12 +350,12 @@ public Map getMessageHandlerMap() return messageHandlerMap; } - public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata() + public JakartaWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata() { return binaryMetadata; } - public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata() + public JakartaWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata() { return textMetadata; } @@ -369,7 +369,7 @@ private void assertBasicTypeNotRegistered(byte basicWebSocketType, Object messag } } - public void addMessageHandler(JavaxWebSocketSession session, Class clazz, MessageHandler.Partial handler) + public void addMessageHandler(JakartaWebSocketSession session, Class clazz, MessageHandler.Partial handler) { try { @@ -385,7 +385,7 @@ public void addMessageHandler(JavaxWebSocketSession session, Class clazz, assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialByteArrayMessageSink(coreSession, partialMessageHandler); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); - JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialByteArrayMessageSink.class; this.binaryMetadata = metadata; @@ -395,7 +395,7 @@ else if (ByteBuffer.class.isAssignableFrom(clazz)) assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialByteBufferMessageSink(coreSession, partialMessageHandler); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); - JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialByteBufferMessageSink.class; this.binaryMetadata = metadata; @@ -405,7 +405,7 @@ else if (String.class.isAssignableFrom(clazz)) assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName()); MessageSink messageSink = new PartialStringMessageSink(coreSession, partialMessageHandler); this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink); - JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = partialMessageHandler; metadata.sinkClass = PartialStringMessageSink.class; this.textMetadata = metadata; @@ -427,7 +427,7 @@ else if (String.class.isAssignableFrom(clazz)) } } - public void addMessageHandler(JavaxWebSocketSession session, Class clazz, MessageHandler.Whole handler) + public void addMessageHandler(JakartaWebSocketSession session, Class clazz, MessageHandler.Whole handler) { try { @@ -452,7 +452,7 @@ public void addMessageHandler(JavaxWebSocketSession session, Class clazz, throw new IllegalStateException("Unable to find Decoder for type: " + clazz); } - JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata(); + JakartaWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JakartaWebSocketFrameHandlerMetadata.MessageMetadata(); metadata.handle = wholeMsgMethodHandle; metadata.registeredDecoder = registeredDecoder; @@ -611,7 +611,7 @@ public void onPong(Frame frame, Callback callback) payload = BufferUtil.EMPTY_BUFFER; // Use JSR356 PongMessage interface - JavaxWebSocketPongMessage pongMessage = new JavaxWebSocketPongMessage(payload); + JakartaWebSocketPongMessage pongMessage = new JakartaWebSocketPongMessage(payload); pongHandle.invoke(pongMessage); } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java index f32209acf9ca..232ac1fb18f5 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.InputStream; import java.io.Reader; @@ -32,24 +32,24 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import javax.websocket.CloseReason; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.PongMessage; -import javax.websocket.Session; +import jakarta.websocket.CloseReason; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.PongMessage; +import jakarta.websocket.Session; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.websocket.core.CoreSession; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedBinaryStreamMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextMessageSink; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.eclipse.jetty.websocket.util.InvokerUtils; @@ -65,9 +65,9 @@ import org.eclipse.jetty.websocket.util.messages.StringMessageSink; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; +import static org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata.MessageMetadata; -public abstract class JavaxWebSocketFrameHandlerFactory +public abstract class JakartaWebSocketFrameHandlerFactory { private static final MethodHandle FILTER_RETURN_TYPE_METHOD; @@ -125,7 +125,7 @@ public abstract class JavaxWebSocketFrameHandlerFactory try { FILTER_RETURN_TYPE_METHOD = MethodHandles.lookup() - .findVirtual(JavaxWebSocketSession.class, "filterReturnType", MethodType.methodType(void.class, Object.class)); + .findVirtual(JakartaWebSocketSession.class, "filterReturnType", MethodType.methodType(void.class, Object.class)); } catch (Throwable e) { @@ -133,20 +133,20 @@ public abstract class JavaxWebSocketFrameHandlerFactory } } - protected final JavaxWebSocketContainer container; + protected final JakartaWebSocketContainer container; protected final InvokerUtils.ParamIdentifier paramIdentifier; - public JavaxWebSocketFrameHandlerFactory(JavaxWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier) + public JakartaWebSocketFrameHandlerFactory(JakartaWebSocketContainer container, InvokerUtils.ParamIdentifier paramIdentifier) { this.container = container; this.paramIdentifier = paramIdentifier == null ? InvokerUtils.PARAM_IDENTITY : paramIdentifier; } - public abstract JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig); + public abstract JakartaWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig); public abstract EndpointConfig newDefaultEndpointConfig(Class endpointClass, String path); - public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest) + public JakartaWebSocketFrameHandler newJakartaWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest) { Object endpoint; EndpointConfig config; @@ -164,7 +164,7 @@ public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointI config = newDefaultEndpointConfig(endpoint.getClass(), path); } - JavaxWebSocketFrameHandlerMetadata metadata = getMetadata(endpoint.getClass(), config); + JakartaWebSocketFrameHandlerMetadata metadata = getMetadata(endpoint.getClass(), config); if (metadata == null) return null; @@ -199,7 +199,7 @@ public JavaxWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointI errorHandle = InvokerUtils.bindTo(errorHandle, endpoint); pongHandle = InvokerUtils.bindTo(pongHandle, endpoint); - return new JavaxWebSocketFrameHandler( + return new JakartaWebSocketFrameHandler( container, endpoint, openHandle, closeHandle, errorHandle, @@ -315,7 +315,7 @@ else if (Byte.TYPE.isAssignableFrom(type)) } @SuppressWarnings("Duplicates") - public static MessageSink createMessageSink(JavaxWebSocketSession session, MessageMetadata msgMetadata) + public static MessageSink createMessageSink(JakartaWebSocketSession session, MessageMetadata msgMetadata) { if (msgMetadata == null) return null; @@ -354,7 +354,7 @@ public static MessageSink createMessageSink(JavaxWebSocketSession session, Messa } } - public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JavaxWebSocketSession session) + public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JakartaWebSocketSession session) { if (handle == null) return null; @@ -364,10 +364,10 @@ public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JavaxWebSo // Technique from https://stackoverflow.com/questions/48505787/methodhandle-with-general-non-void-return-filter - // Change the return type of the to be Object so it will match exact with JavaxWebSocketSession.filterReturnType(Object) + // Change the return type of the to be Object so it will match exact with JakartaWebSocketSession.filterReturnType(Object) handle = handle.asType(handle.type().changeReturnType(Object.class)); - // Filter the method return type to a call to JavaxWebSocketSession.filterReturnType() bound to this session + // Filter the method return type to a call to JakartaWebSocketSession.filterReturnType() bound to this session handle = MethodHandles.filterReturnValue(handle, FILTER_RETURN_TYPE_METHOD.bindTo(session)); return handle; @@ -385,30 +385,30 @@ private MethodHandle toMethodHandle(MethodHandles.Lookup lookup, Method method) } } - protected JavaxWebSocketFrameHandlerMetadata createEndpointMetadata(Class endpointClass, EndpointConfig endpointConfig) + protected JakartaWebSocketFrameHandlerMetadata createEndpointMetadata(Class endpointClass, EndpointConfig endpointConfig) { - JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig); + JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig); MethodHandles.Lookup lookup = getMethodHandleLookup(endpointClass); Method openMethod = ReflectUtils.findMethod(endpointClass, "onOpen", - javax.websocket.Session.class, javax.websocket.EndpointConfig.class); + jakarta.websocket.Session.class, jakarta.websocket.EndpointConfig.class); MethodHandle open = toMethodHandle(lookup, openMethod); metadata.setOpenHandler(open, openMethod); Method closeMethod = ReflectUtils.findMethod(endpointClass, "onClose", - javax.websocket.Session.class, javax.websocket.CloseReason.class); + jakarta.websocket.Session.class, jakarta.websocket.CloseReason.class); MethodHandle close = toMethodHandle(lookup, closeMethod); metadata.setCloseHandler(close, closeMethod); Method errorMethod = ReflectUtils.findMethod(endpointClass, "onError", - javax.websocket.Session.class, Throwable.class); + jakarta.websocket.Session.class, Throwable.class); MethodHandle error = toMethodHandle(lookup, errorMethod); metadata.setErrorHandler(error, errorMethod); return metadata; } - protected JavaxWebSocketFrameHandlerMetadata discoverJavaxFrameHandlerMetadata(Class endpointClass, JavaxWebSocketFrameHandlerMetadata metadata) + protected JakartaWebSocketFrameHandlerMetadata discoverJakartaFrameHandlerMetadata(Class endpointClass, JakartaWebSocketFrameHandlerMetadata metadata) { MethodHandles.Lookup lookup = getMethodHandleLookup(endpointClass); Method onmethod; @@ -486,7 +486,7 @@ protected JavaxWebSocketFrameHandlerMetadata discoverJavaxFrameHandlerMetadata(C return metadata; } - private boolean matchOnMessage(Method onMsg, JavaxWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata, + private boolean matchOnMessage(Method onMsg, JakartaWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata, Function getMethodHandle) { // Whole Text Message. @@ -580,7 +580,7 @@ private boolean matchOnMessage(Method onMsg, JavaxWebSocketFrameHandlerMetadata return false; } - private boolean matchDecoders(Method onMsg, JavaxWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata, + private boolean matchDecoders(Method onMsg, JakartaWebSocketFrameHandlerMetadata metadata, MessageMetadata msgMetadata, Function getMethodHandle) { // TODO: we should be able to get this information directly from the AvailableDecoders in the metadata. diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java index b5db28e9969d..d1a34e870073 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.lang.invoke.MethodHandle; -import javax.websocket.Decoder; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Decoder; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.eclipse.jetty.websocket.util.messages.MessageSink; -public class JavaxWebSocketFrameHandlerMetadata +public class JakartaWebSocketFrameHandlerMetadata { private static final String[] NO_VARIABLES = new String[0]; @@ -74,7 +74,7 @@ public class JavaxWebSocketFrameHandlerMetadata */ private UriTemplatePathSpec uriTemplatePathSpec; - public JavaxWebSocketFrameHandlerMetadata(EndpointConfig endpointConfig) + public JakartaWebSocketFrameHandlerMetadata(EndpointConfig endpointConfig) { this.endpointConfig = endpointConfig; this.availableDecoders = new AvailableDecoders(endpointConfig); diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java similarity index 84% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java index a0d85b7129c8..addf2f4f8189 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketPongMessage.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.nio.ByteBuffer; -import javax.websocket.PongMessage; +import jakarta.websocket.PongMessage; import org.eclipse.jetty.util.BufferUtil; -public class JavaxWebSocketPongMessage implements PongMessage +public class JakartaWebSocketPongMessage implements PongMessage { private final ByteBuffer data; - public JavaxWebSocketPongMessage(ByteBuffer buf) + public JakartaWebSocketPongMessage(ByteBuffer buf) { this.data = buf; } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java similarity index 94% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java index 82c23d3bb3ee..f5b9bc07a3f7 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.nio.ByteBuffer; import java.time.Duration; import java.util.concurrent.TimeUnit; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.SendHandler; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.SendHandler; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.FutureCallback; @@ -39,16 +39,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaxWebSocketRemoteEndpoint implements javax.websocket.RemoteEndpoint, OutgoingFrames +public class JakartaWebSocketRemoteEndpoint implements jakarta.websocket.RemoteEndpoint, OutgoingFrames { - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketRemoteEndpoint.class); - - protected final JavaxWebSocketSession session; + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketRemoteEndpoint.class); + protected final JakartaWebSocketSession session; private final CoreSession coreSession; protected boolean batch = false; protected byte messageType = -1; - protected JavaxWebSocketRemoteEndpoint(JavaxWebSocketSession session, CoreSession coreSession) + protected JakartaWebSocketRemoteEndpoint(JakartaWebSocketSession session, CoreSession coreSession) { this.session = session; this.coreSession = coreSession; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java similarity index 89% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java index 9cbe7d6056d6..79a2c4a4bd21 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.net.URI; @@ -30,20 +30,20 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.Extension; -import javax.websocket.MessageHandler; -import javax.websocket.RemoteEndpoint.Async; -import javax.websocket.RemoteEndpoint.Basic; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Extension; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.RemoteEndpoint.Async; +import jakarta.websocket.RemoteEndpoint.Basic; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.ExtensionConfig; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.util.ReflectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,13 +51,13 @@ /** * Client Session for the JSR. */ -public class JavaxWebSocketSession implements javax.websocket.Session +public class JakartaWebSocketSession implements jakarta.websocket.Session { - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketSession.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketSession.class); - private final JavaxWebSocketContainer container; + private final JakartaWebSocketContainer container; private final CoreSession coreSession; - private final JavaxWebSocketFrameHandler frameHandler; + private final JakartaWebSocketFrameHandler frameHandler; private final EndpointConfig config; private final AvailableDecoders availableDecoders; private final AvailableEncoders availableEncoders; @@ -65,13 +65,13 @@ public class JavaxWebSocketSession implements javax.websocket.Session private Map userProperties; private List negotiatedExtensions; - private JavaxWebSocketAsyncRemote asyncRemote; - private JavaxWebSocketBasicRemote basicRemote; + private JakartaWebSocketAsyncRemote asyncRemote; + private JakartaWebSocketBasicRemote basicRemote; - public JavaxWebSocketSession(JavaxWebSocketContainer container, - CoreSession coreSession, - JavaxWebSocketFrameHandler frameHandler, - EndpointConfig endpointConfig) + public JakartaWebSocketSession(JakartaWebSocketContainer container, + CoreSession coreSession, + JakartaWebSocketFrameHandler frameHandler, + EndpointConfig endpointConfig) { this.container = container; this.coreSession = coreSession; @@ -215,7 +215,7 @@ private long getBlockingTimeout() * * @param obj the return object */ - @SuppressWarnings("unused") // used by JavaxWebSocketFrameHandlerFactory via MethodHandle + @SuppressWarnings("unused") // used by Jakarta WebSocketFrameHandlerFactory via MethodHandle public void filterReturnType(Object obj) { if (obj != null) @@ -243,7 +243,7 @@ public Async getAsyncRemote() { if (asyncRemote == null) { - asyncRemote = new JavaxWebSocketAsyncRemote(this, coreSession); + asyncRemote = new JakartaWebSocketAsyncRemote(this, coreSession); } return asyncRemote; } @@ -259,7 +259,7 @@ public Basic getBasicRemote() { if (basicRemote == null) { - basicRemote = new JavaxWebSocketBasicRemote(this, coreSession); + basicRemote = new JakartaWebSocketBasicRemote(this, coreSession); } return basicRemote; } @@ -276,7 +276,7 @@ public WebSocketContainer getContainer() return this.container; } - public JavaxWebSocketContainer getContainerImpl() + public JakartaWebSocketContainer getContainerImpl() { return this.container; } @@ -296,7 +296,7 @@ public Object getEndpoint() return frameHandler.getEndpoint(); } - public JavaxWebSocketFrameHandler getFrameHandler() + public JakartaWebSocketFrameHandler getFrameHandler() { return frameHandler; } @@ -419,7 +419,7 @@ public List getNegotiatedExtensions() if ((negotiatedExtensions == null) && extensions != null) { - negotiatedExtensions = extensions.stream().map(JavaxWebSocketExtension::new).collect(Collectors.toList()); + negotiatedExtensions = extensions.stream().map(JakartaWebSocketExtension::new).collect(Collectors.toList()); } return negotiatedExtensions; } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java similarity index 75% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java index 6538fcd5a60a..f10d78a17165 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSessionListener.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; -public interface JavaxWebSocketSessionListener +public interface JakartaWebSocketSessionListener { - void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session); + void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session); - void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session); + void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session); } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java index cdda746079b5..86bb2f7c419d 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PathParamProvider.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.Map; /** - * Optional interface for custom {@link javax.websocket.EndpointConfig} implementations - * in Jetty to expose Path Param values used during the {@link JavaxWebSocketFrameHandler} + * Optional interface for custom {@link jakarta.websocket.EndpointConfig} implementations + * in Jetty to expose Path Param values used during the {@link JakartaWebSocketFrameHandler} * resolution of methods. *

- * Mostly a feature of the JSR356 Server implementation and its {@code @javax.websocket.server.PathParam} annotation. + * Mostly a feature of the JSR356 Server implementation and its {@code @jakarta.websocket.server.PathParam} annotation. *

*/ public interface PathParamProvider diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java similarity index 98% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java index 54c2bb2ddcb2..3d4e971c73e3 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PutListenerMap.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/PutListenerMap.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.Collection; import java.util.Map; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java index 467473cf1971..0a2f7bc6bc3e 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/RegisteredMessageHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class RegisteredMessageHandler { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java similarity index 91% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java index b55723920020..7e6238e3f12d 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SendHandlerCallback.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; - -import javax.websocket.SendHandler; -import javax.websocket.SendResult; +package org.eclipse.jetty.websocket.jakarta.common; +import jakarta.websocket.SendHandler; +import jakarta.websocket.SendResult; import org.eclipse.jetty.util.Callback; /** diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java index 66ef7a2ba531..9564e7e68761 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ServerEndpointConfigWrapper.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/ServerEndpointConfigWrapper.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.List; -import javax.websocket.Extension; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.Extension; +import jakarta.websocket.server.ServerEndpointConfig; public class ServerEndpointConfigWrapper extends EndpointConfigWrapper implements ServerEndpointConfig { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java similarity index 82% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java index 6010f9bae72e..6e17a3986e14 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SessionTracker.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java @@ -16,24 +16,24 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.util.Collections; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -import javax.websocket.CloseReason; -import javax.websocket.Session; +import jakarta.websocket.CloseReason; +import jakarta.websocket.Session; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SessionTracker extends AbstractLifeCycle implements JavaxWebSocketSessionListener +public class SessionTracker extends AbstractLifeCycle implements JakartaWebSocketSessionListener { private static final Logger LOG = LoggerFactory.getLogger(SessionTracker.class); - private CopyOnWriteArraySet sessions = new CopyOnWriteArraySet<>(); + private CopyOnWriteArraySet sessions = new CopyOnWriteArraySet<>(); public Set getSessions() { @@ -41,13 +41,13 @@ public Set getSessions() } @Override - public void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session) + public void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session) { sessions.add(session); } @Override - public void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session) + public void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session) { sessions.remove(session); } diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java similarity index 83% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java index 90de5c9c4923..f6c16579d37a 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.net.URI; import java.security.Principal; @@ -24,14 +24,14 @@ public interface UpgradeRequest { /** - * For {@link javax.websocket.Session#getUserPrincipal()} + * For {@link jakarta.websocket.Session#getUserPrincipal()} * * @return the User {@link Principal} present during the Upgrade Request */ Principal getUserPrincipal(); /** - * For obtaining {@link javax.websocket.server.PathParam} values from Request URI path + * For obtaining {@link jakarta.websocket.server.PathParam} values from Request URI path * * @return the request URI */ diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java similarity index 96% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java index 4ab2345d6695..328941279e62 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/UpgradeRequestAdapter.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.net.URI; import java.security.Principal; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java similarity index 87% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java index 3864b49153e8..fd52b0adf1b5 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AbstractDecoder.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; public abstract class AbstractDecoder implements Decoder { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java similarity index 97% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java index 51703c578245..dab553ef65e9 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.io.InputStream; import java.io.Reader; @@ -28,10 +28,10 @@ import java.util.NoSuchElementException; import java.util.Objects; import java.util.stream.Collectors; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; -import org.eclipse.jetty.websocket.javax.common.InitException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.InitException; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.eclipse.jetty.websocket.util.ReflectUtils; @@ -42,7 +42,7 @@ public static class RegisteredDecoder { // The user supplied Decoder class public final Class decoder; - // The javax.websocket.Decoder.* type (eg: Decoder.Binary, Decoder.BinaryStream, Decoder.Text, Decoder.TextStream) + // The jakarta.websocket.Decoder.* type (eg: Decoder.Binary, Decoder.BinaryStream, Decoder.Text, Decoder.TextStream) public final Class interfaceType; public final Class objectType; public final boolean primitive; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java similarity index 83% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java index 89e3f69ab443..cbdb8c95dd50 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/BooleanDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Boolean} decoder. + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Boolean} decoder. *

* Note: delegates to {@link Boolean#parseBoolean(String)} and will only support "true" and "false" as boolean values. */ diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java similarity index 89% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java index d1649fe58b16..918e506d5b3b 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteArrayDecoder.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.nio.ByteBuffer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; import org.eclipse.jetty.util.BufferUtil; public class ByteArrayDecoder extends AbstractDecoder implements Decoder.Binary diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java similarity index 89% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java index ca50a9ae52f6..889fed09aea2 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteBufferDecoder.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.nio.ByteBuffer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; public class ByteBufferDecoder extends AbstractDecoder implements Decoder.Binary { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java index 4ec723617391..e543dedeb071 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ByteDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Byte} decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Byte} decoder */ public class ByteDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java similarity index 84% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java index d5a4ed201b37..3d3b1da3c0b7 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/CharacterDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Character} decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Character} decoder */ public class CharacterDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java index 7f376a2f365f..7b5dbdd9d5d8 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/DoubleDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Double} to decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Double} to decoder */ public class DoubleDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java index e2719c2e7426..cd95b55dc325 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/FloatDecoder.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** * Default implementation of the Text Message to {@link Float} decoder diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java index 9051fcdd76a0..ced6929d15b3 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/InputStreamDecoder.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.io.IOException; import java.io.InputStream; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; public class InputStreamDecoder implements Decoder.BinaryStream { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java index f728dd7cc99f..36a046cd29e4 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/IntegerDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Integer} decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Integer} decoder */ public class IntegerDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java index 68bf205daa54..79962adc06c9 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/LongDecoder.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** * Default implementation of the Text Message to {@link Long} decoder diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java index f87edd84bf26..f121b071a934 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/PongMessageDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.nio.ByteBuffer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.PongMessage; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.PongMessage; import org.eclipse.jetty.util.BufferUtil; public class PongMessageDecoder extends AbstractDecoder implements Decoder.Binary diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java index fa685f1f705e..ae7d29fa97ba 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ReaderDecoder.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; import java.io.IOException; import java.io.Reader; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; public class ReaderDecoder implements Decoder.TextStream { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java index fd7a62f22d31..83589567e604 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/ShortDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link Short} decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link Short} decoder */ public class ShortDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java similarity index 82% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java index 5c4a9e85ef41..b7096fca520e 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/StringDecoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.decoders; +package org.eclipse.jetty.websocket.jakarta.common.decoders; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; /** - * Default implementation of the {@link javax.websocket.Decoder.Text} Message to {@link String} decoder + * Default implementation of the {@link jakarta.websocket.Decoder.Text} Message to {@link String} decoder */ public class StringDecoder extends AbstractDecoder implements Decoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java similarity index 87% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java index 3609b9467839..0732e8178173 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AbstractEncoder.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public abstract class AbstractEncoder implements Encoder { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java similarity index 98% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java index dac4741c4a94..ee6d222394d4 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; @@ -26,10 +26,10 @@ import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Collectors; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; -import org.eclipse.jetty.websocket.javax.common.InitException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.InitException; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.eclipse.jetty.websocket.util.ReflectUtils; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java index dd328eb7be1f..e50b95e521db 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/BooleanEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Boolean} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Boolean} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class BooleanEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java index 215705cbc561..25fbe774516c 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteArrayEncoder.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; import java.nio.ByteBuffer; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class ByteArrayEncoder implements Encoder.Binary { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java index 2a2208c77d67..1db71284710b 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteBufferEncoder.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; import java.nio.ByteBuffer; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class ByteBufferEncoder implements Encoder.Binary { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java index 095c8d5ce814..d1d4181ce5d2 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ByteEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Byte} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Byte} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class ByteEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java index 9453a825517d..d07e8a70dca7 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/CharacterEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Character} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Character} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class CharacterEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java index 229ed5a8c835..6edc3b13d75f 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/DoubleEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Double} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Double} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class DoubleEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java index 1a0d43b9bdf6..9f5c7ac7c8ec 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/EncodeFailedFuture.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.websocket.Encoder; + +import jakarta.websocket.Encoder; /** * A {@code Future<Void>} that is already failed as a result of an Encode error diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java index e0ce4c50570b..f5d4498eb9d9 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/FloatEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Float} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Float} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class FloatEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java index eb6d4c0cbd04..0437d0ac13cf 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/IntegerEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Integer} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Integer} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class IntegerEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java index 1f70b208d3f2..491e03641713 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/LongEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Long} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Long} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class LongEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java index d5b50e29578a..018bbbaa8297 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/ShortEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link Short} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link Short} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class ShortEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java similarity index 80% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java index 67e9e786f154..bd30f8cf4bbc 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/StringEncoder.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.encoders; +package org.eclipse.jetty.websocket.jakarta.common.encoders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; /** - * Default encoder for {@link String} to {@link javax.websocket.Encoder.Text} Message encoder + * Default encoder for {@link String} to {@link jakarta.websocket.Encoder.Text} Message encoder */ public class StringEncoder extends AbstractEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java similarity index 94% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java index dae52a2e1981..f7322c85b739 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.nio.ByteBuffer; -import javax.websocket.CloseReason; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.CloseReason; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.exception.CloseException; import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java index 653f35491be0..9ec3dba8fa0c 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.InputStream; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import javax.websocket.CloseReason; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.CloseReason; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.exception.CloseException; import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java index 1c6e195fbaae..2ba435a7401f 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedMessageSink.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; -import javax.websocket.Decoder; +import jakarta.websocket.Decoder; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java similarity index 94% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java index 69c6f3005d75..48ed9ceede53 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import javax.websocket.CloseReason; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.CloseReason; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.exception.CloseException; import org.eclipse.jetty.websocket.util.messages.MessageSink; diff --git a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java rename to jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java index 3955f14069f8..86c612f4bfbf 100644 --- a/jetty-websocket/websocket-javax-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java +++ b/jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.Reader; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import javax.websocket.CloseReason; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; +import jakarta.websocket.CloseReason; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.exception.CloseException; import org.eclipse.jetty.websocket.util.messages.MessageSink; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java similarity index 74% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java index f9990e41803a..2819216aa9d5 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractJakartaWebSocketFrameHandlerTest.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.HashMap; import java.util.Map; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.EndpointConfig; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.websocket.core.CoreSession; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -public abstract class AbstractJavaxWebSocketFrameHandlerTest +public abstract class AbstractJakartaWebSocketFrameHandlerTest { protected static DummyContainer container; @@ -52,7 +52,7 @@ public static void stopContainer() throws Exception protected EndpointConfig endpointConfig; protected CoreSession coreSession = new CoreSession.Empty(); - public AbstractJavaxWebSocketFrameHandlerTest() + public AbstractJakartaWebSocketFrameHandlerTest() { endpointConfig = ClientEndpointConfig.Builder.create().build(); encoders = new AvailableEncoders(endpointConfig); @@ -60,11 +60,11 @@ public AbstractJavaxWebSocketFrameHandlerTest() uriParams = new HashMap<>(); } - protected JavaxWebSocketFrameHandler newJavaxFrameHandler(Object websocket) + protected JakartaWebSocketFrameHandler newJakartaFrameHandler(Object websocket) { - JavaxWebSocketFrameHandlerFactory factory = container.getFrameHandlerFactory(); + JakartaWebSocketFrameHandlerFactory factory = container.getFrameHandlerFactory(); ConfiguredEndpoint endpoint = new ConfiguredEndpoint(websocket, endpointConfig); UpgradeRequest upgradeRequest = new UpgradeRequestAdapter(); - return factory.newJavaxWebSocketFrameHandler(endpoint, upgradeRequest); + return factory.newJakartaWebSocketFrameHandler(endpoint, upgradeRequest); } } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java similarity index 76% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java index e425420c99b9..59cc4bb7525a 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractSessionTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/AbstractSessionTest.java @@ -16,20 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; - -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; +package org.eclipse.jetty.websocket.jakarta.common; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; import org.eclipse.jetty.websocket.core.CoreSession; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; public abstract class AbstractSessionTest { - protected static JavaxWebSocketSession session; - protected static JavaxWebSocketContainer container; + protected static JakartaWebSocketSession session; + protected static JakartaWebSocketContainer container; @BeforeAll public static void initSession() throws Exception @@ -38,9 +37,9 @@ public static void initSession() throws Exception container.start(); Object websocketPojo = new DummyEndpoint(); UpgradeRequest upgradeRequest = new UpgradeRequestAdapter(); - JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest); + JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest); CoreSession coreSession = new CoreSession.Empty(); - session = new JavaxWebSocketSession(container, coreSession, frameHandler, container.getFrameHandlerFactory() + session = new JakartaWebSocketSession(container, coreSession, frameHandler, container.getFrameHandlerFactory() .newDefaultEndpointConfig(websocketPojo.getClass(), null)); } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java index e7e505859a9c..5414ff24e87a 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/Defaults.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/Defaults.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.concurrent.TimeUnit; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java similarity index 88% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java index ab0c3ae86269..72436c071011 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyContainer.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyContainer.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.net.URI; import java.util.concurrent.Executor; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.DeploymentException; -import javax.websocket.Endpoint; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.Session; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; @@ -33,9 +33,9 @@ /** * Dummy Container for testing. */ -public class DummyContainer extends JavaxWebSocketContainer +public class DummyContainer extends JakartaWebSocketContainer { - private final JavaxWebSocketFrameHandlerFactory frameHandlerFactory; + private final JakartaWebSocketFrameHandlerFactory frameHandlerFactory; private final QueuedThreadPool executor; public DummyContainer() @@ -122,7 +122,7 @@ public Executor getExecutor() } @Override - protected JavaxWebSocketFrameHandlerFactory getFrameHandlerFactory() + protected JakartaWebSocketFrameHandlerFactory getFrameHandlerFactory() { return frameHandlerFactory; } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java similarity index 63% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java index d7468d6a2d0a..0e48a81ae39e 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/DummyFrameHandlerFactory.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java @@ -16,18 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; - -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; +package org.eclipse.jetty.websocket.jakarta.common; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.websocket.util.InvokerUtils; -public class DummyFrameHandlerFactory extends JavaxWebSocketFrameHandlerFactory +public class DummyFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory { - public DummyFrameHandlerFactory(JavaxWebSocketContainer container) + public DummyFrameHandlerFactory(JakartaWebSocketContainer container) { super(container, InvokerUtils.PARAM_IDENTITY); } @@ -39,9 +38,9 @@ public EndpointConfig newDefaultEndpointConfig(Class endpointClass, String pa } @Override - public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) + public JakartaWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) { - if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass)) + if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass)) { return createEndpointMetadata((Class)endpointClass, endpointConfig); } @@ -51,7 +50,7 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, En return null; } - JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig); - return discoverJavaxFrameHandlerMetadata(endpointClass, metadata); + JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig); + return discoverJakartaFrameHandlerMetadata(endpointClass, metadata); } } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java index cf4b7dc9e758..44d00f78d005 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerBadSignaturesTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java @@ -16,15 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; - -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - +package org.eclipse.jetty.websocket.jakarta.common; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.junit.jupiter.api.Test; @@ -32,11 +31,11 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; -public class JavaxWebSocketFrameHandlerBadSignaturesTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerBadSignaturesTest extends AbstractJakartaWebSocketFrameHandlerTest { private void assertBadSocket(Object socket, String expectedString) throws Exception { - Exception e = assertThrows(InvalidSignatureException.class, () -> newJavaxFrameHandler(socket)); + Exception e = assertThrows(InvalidSignatureException.class, () -> newJakartaFrameHandler(socket)); assertThat(e.getMessage(), containsString(expectedString)); } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java similarity index 87% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java index 8abf58ad0c9e..622e34e711fb 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnCloseTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.Session; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; @@ -35,13 +35,13 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -public class JavaxWebSocketFrameHandlerOnCloseTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnCloseTest extends AbstractJakartaWebSocketFrameHandlerTest { private static final String EXPECTED_REASON = "CloseReason[1000,Normal]"; private void assertOnCloseInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // These invocations are the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); @@ -89,7 +89,7 @@ public void testInvokeCloseSession() throws Exception { assertOnCloseInvocation(new CloseSessionSocket(), allOf( - containsString("onClose(JavaxWebSocketSession@"), + containsString("onClose(JakartaWebSocketSession@"), containsString(CloseSessionSocket.class.getName()) )); } @@ -126,7 +126,7 @@ public void testInvokeCloseSessionReason() throws Exception { assertOnCloseInvocation(new CloseSessionReasonSocket(), allOf( - containsString("onClose(JavaxWebSocketSession@"), + containsString("onClose(JakartaWebSocketSession@"), containsString(CloseSessionReasonSocket.class.getName()) )); } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java similarity index 87% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java index 1b97ae0423dd..8022c45790fa 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnErrorTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnError; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.Session; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; @@ -32,13 +32,13 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -public class JavaxWebSocketFrameHandlerOnErrorTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnErrorTest extends AbstractJakartaWebSocketFrameHandlerTest { private static final String EXPECTED_THROWABLE = "java.lang.RuntimeException: From Testcase"; private void assertOnErrorInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // These invocations are the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); @@ -62,7 +62,7 @@ public void testInvokeErrorSessionThrowable() throws Exception { assertOnErrorInvocation(new ErrorSessionThrowableSocket(), allOf( - containsString("onError(JavaxWebSocketSession@"), + containsString("onError(JakartaWebSocketSession@"), containsString(ErrorSessionThrowableSocket.class.getName()), containsString(EXPECTED_THROWABLE) )); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java similarity index 84% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java index dc5b33aa2abd..4c111a671473 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java @@ -16,32 +16,32 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class JavaxWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJakartaWebSocketFrameHandlerTest { @SuppressWarnings("Duplicates") - private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception + private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java similarity index 88% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java index 2d05a5b3e8ef..6817c8ea7d4c 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageBinaryTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; @@ -40,11 +40,11 @@ import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertThrows; -public class JavaxWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJakartaWebSocketFrameHandlerTest { private void assertOnMessageInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); @@ -111,7 +111,7 @@ public void testInvokeMessageSession() throws Exception assertThrows(InvalidSignatureException.class, () -> assertOnMessageInvocation(new MessageSessionSocket(), allOf( - containsString("onMessage(JavaxWebSocketSession@"), + containsString("onMessage(JakartaWebSocketSession@"), containsString(MessageSessionSocket.class.getName()) )) ); @@ -132,7 +132,7 @@ public void testInvokeMessageSessionByteBuffer() throws Exception { assertOnMessageInvocation(new MessageSessionByteBufferSocket(), allOf( - containsString("onMessage(JavaxWebSocketSession@"), + containsString("onMessage(JakartaWebSocketSession@"), containsString(MessageSessionByteBufferSocket.class.getName()) )); } diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java similarity index 84% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java index 0c5bb1bf9a9f..8a6952f4405b 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java @@ -16,31 +16,31 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.io.IOException; import java.io.Reader; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJakartaWebSocketFrameHandlerTest { @SuppressWarnings("Duplicates") - private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception + private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function func) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java index ccb95e2674ea..b56f41db03fe 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnMessageTextTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; @@ -39,11 +39,11 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; -public class JavaxWebSocketFrameHandlerOnMessageTextTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnMessageTextTest extends AbstractJakartaWebSocketFrameHandlerTest { private void onText(TrackingSocket socket, String msg) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); @@ -133,7 +133,7 @@ public void testInvokeMessageSessionText() throws Exception { assertOnMessageInvocation(new MessageSessionTextSocket(), allOf( - containsString("onMessage(JavaxWebSocketSession@"), + containsString("onMessage(JakartaWebSocketSession@"), containsString(MessageSessionTextSocket.class.getName()), containsString(", Hello World)") )); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java similarity index 81% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java index 15fe26140c32..b3460151f7ef 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerOnOpenTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common; +package org.eclipse.jetty.websocket.jakarta.common; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.websocket.javax.common.sockets.TrackingSocket; +import org.eclipse.jetty.websocket.jakarta.common.sockets.TrackingSocket; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; @@ -32,11 +32,11 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -public class JavaxWebSocketFrameHandlerOnOpenTest extends AbstractJavaxWebSocketFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnOpenTest extends AbstractJakartaWebSocketFrameHandlerTest { private void assertOnOpenInvocation(TrackingSocket socket, Matcher eventMatcher) throws Exception { - JavaxWebSocketFrameHandler localEndpoint = newJavaxFrameHandler(socket); + JakartaWebSocketFrameHandler localEndpoint = newJakartaFrameHandler(socket); // This invocation is the same for all tests localEndpoint.onOpen(coreSession, Callback.NOOP); @@ -75,7 +75,7 @@ public void testInvokeOpenSession() throws Exception { assertOnOpenInvocation(new OpenSessionSocket(), allOf( - containsString("onOpen(JavaxWebSocketSession"), + containsString("onOpen(JakartaWebSocketSession"), containsString(OpenSessionSocket.class.getName()) )); } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java index b795e2412942..da166975853a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualDecoder.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.BufferUtil; /** diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java index decb7288d88d..8d4d5f1d2577 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/BadDualEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/BadDualEncoder.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; import java.io.IOException; import java.io.Writer; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Intentionally bad example of attempting to encode the same object for different message types. diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java index d8582ec1fe7d..4a3334f515fc 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/ExtDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/ExtDecoder.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; -import javax.websocket.Decoder; +import jakarta.websocket.Decoder; /** * Testing scenario of an extended Decoder interface diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java index 516a4f9e08a9..018a4a10cbcf 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/Fruit.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/Fruit.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; public class Fruit { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java index b64f2b583e4d..879b20556a82 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitBinaryEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitBinaryEncoder.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; import java.nio.ByteBuffer; import java.nio.charset.Charset; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.BufferUtil; public class FruitBinaryEncoder implements Encoder.Binary diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java index dc7b98bb6317..c4e11b3ec7a8 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitDecoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitDecoder.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.websocket.DecodeException; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.EndpointConfig; public class FruitDecoder implements ExtDecoder { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java index 7adbc45ffc20..5e36b0d442ee 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitTextEncoder.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/coders/tests/FruitTextEncoder.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.common.coders.tests; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class FruitTextEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java similarity index 91% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java index 5a24ae41dc69..1ef78c10be61 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/AbstractStringEndpoint.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/AbstractStringEndpoint.java @@ -16,19 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.endpoints; +package org.eclipse.jetty.websocket.jakarta.common.endpoints; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.websocket.CloseReason; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; import org.eclipse.jetty.websocket.core.CloseStatus; -import org.eclipse.jetty.websocket.javax.common.Defaults; +import org.eclipse.jetty.websocket.jakarta.common.Defaults; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java similarity index 84% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java index 3b34830b96ad..72b21760c3ea 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/DummyEndpoint.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/DummyEndpoint.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.endpoints; +package org.eclipse.jetty.websocket.jakarta.common.endpoints; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; public class DummyEndpoint extends Endpoint { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java index c4be71da3c3d..3eed503ac15b 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/endpoints/EchoStringEndpoint.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/endpoints/EchoStringEndpoint.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.endpoints; +package org.eclipse.jetty.websocket.jakarta.common.endpoints; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java index 770536d9ce51..869de66695aa 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/BaseMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/BaseMessageHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class BaseMessageHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java index 32f9bc222e91..648628d630d1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayPartialHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class ByteArrayPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java index efbd4a0b3572..6bee4ec72bd7 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteArrayWholeHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class ByteArrayWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java index f203e9a0cd9f..dcffa8412f7c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferPartialHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ByteBufferPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java index 85a2b34dcdd1..3e4c3b5b786c 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ByteBufferWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ByteBufferWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java index a266e5a5c1da..14b6c91d2e09 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ComboMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ComboMessageHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; /** * A particularly annoying type of MessageHandler. One defining 2 implementations. diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java index 980c649b2242..e68fb5b921a2 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ExtendedMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ExtendedMessageHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ExtendedMessageHandler extends BaseMessageHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java index 34c5af063b80..969900f190ca 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/InputStreamWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/InputStreamWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.io.InputStream; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class InputStreamWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java index f11558478558..83b6ad2f8d34 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/LongMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/LongMessageHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class LongMessageHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java index 18c7a194ec52..9ad4743541f2 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ReaderWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/ReaderWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; import java.io.Reader; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ReaderWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java index d614d282a1f9..61de0eede3e8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringPartialHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class StringPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java index c1c4c0103937..9ff715eadff3 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/handlers/StringWholeHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.common.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class StringWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java index e056e88b9f47..77c6ca93c286 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractMessageSinkTest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.util.function.Consumer; -import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; +import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest; public abstract class AbstractMessageSinkTest extends AbstractSessionTest { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java similarity index 95% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java index afa3f919c732..6f15de3c7263 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; import java.nio.ByteBuffer; @@ -26,14 +26,14 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; +import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java similarity index 97% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java index 1fbd4cf03d35..07818e0d8317 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.IOException; import java.io.InputStream; @@ -28,10 +28,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.Frame; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java similarity index 96% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java index f805aec78b58..dbbe23177fef 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.lang.invoke.MethodHandle; import java.text.ParseException; @@ -26,10 +26,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java similarity index 96% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java index d33952b6f942..7a59f8eedfcd 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.IOException; import java.io.Reader; @@ -28,10 +28,10 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java similarity index 98% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java index eb8a9fb32fec..6ef6f082120e 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/InputStreamMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -35,7 +35,7 @@ import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.AbstractSessionTest; +import org.eclipse.jetty.websocket.jakarta.common.AbstractSessionTest; import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java new file mode 100644 index 000000000000..d8ccdedf55a2 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/MessageWriterTest.java @@ -0,0 +1,185 @@ +// +// ======================================================================== +// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. +// +// This program and the accompanying materials are made available under +// the terms of the Eclipse Public License 2.0 which is available at +// https://www.eclipse.org/legal/epl-2.0 +// +// This Source Code may also be made available under the following +// Secondary Licenses when the conditions for such availability set +// forth in the Eclipse Public License, v. 2.0 are satisfied: +// the Apache License v2.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.jakarta.common.messages; + +import java.io.IOException; +import java.util.Arrays; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jetty.io.ByteBufferPool; +import org.eclipse.jetty.io.MappedByteBufferPool; +import org.eclipse.jetty.util.Callback; +import org.eclipse.jetty.util.Utf8StringBuilder; +import org.eclipse.jetty.websocket.core.CoreSession; +import org.eclipse.jetty.websocket.core.Frame; +import org.eclipse.jetty.websocket.core.OpCode; +import org.eclipse.jetty.websocket.util.messages.MessageWriter; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class MessageWriterTest +{ + private ByteBufferPool bufferPool = new MappedByteBufferPool(); + + @Test + public void testSingleByteArray512b() throws IOException, InterruptedException + { + FrameCapture capture = new FrameCapture(); + capture.setOutputBufferSize(1024); + try (MessageWriter writer = new MessageWriter(capture, bufferPool)) + { + char[] cbuf = new char[512]; + Arrays.fill(cbuf, 'x'); + writer.write(cbuf); + } + + Frame frame = capture.frames.poll(1, TimeUnit.SECONDS); + assertThat("Frame[0].opcode", frame.getOpCode(), is(OpCode.TEXT)); + assertThat("Frame[0].payloadLength", frame.getPayloadLength(), is(512)); + assertThat("Frame[0].fin", frame.isFin(), is(true)); + } + + @Test + public void testSingleByteArray2k() throws IOException, InterruptedException + { + FrameCapture capture = new FrameCapture(); + capture.setOutputBufferSize(1024); + try (MessageWriter writer = new MessageWriter(capture, bufferPool)) + { + char[] cbuf = new char[1024 * 2]; + Arrays.fill(cbuf, 'x'); + writer.write(cbuf); + } + + Frame frame = capture.frames.poll(1, TimeUnit.SECONDS); + assertThat("Frame[0].opcode", frame.getOpCode(), is(OpCode.TEXT)); + assertThat("Frame[0].payloadLength", frame.getPayloadLength(), is(1024)); + assertThat("Frame[0].fin", frame.isFin(), is(false)); + + frame = capture.frames.poll(1, TimeUnit.SECONDS); + assertThat("Frame[1].opcode", frame.getOpCode(), is(OpCode.CONTINUATION)); + assertThat("Frame[1].payloadLength", frame.getPayloadLength(), is(1024)); + assertThat("Frame[1].fin", frame.isFin(), is(true)); + } + + @Test + public void testMultipleByteArrays2k() throws IOException, InterruptedException + { + final int testSize = 1024 * 2; + final int outputSize = 80; + final int writerBufferSize = 100; + + FrameCapture capture = new FrameCapture(); + capture.setOutputBufferSize(writerBufferSize); + try (MessageWriter writer = new MessageWriter(capture, bufferPool)) + { + char[] cbuf = new char[testSize]; + Arrays.fill(cbuf, 'x'); + int remaining = cbuf.length; + int offset = 0; + while (remaining > 0) + { + int length = Math.min(remaining, outputSize); + writer.write(cbuf, offset, length); + remaining -= outputSize; + } + } + + Frame frame; + + int remaining = testSize; + byte expectedOpCode = OpCode.TEXT; + int i = 0; + + while (remaining > 0) + { + frame = capture.frames.poll(1, TimeUnit.SECONDS); + String prefix = String.format("Frame[%d](op=%d,%sfin)", (i++), frame.getOpCode(), frame.isFin() ? "" : "!"); + assertThat(prefix + ".opcode", frame.getOpCode(), is(expectedOpCode)); + int expectedSize = Math.min(remaining, writerBufferSize); + assertThat(prefix + ".payloadLength", frame.getPayloadLength(), is(expectedSize)); + boolean expectedFin = (remaining < outputSize); + assertThat(prefix + ".fin", frame.isFin(), is(expectedFin)); + + expectedOpCode = OpCode.CONTINUATION; + remaining -= frame.getPayloadLength(); + } + } + + @Test + public void testSlightLargerThenBufferSize() throws IOException, InterruptedException + { + final int writerBufferSize = 64 * 1024; + final int testSize = writerBufferSize + 16; + + WholeMessageCapture capture = new WholeMessageCapture(); + capture.setOutputBufferSize(writerBufferSize); + try (MessageWriter writer = new MessageWriter(capture, bufferPool)) + { + char[] cbuf = new char[testSize]; + Arrays.fill(cbuf, 'x'); + for (int i = 0; i < testSize; i++) + { + writer.write(cbuf[i]); + } + } + + String message = capture.messages.poll(1, TimeUnit.SECONDS); + assertThat("Message[0].length", message.length(), is(testSize)); + } + + public static class FrameCapture extends CoreSession.Empty + { + public BlockingQueue frames = new LinkedBlockingQueue<>(); + + @Override + public void sendFrame(Frame frame, Callback callback, boolean batch) + { + frames.offer(Frame.copy(frame)); + callback.succeeded(); + } + } + + public static class WholeMessageCapture extends CoreSession.Empty + { + public BlockingQueue messages = new LinkedBlockingQueue<>(); + + private Utf8StringBuilder activeMessage; + + @Override + public void sendFrame(Frame frame, Callback callback, boolean batch) + { + if (frame.getOpCode() == OpCode.TEXT) + activeMessage = new Utf8StringBuilder(); + + activeMessage.append(frame.getPayload().slice()); + + if (frame.isFin()) + { + messages.offer(activeMessage.toString()); + activeMessage = null; + } + callback.succeeded(); + } + } +} diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java similarity index 98% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java index 3bab792edcaa..ae30b0bc5b96 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSinkTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/messages/ReaderMessageSinkTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.messages; +package org.eclipse.jetty.websocket.jakarta.common.messages; import java.io.IOException; import java.io.Reader; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java similarity index 93% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java index f06a72b356e3..e30c6fb4e21a 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/sockets/TrackingSocket.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/sockets/TrackingSocket.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.sockets; +package org.eclipse.jetty.websocket.jakarta.common.sockets; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.CloseReason; + +import jakarta.websocket.CloseReason; public abstract class TrackingSocket { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java index d9b5b131afe2..3df57547ae8b 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsStaticParamsTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsStaticParamsTest.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.util; +package org.eclipse.jetty.websocket.jakarta.common.util; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import javax.websocket.Session; +import jakarta.websocket.Session; import org.eclipse.jetty.util.annotation.Name; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.util.InvokerUtils; import org.eclipse.jetty.websocket.util.ReflectUtils; import org.junit.jupiter.api.Test; @@ -82,7 +82,7 @@ public void testOnlyParamString() throws Throwable templateValues.put("fruit", "pear"); // Bind the static values, in same order as declared - methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); + methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); // Assign an instance to call. Foo foo = new Foo(); @@ -111,7 +111,7 @@ public void testOnlyParamInt() throws Throwable templateValues.put("count", "2222"); // Bind the static values for the variables, in same order as the variables were declared - methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); + methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); // Assign an instance to call. Foo foo = new Foo(); @@ -142,7 +142,7 @@ public void testLabeledParamStringInt() throws Throwable templateValues.put("count", "444"); // Bind the static values for the variables, in same order as the variables were declared - methodHandle = JavaxWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); + methodHandle = JakartaWebSocketFrameHandlerFactory.bindTemplateVariables(methodHandle, namedVariables, templateValues); // Assign an instance to call. Foo foo = new Foo(); diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java similarity index 99% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java index 54c6e51fa7ff..9e8855148e7a 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtilsTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/InvokerUtilsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.util; +package org.eclipse.jetty.websocket.jakarta.common.util; import java.io.File; import java.lang.invoke.MethodHandle; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java similarity index 96% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java index 9ecb0e20cf16..4916da531f26 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/NameParamIdentifier.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/NameParamIdentifier.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.util; +package org.eclipse.jetty.websocket.jakarta.common.util; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java similarity index 98% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java rename to jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java index 9d7026334d93..8b7edc711f9b 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtilsTest.java +++ b/jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/util/ReflectUtilsTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.util; +package org.eclipse.jetty.websocket.jakarta.common.util; import org.eclipse.jetty.websocket.util.ReflectUtils; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-common/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/websocket-javax-common/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jakarta-common/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-ben.txt similarity index 100% rename from jetty-websocket/websocket-javax-common/src/test/resources/quotes-ben.txt rename to jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-ben.txt diff --git a/jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-twain.txt similarity index 100% rename from jetty-websocket/websocket-javax-common/src/test/resources/quotes-twain.txt rename to jetty-websocket/websocket-jakarta-common/src/test/resources/quotes-twain.txt diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-jakarta-server/pom.xml similarity index 73% rename from jetty-websocket/websocket-javax-server/pom.xml rename to jetty-websocket/websocket-jakarta-server/pom.xml index adee75692f2d..d85204cf39c7 100644 --- a/jetty-websocket/websocket-javax-server/pom.xml +++ b/jetty-websocket/websocket-jakarta-server/pom.xml @@ -7,17 +7,17 @@ 4.0.0 - websocket-javax-server - Jetty :: Websocket :: javax.websocket :: Server + websocket-jakarta-server + Jetty :: Websocket :: jakarta.websocket :: Server - ${project.groupId}.javax.server + ${project.groupId}.jakarta.server org.eclipse.jetty.websocket - websocket-javax-client + websocket-jakarta-client ${project.version} @@ -32,7 +32,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.slf4j @@ -56,7 +56,7 @@ maven-surefire-plugin - @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.javax.server/org.eclipse.jetty.websocket.javax.server.examples=org.eclipse.jetty.websocket.javax.common --add-reads org.eclipse.jetty.websocket.javax.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server + @{argLine} ${jetty.surefire.argLine} --add-exports org.eclipse.jetty.websocket.jakarta.server/org.eclipse.jetty.websocket.jakarta.server.examples=org.eclipse.jetty.websocket.jakarta.common --add-reads org.eclipse.jetty.websocket.jakarta.server=org.eclipse.jetty.security --add-reads org.eclipse.jetty.websocket.jakarta.common=org.eclipse.jetty.websocket.jakarta.server @@ -71,13 +71,13 @@ - javax.websocket.server Implementation + jakarta.websocket.server Implementation - org.eclipse.jetty.websocket.javax.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.websocket.jakarta.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional - osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=javax.websocket.server.ServerEndpointConfig$Configurator + osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.webapp.Configuration,osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=jakarta.websocket.server.ServerEndpointConfig$Configurator diff --git a/jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod b/jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod new file mode 100644 index 000000000000..aebcc17ec655 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod @@ -0,0 +1,22 @@ +DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html + +[description] +Enable jakarta.websocket for deployed web applications. + +[tags] +websocket + +[depend] +client +annotations + +[lib] +lib/websocket/websocket-core-${jetty.version}.jar +lib/websocket/websocket-servlet-${jetty.version}.jar +lib/websocket/jetty-jakarta-websocket-api-*.jar +lib/websocket/websocket-jakarta-*.jar + +[jpms] +# The implementation needs to access method handles in +# classes that are in the web application classloader. +add-reads: org.eclipse.jetty.websocket.jakarta.common=ALL-UNNAMED diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java similarity index 59% rename from jetty-websocket/websocket-javax-server/src/main/java/module-info.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java index 6d52f89a355b..8f179eb3cf1a 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/module-info.java @@ -17,24 +17,25 @@ // import javax.servlet.ServletContainerInitializer; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; -module org.eclipse.jetty.websocket.javax.server +module org.eclipse.jetty.websocket.jakarta.server { - exports org.eclipse.jetty.websocket.javax.server.config; + exports org.eclipse.jetty.websocket.jakarta.server.config; requires transitive org.eclipse.jetty.webapp; - requires transitive org.eclipse.jetty.websocket.javax.client; - requires org.eclipse.jetty.websocket.javax.common; + requires org.eclipse.jetty.websocket.jakarta.common; + requires transitive org.eclipse.jetty.websocket.jakarta.client; + requires org.eclipse.jetty.websocket.servlet; requires org.slf4j; - provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer; + provides ServletContainerInitializer with JakartaWebSocketServletContainerInitializer; provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator; - provides Configuration with JavaxWebSocketConfiguration; + provides Configuration with JakartaWebSocketConfiguration; } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java similarity index 89% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java index 0c33c0ad38d2..e86bd0b6e68e 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/ContainerDefaultConfigurator.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/ContainerDefaultConfigurator.java @@ -16,16 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.config; +package org.eclipse.jetty.websocket.jakarta.server.config; import java.util.ArrayList; import java.util.List; import java.util.ServiceLoader; -import javax.websocket.Extension; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; -import javax.websocket.server.ServerEndpointConfig.Configurator; + +import jakarta.websocket.Extension; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig.Configurator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,7 @@ /** * The "Container Default Configurator" per the JSR-356 spec. * - * @see ServiceLoader behavior of {@link javax.websocket.server.ServerEndpointConfig.Configurator} + * @see ServiceLoader behavior of {@link jakarta.websocket.server.ServerEndpointConfig.Configurator} */ public final class ContainerDefaultConfigurator extends Configurator { @@ -42,7 +43,7 @@ public final class ContainerDefaultConfigurator extends Configurator /** * Default Constructor required, as - * javax.websocket.server.ServerEndpointConfig$Configurator.fetchContainerDefaultConfigurator() + * jakarta.websocket.server.ServerEndpointConfig$Configurator.fetchContainerDefaultConfigurator() * will be the one that instantiates this class in most cases. */ public ContainerDefaultConfigurator() diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java similarity index 78% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java index 4c66e39abed2..8d48fd4eb9e5 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.config; +package org.eclipse.jetty.websocket.jakarta.server.config; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.FragmentConfiguration; @@ -31,15 +31,15 @@ * be able to see the org.eclipse.jetty.websocket package. *

*/ -public class JavaxWebSocketConfiguration extends AbstractConfiguration +public class JakartaWebSocketConfiguration extends AbstractConfiguration { - public JavaxWebSocketConfiguration() + public JakartaWebSocketConfiguration() { addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class); addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName()); protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter - protectAndExpose("org.eclipse.jetty.websocket.javax.server.config."); - protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider"); - hide("org.eclipse.jetty.websocket.javax.server.internal"); + protectAndExpose("org.eclipse.jetty.websocket.jakarta.server.config."); + protectAndExpose("org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider"); + hide("org.eclipse.jetty.websocket.jakarta.server.internal"); } } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java similarity index 87% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java index 797c9c1f1a8e..d083e9267136 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.config; +package org.eclipse.jetty.websocket.jakarta.server.config; import java.util.HashSet; import java.util.Set; @@ -24,37 +24,37 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.annotation.HandlesTypes; -import javax.websocket.DeploymentException; -import javax.websocket.Endpoint; -import javax.websocket.server.ServerApplicationConfig; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Endpoint; +import jakarta.websocket.server.ServerApplicationConfig; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.listener.ContainerInitializer; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.thread.ThreadClassLoaderScope; import org.eclipse.jetty.websocket.core.WebSocketComponents; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer; import org.eclipse.jetty.websocket.servlet.WebSocketMapping; import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @HandlesTypes({ServerApplicationConfig.class, ServerEndpoint.class, Endpoint.class}) -public class JavaxWebSocketServletContainerInitializer implements ServletContainerInitializer +public class JakartaWebSocketServletContainerInitializer implements ServletContainerInitializer { /** * The ServletContext attribute key name for the - * ServerContainer per javax.websocket spec 1.0 final section 6.4 Programmatic Server Deployment + * ServerContainer per jakarta.websocket spec 1.0 final section 6.4 Programmatic Server Deployment */ - public static final String ATTR_JAVAX_SERVER_CONTAINER = javax.websocket.server.ServerContainer.class.getName(); + public static final String ATTR_JAKARTA_SERVER_CONTAINER = jakarta.websocket.server.ServerContainer.class.getName(); - public static final String ENABLE_KEY = "org.eclipse.jetty.websocket.javax"; - public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.javax.HttpClient"; - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketServletContainerInitializer.class); + public static final String ENABLE_KEY = "org.eclipse.jetty.websocket.jakarta"; + public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.jakarta.HttpClient"; + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketServletContainerInitializer.class); /** * Test a ServletContext for {@code init-param} or {@code attribute} at {@code keyName} for @@ -95,7 +95,7 @@ public interface Configurator } /** - * Configure the {@link ServletContextHandler} to call {@link JavaxWebSocketServletContainerInitializer#onStartup(Set, ServletContext)} + * Configure the {@link ServletContextHandler} to call {@link JakartaWebSocketServletContainerInitializer#onStartup(Set, ServletContext)} * during the {@link ServletContext} initialization phase. * * @param context the context to add listener to @@ -109,10 +109,10 @@ public static void configure(ServletContextHandler context, Configurator configu // the initialization phase is over. (important for this SCI to function) context.getServletContext().setExtendedListenerTypes(true); - context.addEventListener(ContainerInitializer.asContextListener(new JavaxWebSocketServletContainerInitializer()) + context.addEventListener(ContainerInitializer.asContextListener(new JakartaWebSocketServletContainerInitializer()) .afterStartup((servletContext) -> { - JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(servletContext); + JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer(servletContext); if (configurator != null) { try @@ -142,7 +142,7 @@ public static void configure(ServletContextHandler context, Configurator configu *

* There is no enablement check here, and no automatic deployment of endpoints at this point * in time. It merely sets up the {@link ServletContext} so with the basics needed to start - * configuring for `javax.websocket.server` based endpoints. + * configuring for `jakarta.websocket.server` based endpoints. *

* * @param context the context to work with @@ -150,13 +150,13 @@ public static void configure(ServletContextHandler context, Configurator configu */ private static ServerContainer initialize(ServletContextHandler context) { - JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(context.getServletContext()); + JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer(context.getServletContext()); if (serverContainer == null) { WebSocketComponents components = WebSocketComponents.ensureWebSocketComponents(context.getServletContext()); FilterHolder filterHolder = WebSocketUpgradeFilter.ensureFilter(context.getServletContext()); WebSocketMapping mapping = WebSocketMapping.ensureMapping(context.getServletContext(), WebSocketMapping.DEFAULT_KEY); - serverContainer = JavaxWebSocketServerContainer.ensureContainer(context.getServletContext()); + serverContainer = JakartaWebSocketServerContainer.ensureContainer(context.getServletContext()); if (LOG.isDebugEnabled()) LOG.debug("configureContext {} {} {} {}", mapping, components, filterHolder, serverContainer); @@ -175,11 +175,11 @@ public void onStartup(Set> c, ServletContext context) throws ServletExc if (!websocketEnabled) { - LOG.info("Javax Websocket is disabled by configuration for context {}", context.getContextPath()); + LOG.info("Jakarta Websocket is disabled by configuration for context {}", context.getContextPath()); return; } - ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Javax WebSocket SCI"); + ServletContextHandler servletContextHandler = ServletContextHandler.getServletContextHandler(context, "Jakarta WebSocket SCI"); ServerContainer container = initialize(servletContextHandler); try (ThreadClassLoaderScope scope = new ThreadClassLoaderScope(context.getClassLoader())) diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java similarity index 83% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java index 23af02b05753..004dcb4b6e31 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/AnnotatedServerEndpointConfig.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java @@ -16,29 +16,29 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.util.ArrayList; import java.util.List; -import javax.websocket.Decoder; -import javax.websocket.DeploymentException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper; -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; +import jakarta.websocket.Decoder; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper; +import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator; public class AnnotatedServerEndpointConfig extends ServerEndpointConfigWrapper { - public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Class endpointClass, ServerEndpoint anno) throws DeploymentException + public AnnotatedServerEndpointConfig(JakartaWebSocketContainer containerScope, Class endpointClass, ServerEndpoint anno) throws DeploymentException { this(containerScope, endpointClass, anno, null); } - public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Class endpointClass, ServerEndpoint anno, EndpointConfig baseConfig) throws DeploymentException + public AnnotatedServerEndpointConfig(JakartaWebSocketContainer containerScope, Class endpointClass, ServerEndpoint anno, EndpointConfig baseConfig) throws DeploymentException { // Provided Base EndpointConfig. ServerEndpointConfig baseServerConfig = null; @@ -79,7 +79,7 @@ public AnnotatedServerEndpointConfig(JavaxWebSocketContainer containerScope, Cla ServerEndpointConfig.Configurator rawConfigurator = getConfigurator(baseServerConfig, anno); ServerEndpointConfig.Configurator configurator = containerScope.getObjectFactory().decorate(rawConfigurator); - // Build a ServerEndpointConfig with the Javax API builder to wrap. + // Build a ServerEndpointConfig with the Jakarta API builder to wrap. ServerEndpointConfig endpointConfig = ServerEndpointConfig.Builder.create(endpointClass, path) .configurator(configurator) .encoders(encoders) diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java similarity index 82% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java index 1ced906e6d24..c441fefd0ff0 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/BasicServerEndpointConfig.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/BasicServerEndpointConfig.java @@ -16,12 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; -import javax.websocket.server.ServerEndpointConfig; - -import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper; -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper; +import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator; public class BasicServerEndpointConfig extends ServerEndpointConfigWrapper { diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java similarity index 81% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java index 9b4d4d559393..43595d9c69df 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxServerUpgradeRequest.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaServerUpgradeRequest.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.net.URI; import java.security.Principal; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; -public class JavaxServerUpgradeRequest implements UpgradeRequest +public class JakartaServerUpgradeRequest implements UpgradeRequest { private final ServletUpgradeRequest servletRequest; - public JavaxServerUpgradeRequest(ServletUpgradeRequest servletRequest) + public JakartaServerUpgradeRequest(ServletUpgradeRequest servletRequest) { this.servletRequest = servletRequest; } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java similarity index 84% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java index de98982caac1..90703e482db7 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketCreator.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketCreator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.io.IOException; import java.util.ArrayList; @@ -24,36 +24,37 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.websocket.Extension; -import javax.websocket.Extension.Parameter; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.Extension; +import jakarta.websocket.Extension.Parameter; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; -import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtension; -import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper; +import org.eclipse.jetty.websocket.jakarta.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketExtension; +import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class JavaxWebSocketCreator implements WebSocketCreator +public class JakartaWebSocketCreator implements WebSocketCreator { - public static final String PROP_REMOTE_ADDRESS = "javax.websocket.endpoint.remoteAddress"; - public static final String PROP_LOCAL_ADDRESS = "javax.websocket.endpoint.localAddress"; - public static final String PROP_LOCALES = "javax.websocket.upgrade.locales"; - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketCreator.class); - private final JavaxWebSocketContainer containerScope; + public static final String PROP_REMOTE_ADDRESS = "jakarta.websocket.endpoint.remoteAddress"; + public static final String PROP_LOCAL_ADDRESS = "jakarta.websocket.endpoint.localAddress"; + public static final String PROP_LOCALES = "jakarta.websocket.upgrade.locales"; + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketCreator.class); + private final JakartaWebSocketContainer containerScope; + private final ServerEndpointConfig baseConfig; private final WebSocketExtensionRegistry extensionRegistry; - public JavaxWebSocketCreator(JavaxWebSocketContainer containerScope, ServerEndpointConfig config, WebSocketExtensionRegistry extensionRegistry) + public JakartaWebSocketCreator(JakartaWebSocketContainer containerScope, ServerEndpointConfig config, WebSocketExtensionRegistry extensionRegistry) { this.containerScope = containerScope; this.baseConfig = config; @@ -119,12 +120,12 @@ public Map getUserProperties() List installedExtensions = new ArrayList<>(); for (String extName : extensionRegistry.getAvailableExtensions().keySet()) { - installedExtensions.add(new JavaxWebSocketExtension(extName)); + installedExtensions.add(new JakartaWebSocketExtension(extName)); } List requestedExts = new ArrayList<>(); for (ExtensionConfig reqCfg : req.getExtensions()) { - requestedExts.add(new JavaxWebSocketExtension(reqCfg)); + requestedExts.add(new JakartaWebSocketExtension(reqCfg)); } List usedExtensions = configurator.getNegotiatedExtensions(installedExtensions, requestedExts); List configs = new ArrayList<>(); @@ -182,7 +183,7 @@ public boolean equals(Object o) if (o == null || getClass() != o.getClass()) return false; - JavaxWebSocketCreator that = (JavaxWebSocketCreator)o; + JakartaWebSocketCreator that = (JakartaWebSocketCreator)o; return baseConfig != null ? baseConfig.equals(that.baseConfig) : that.baseConfig == null; } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java similarity index 75% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java index 5f7bd46f9966..540b7ad8bdc7 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executor; import java.util.function.Function; import javax.servlet.ServletContext; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; @@ -37,30 +37,32 @@ import org.eclipse.jetty.websocket.core.WebSocketComponents; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.exception.WebSocketException; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; + import org.eclipse.jetty.websocket.servlet.WebSocketMapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @ManagedObject("JSR356 Server Container") -public class JavaxWebSocketServerContainer extends JavaxWebSocketClientContainer implements javax.websocket.server.ServerContainer, LifeCycle.Listener +public class JakartaWebSocketServerContainer extends JakartaWebSocketClientContainer implements jakarta.websocket.server.ServerContainer, LifeCycle.Listener { - public static final String JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE = javax.websocket.server.ServerContainer.class.getName(); - private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketServerContainer.class); - public static JavaxWebSocketServerContainer getContainer(ServletContext servletContext) + public static final String JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE = jakarta.websocket.server.ServerContainer.class.getName(); + private static final Logger LOG = LoggerFactory.getLogger(JakartaWebSocketServerContainer.class); + + public static JakartaWebSocketServerContainer getContainer(ServletContext servletContext) { - return (JavaxWebSocketServerContainer)servletContext.getAttribute(JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE); + return (JakartaWebSocketServerContainer)servletContext.getAttribute(JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE); } - public static JavaxWebSocketServerContainer ensureContainer(ServletContext servletContext) + public static JakartaWebSocketServerContainer ensureContainer(ServletContext servletContext) { - ContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Javax Websocket"); + ContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Jakarta Websocket"); if (contextHandler.getServer() == null) throw new IllegalStateException("Server has not been set on the ServletContextHandler"); - JavaxWebSocketServerContainer container = getContainer(servletContext); + JakartaWebSocketServerContainer container = getContainer(servletContext); if (container == null) { Function coreClientSupplier = (wsComponents) -> @@ -69,9 +71,9 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl if (coreClient == null) { // Find Pre-Existing (Shared?) HttpClient and/or executor - HttpClient httpClient = (HttpClient)servletContext.getAttribute(JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE); + HttpClient httpClient = (HttpClient)servletContext.getAttribute(JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE); if (httpClient == null) - httpClient = (HttpClient)contextHandler.getServer().getAttribute(JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE); + httpClient = (HttpClient)contextHandler.getServer().getAttribute(JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE); Executor executor = httpClient == null ? null : httpClient.getExecutor(); if (executor == null) @@ -84,7 +86,7 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl // create the core client coreClient = new WebSocketCoreClient(httpClient, wsComponents); - coreClient.getHttpClient().setName("Javax-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); + coreClient.getHttpClient().setName("Jakarta-WebSocketClient@" + Integer.toHexString(coreClient.getHttpClient().hashCode())); if (executor != null && httpClient == null) coreClient.getHttpClient().setExecutor(executor); servletContext.setAttribute(WebSocketCoreClient.WEBSOCKET_CORECLIENT_ATTRIBUTE, coreClient); @@ -93,59 +95,59 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl }; // Create the Jetty ServerContainer implementation - container = new JavaxWebSocketServerContainer( + container = new JakartaWebSocketServerContainer( WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY), WebSocketComponents.ensureWebSocketComponents(servletContext), coreClientSupplier); contextHandler.addManaged(container); contextHandler.addEventListener(container); } - // Store a reference to the ServerContainer per - javax.websocket spec 1.0 final - section 6.4: Programmatic Server Deployment - servletContext.setAttribute(JAVAX_WEBSOCKET_CONTAINER_ATTRIBUTE, container); + // Store a reference to the ServerContainer per - jakarta.websocket spec 1.0 final - section 6.4: Programmatic Server Deployment + servletContext.setAttribute(JAKARTA_WEBSOCKET_CONTAINER_ATTRIBUTE, container); return container; } private final WebSocketMapping webSocketMapping; - private final JavaxWebSocketServerFrameHandlerFactory frameHandlerFactory; + private final JakartaWebSocketServerFrameHandlerFactory frameHandlerFactory; private List> deferredEndpointClasses; private List deferredEndpointConfigs; /** - * Main entry point for {@link JavaxWebSocketServletContainerInitializer}. + * Main entry point for {@link JakartaWebSocketServletContainerInitializer}. * * @param webSocketMapping the {@link WebSocketMapping} that this container belongs to */ - public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping) + public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping) { this(webSocketMapping, new WebSocketComponents()); } - public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components) + public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components) { super(components); this.webSocketMapping = webSocketMapping; - this.frameHandlerFactory = new JavaxWebSocketServerFrameHandlerFactory(this); + this.frameHandlerFactory = new JakartaWebSocketServerFrameHandlerFactory(this); } /** - * Main entry point for {@link JavaxWebSocketServletContainerInitializer}. + * Main entry point for {@link JakartaWebSocketServletContainerInitializer}. * * @param webSocketMapping the {@link WebSocketMapping} that this container belongs to * @param components the {@link WebSocketComponents} instance to use * @param coreClientSupplier the supplier of the {@link WebSocketCoreClient} instance to use */ - public JavaxWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components, Function coreClientSupplier) + public JakartaWebSocketServerContainer(WebSocketMapping webSocketMapping, WebSocketComponents components, Function coreClientSupplier) { super(components, coreClientSupplier); this.webSocketMapping = webSocketMapping; - this.frameHandlerFactory = new JavaxWebSocketServerFrameHandlerFactory(this); + this.frameHandlerFactory = new JakartaWebSocketServerFrameHandlerFactory(this); } @Override public void lifeCycleStopping(LifeCycle context) { ContextHandler contextHandler = (ContextHandler)context; - JavaxWebSocketServerContainer container = contextHandler.getBean(JavaxWebSocketServerContainer.class); + JakartaWebSocketServerContainer container = contextHandler.getBean(JakartaWebSocketServerContainer.class); if (container == this) { contextHandler.removeBean(container); @@ -154,7 +156,7 @@ public void lifeCycleStopping(LifeCycle context) } @Override - public JavaxWebSocketServerFrameHandlerFactory getFrameHandlerFactory() + public JakartaWebSocketServerFrameHandlerFactory getFrameHandlerFactory() { return frameHandlerFactory; } @@ -228,7 +230,7 @@ private void addEndpointMapping(ServerEndpointConfig config) throws WebSocketExc { frameHandlerFactory.getMetadata(config.getEndpointClass(), config); - JavaxWebSocketCreator creator = new JavaxWebSocketCreator(this, config, getExtensionRegistry()); + JakartaWebSocketCreator creator = new JakartaWebSocketCreator(this, config, getExtensionRegistry()); PathSpec pathSpec = new UriTemplatePathSpec(config.getPath()); webSocketMapping.addMapping(pathSpec, creator, frameHandlerFactory, defaultCustomizer); diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java similarity index 60% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java index a31ea1741e60..1e00a09b5247 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerFrameHandlerFactory.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java @@ -16,32 +16,32 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; - -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.server.ServerEndpoint; +package org.eclipse.jetty.websocket.jakarta.server.internal; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.websocket.core.FrameHandler; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientFrameHandlerFactory; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata; + +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerMetadata; import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; -public class JavaxWebSocketServerFrameHandlerFactory extends JavaxWebSocketClientFrameHandlerFactory implements FrameHandlerFactory +public class JakartaWebSocketServerFrameHandlerFactory extends JakartaWebSocketClientFrameHandlerFactory implements FrameHandlerFactory { - public JavaxWebSocketServerFrameHandlerFactory(JavaxWebSocketContainer container) + public JakartaWebSocketServerFrameHandlerFactory(JakartaWebSocketContainer container) { super(container, new PathParamIdentifier()); } @Override - public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) + public JakartaWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, EndpointConfig endpointConfig) { - if (javax.websocket.Endpoint.class.isAssignableFrom(endpointClass)) + if (jakarta.websocket.Endpoint.class.isAssignableFrom(endpointClass)) { return createEndpointMetadata((Class)endpointClass, endpointConfig); } @@ -53,14 +53,14 @@ public JavaxWebSocketFrameHandlerMetadata getMetadata(Class endpointClass, En } UriTemplatePathSpec templatePathSpec = new UriTemplatePathSpec(anno.value()); - JavaxWebSocketFrameHandlerMetadata metadata = new JavaxWebSocketFrameHandlerMetadata(endpointConfig); + JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig); metadata.setUriTemplatePathSpec(templatePathSpec); - return discoverJavaxFrameHandlerMetadata(endpointClass, metadata); + return discoverJakartaFrameHandlerMetadata(endpointClass, metadata); } @Override public FrameHandler newFrameHandler(Object websocketPojo, ServletUpgradeRequest upgradeRequest, ServletUpgradeResponse upgradeResponse) { - return newJavaxWebSocketFrameHandler(websocketPojo, new JavaxServerUpgradeRequest(upgradeRequest)); + return newJakartaWebSocketFrameHandler(websocketPojo, new JakartaServerUpgradeRequest(upgradeRequest)); } } diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java similarity index 94% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java index be31158e1f2f..57e0736fe1b8 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeRequest.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeRequest.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.net.URI; import java.security.Principal; import java.util.List; import java.util.Map; -import javax.websocket.server.HandshakeRequest; +import jakarta.websocket.server.HandshakeRequest; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java similarity index 93% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java index 8e25272dc36f..5e39ca783177 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JsrHandshakeResponse.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JsrHandshakeResponse.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.websocket.HandshakeResponse; +import jakarta.websocket.HandshakeResponse; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; public class JsrHandshakeResponse implements HandshakeResponse diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java similarity index 89% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java index 3b26056b2cc3..72fef23fb620 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamIdentifier.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamIdentifier.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import javax.websocket.server.PathParam; +import jakarta.websocket.server.PathParam; import org.eclipse.jetty.websocket.util.InvokerUtils; /** - * Method argument identifier for {@link javax.websocket.server.PathParam} annotations. + * Method argument identifier for {@link jakarta.websocket.server.PathParam} annotations. */ @SuppressWarnings("unused") public class PathParamIdentifier implements InvokerUtils.ParamIdentifier diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java similarity index 82% rename from jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java rename to jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java index 4ae75ecac3fd..a9a17565de94 100644 --- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/PathParamServerEndpointConfig.java +++ b/jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/PathParamServerEndpointConfig.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.internal; +package org.eclipse.jetty.websocket.jakarta.server.internal; import java.util.HashMap; import java.util.Map; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.websocket.javax.common.PathParamProvider; -import org.eclipse.jetty.websocket.javax.common.ServerEndpointConfigWrapper; +import org.eclipse.jetty.websocket.jakarta.common.PathParamProvider; +import org.eclipse.jetty.websocket.jakarta.common.ServerEndpointConfigWrapper; /** - * Make {@link javax.websocket.server.PathParam} information from the incoming request available + * Make {@link jakarta.websocket.server.PathParam} information from the incoming request available * on {@link ServerEndpointConfig} */ public class PathParamServerEndpointConfig extends ServerEndpointConfigWrapper implements PathParamProvider diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator new file mode 100644 index 000000000000..5aa231d3daf2 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/jakarta.websocket.server.ServerEndpointConfig$Configurator @@ -0,0 +1 @@ +org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator \ No newline at end of file diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer new file mode 100644 index 000000000000..853f5f7e634a --- /dev/null +++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer @@ -0,0 +1 @@ +org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer \ No newline at end of file diff --git a/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration new file mode 100644 index 000000000000..ca9fc63f1449 --- /dev/null +++ b/jetty-websocket/websocket-jakarta-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration @@ -0,0 +1 @@ +org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration \ No newline at end of file diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java similarity index 87% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java index ddccb106bd4e..21362bbf0350 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserConfigurator.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.browser; +package org.eclipse.jetty.websocket.jakarta.server.browser; import java.util.Collections; import java.util.List; -import javax.websocket.Extension; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.Extension; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.http.QuotedCSV; public class JsrBrowserConfigurator extends ServerEndpointConfig.Configurator diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java similarity index 94% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java index 230660402393..abae836f3439 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserDebugTool.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.browser; +package org.eclipse.jetty.websocket.jakarta.server.browser; import java.io.IOException; import java.net.URISyntaxException; @@ -31,7 +31,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,7 +98,7 @@ private void setupServer(int port) throws URISyntaxException, IOException holder.setInitParameter("dirAllowed", "true"); server.setHandler(context); - JavaxWebSocketServletContainerInitializer.configure(context, + JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, container) -> container.addEndpoint(JsrBrowserSocket.class)); LOG.info("{} setup on port {}", this.getClass().getName(), port); diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java similarity index 94% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java index 4cbe0f0e343e..fc64f66b0e77 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/browser/JsrBrowserSocket.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.browser; +package org.eclipse.jetty.websocket.jakarta.server.browser; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -24,14 +24,14 @@ import java.util.Locale; import java.util.Random; import java.util.Set; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint.Async; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint.Async; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -111,7 +111,7 @@ public void onMessage(String message) { case "info": { - writeMessage("Using javax.websocket"); + writeMessage("Using jakarta.websocket"); if (StringUtil.isBlank(userAgent)) { writeMessage("Client has no User-Agent"); diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java similarity index 84% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java index 808905039837..abcf5f14e442 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; import javax.servlet.http.HttpSession; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; public class GetHttpSessionConfigurator extends ServerEndpointConfig.Configurator { diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java index 15daea9f5cdf..faa5463e8820 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java @@ -16,15 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; import java.io.IOException; import javax.servlet.http.HttpSession; -import javax.websocket.EndpointConfig; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class) public class GetHttpSessionSocket diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java similarity index 87% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java index d633f2f26be2..6507d01f5866 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedConfigurator.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; import java.security.Principal; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; public class MyAuthedConfigurator extends ServerEndpointConfig.Configurator { diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java index a2b6396d19ee..fcc9288c225d 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/MyAuthedSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/secured/socket", configurator = MyAuthedConfigurator.class) public class MyAuthedSocket diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java index d5d86e451ec2..a03c5843ae44 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/StreamingEchoSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; import java.io.IOException; import java.io.Reader; import java.io.Writer; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.IO; @ServerEndpoint("/echo") diff --git a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java similarity index 91% rename from jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java rename to jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java index 22c96ca9772e..939654e639b8 100644 --- a/jetty-websocket/websocket-javax-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/WebSocketServerExamplesTest.java +++ b/jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/WebSocketServerExamplesTest.java @@ -16,22 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.server.examples; +package org.eclipse.jetty.websocket.jakarta.server.examples; import java.net.URI; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -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 jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; @@ -43,7 +43,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Credential; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -106,7 +106,7 @@ public static void setup() throws Exception _context.setSecurityHandler(getSecurityHandler("user", "password", "testRealm")); _server.setHandler(_context); - JavaxWebSocketServletContainerInitializer.configure(_context, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(_context, (context, container) -> { container.addEndpoint(MyAuthedSocket.class); container.addEndpoint(StreamingEchoSocket.class); diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties similarity index 86% rename from jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties index 67577df43756..8abb410b86d0 100644 --- a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-logging.properties +++ b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-logging.properties @@ -7,4 +7,4 @@ # org.eclipse.jetty.websocket.common.WebSocketSession.LEVEL=DEBUG ### Show state changes on BrowserDebugTool # -- LEAVE THIS AT DEBUG LEVEL -- -org.eclipse.jetty.websocket.javax.server.browser.LEVEL=DEBUG +org.eclipse.jetty.websocket.jakarta.server.browser.LEVEL=DEBUG diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/websocket-javax-server/src/test/resources/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/index.html similarity index 100% rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/index.html rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/index.html diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/main.css similarity index 100% rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/main.css rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/main.css diff --git a/jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js b/jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/websocket.js similarity index 100% rename from jetty-websocket/websocket-javax-server/src/test/resources/jsr-browser-debug-tool/websocket.js rename to jetty-websocket/websocket-jakarta-server/src/test/resources/jsr-browser-debug-tool/websocket.js diff --git a/jetty-websocket/websocket-javax-tests/fuzzingclient.json b/jetty-websocket/websocket-jakarta-tests/fuzzingclient.json similarity index 100% rename from jetty-websocket/websocket-javax-tests/fuzzingclient.json rename to jetty-websocket/websocket-jakarta-tests/fuzzingclient.json diff --git a/jetty-websocket/websocket-javax-tests/fuzzingserver.json b/jetty-websocket/websocket-jakarta-tests/fuzzingserver.json similarity index 100% rename from jetty-websocket/websocket-javax-tests/fuzzingserver.json rename to jetty-websocket/websocket-jakarta-tests/fuzzingserver.json diff --git a/jetty-websocket/websocket-javax-tests/pom.xml b/jetty-websocket/websocket-jakarta-tests/pom.xml similarity index 80% rename from jetty-websocket/websocket-javax-tests/pom.xml rename to jetty-websocket/websocket-jakarta-tests/pom.xml index a64e6eb3f026..913051e97ec7 100644 --- a/jetty-websocket/websocket-javax-tests/pom.xml +++ b/jetty-websocket/websocket-jakarta-tests/pom.xml @@ -7,11 +7,11 @@ 4.0.0 - websocket-javax-tests - Jetty :: Websocket :: javax.websocket :: Tests + websocket-jakarta-tests + Jetty :: Websocket :: jakarta.websocket :: Tests - ${project.groupId}.javax.tests + ${project.groupId}.jakarta.tests @@ -21,12 +21,12 @@ org.eclipse.jetty.websocket - websocket-javax-client + websocket-jakarta-client ${project.version} org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} @@ -36,7 +36,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.eclipse.jetty @@ -82,9 +82,9 @@ - javax.websocket Integration Tests + jakarta.websocket Integration Tests - org.eclipse.jetty.websocket.javax.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + org.eclipse.jetty.websocket.jakarta.tests.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java index 4977927474ec..2fe1f39abddc 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BadFrame.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BadFrame.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java index b215249b0aec..0734f3f8be12 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/BiConsumerServiceServlet.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/BiConsumerServiceServlet.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.util.function.BiConsumer; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java index 3924b2a65528..d0064957da68 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CompletableFutureMethodHandle.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CompletableFutureMethodHandle.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java index f9704788735a..f9da059f75b0 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/CoreServer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/CoreServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.net.URI; @@ -38,8 +38,8 @@ import org.eclipse.jetty.websocket.core.server.Negotiation; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameEcho; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.WholeMessageEcho; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameEcho; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.WholeMessageEcho; public class CoreServer extends ContainerLifeCycle { diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java similarity index 97% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java index 48c01adf8931..89b7e55fdec9 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DataUtils.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DataUtils.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java index 96d92d56e90c..321a6d27762a 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/DummyEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/DummyEndpoint.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; public class DummyEndpoint extends Endpoint { diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java index a69db90ba456..5b990c7c93d3 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/EventSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/EventSocket.java @@ -16,22 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.BlockingArrayQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java similarity index 97% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java index d6b0bbee06e2..27d039914ea5 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/FunctionMethod.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/FunctionMethod.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java similarity index 99% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java index d6a2056d0754..d0337e0a8494 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Fuzzer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Fuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java similarity index 99% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java index 44053df8719f..f3f098638be4 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalFuzzer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalFuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java index 01170fd2a8bf..0f11b64e1257 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/LocalServer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.net.URI; import java.util.Map; import java.util.function.BiConsumer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.io.ByteBufferPool; @@ -46,11 +46,11 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.core.internal.Parser; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSessionListener; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSessionListener; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerFrameHandlerFactory; import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory; import org.eclipse.jetty.websocket.servlet.WebSocketCreator; import org.eclipse.jetty.websocket.servlet.WebSocketServlet; @@ -174,8 +174,8 @@ protected Handler createRootHandler(Server server) throws Exception { servletContextHandler = new ServletContextHandler(server, "/", true, false); servletContextHandler.setContextPath("/"); - JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, (context, container) -> - ((JavaxWebSocketServerContainer)container).addSessionListener(trackingListener)); + JakartaWebSocketServletContainerInitializer.configure(servletContextHandler, (context, container) -> + ((JakartaWebSocketServerContainer)container).addSessionListener(trackingListener)); configureServletContextHandler(servletContextHandler); return servletContextHandler; } @@ -263,7 +263,7 @@ public void registerWebSocket(String urlPattern, WebSocketCreator creator) { ServletHolder holder = new ServletHolder(new WebSocketServlet() { - JavaxWebSocketServerFrameHandlerFactory factory = new JavaxWebSocketServerFrameHandlerFactory(JavaxWebSocketServerContainer.ensureContainer(getServletContext())); + JakartaWebSocketServerFrameHandlerFactory factory = new JakartaWebSocketServerFrameHandlerFactory(JakartaWebSocketServerContainer.ensureContainer(getServletContext())); @Override public void configure(WebSocketServletFactory factory) @@ -281,12 +281,12 @@ protected FrameHandlerFactory getFactory() servletContextHandler.addServlet(holder, urlPattern); } - public JavaxWebSocketServerContainer getServerContainer() + public JakartaWebSocketServerContainer getServerContainer() { if (!servletContextHandler.isRunning()) throw new IllegalStateException("Cannot access ServerContainer when ServletContextHandler isn't running"); - return JavaxWebSocketServerContainer.getContainer(servletContextHandler.getServletContext()); + return JakartaWebSocketServerContainer.getContainer(servletContextHandler.getServletContext()); } public Server getServer() @@ -299,29 +299,29 @@ public TrackingListener getTrackingListener() return trackingListener; } - public static class TrackingListener implements JavaxWebSocketSessionListener + public static class TrackingListener implements JakartaWebSocketSessionListener { - private BlockingArrayQueue openedSessions = new BlockingArrayQueue<>(); - private BlockingArrayQueue closedSessions = new BlockingArrayQueue<>(); + private BlockingArrayQueue openedSessions = new BlockingArrayQueue<>(); + private BlockingArrayQueue closedSessions = new BlockingArrayQueue<>(); @Override - public void onJavaxWebSocketSessionOpened(JavaxWebSocketSession session) + public void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session) { openedSessions.offer(session); } @Override - public void onJavaxWebSocketSessionClosed(JavaxWebSocketSession session) + public void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session) { closedSessions.offer(session); } - public BlockingArrayQueue getOpenedSessions() + public BlockingArrayQueue getOpenedSessions() { return openedSessions; } - public BlockingArrayQueue getClosedSessions() + public BlockingArrayQueue getClosedSessions() { return closedSessions; } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java index a39b53db179a..9538da57b070 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/MessageType.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/MessageType.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; public enum MessageType { diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java similarity index 99% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java index a82972a61a74..644d5356ea7c 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/NetworkFuzzer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/NetworkFuzzer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.net.URI; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java similarity index 97% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java index 61c261c8aae2..d874e620f0ce 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/ParserCapture.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/ParserCapture.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java index b22fb0390ac2..1293d86233f0 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/RawFrameBuilder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/RawFrameBuilder.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java similarity index 68% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java index 14ad0e426daf..2303578d0854 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/SessionMatchers.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/SessionMatchers.java @@ -16,23 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; -import javax.websocket.MessageHandler; - -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerType; -import org.eclipse.jetty.websocket.javax.tests.matchers.IsMessageHandlerTypeRegistered; +import jakarta.websocket.MessageHandler; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.tests.matchers.IsMessageHandlerType; +import org.eclipse.jetty.websocket.jakarta.tests.matchers.IsMessageHandlerTypeRegistered; import org.hamcrest.Matcher; public final class SessionMatchers { - public static Matcher isMessageHandlerTypeRegistered(MessageType messageType) + public static Matcher isMessageHandlerTypeRegistered(MessageType messageType) { return IsMessageHandlerTypeRegistered.isMessageHandlerTypeRegistered(messageType); } - public static Matcher isMessageHandlerType(JavaxWebSocketSession session, MessageType messageType) + public static Matcher isMessageHandlerType(JakartaWebSocketSession session, MessageType messageType) { return IsMessageHandlerType.isMessageHandlerType(session, messageType); } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java index 4841866690e8..6b24d423f126 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Sha1Sum.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Sha1Sum.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.File; import java.io.IOException; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java similarity index 95% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java index dae5eff1799b..cb677cdc3236 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/Timeouts.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/Timeouts.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.util.concurrent.TimeUnit; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java index d02b876655cc..0fadd6c31473 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UnitGenerator.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UnitGenerator.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java index b60d67a996a5..442a79d9cf2f 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/UpgradeUtils.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/UpgradeUtils.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.util.Map; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java index c0825c90383a..fdd8afad5790 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEndpointTracker.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEndpointTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; @@ -24,11 +24,11 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.websocket.CloseReason; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; +import jakarta.websocket.CloseReason; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; import org.hamcrest.Matcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java similarity index 95% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java index 4f80e889d646..23d2a1743d3a 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSEventTracker.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSEventTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; @@ -24,13 +24,13 @@ import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.hamcrest.Matcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java index 92a9fa0913b7..70a9d1dc46a5 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSServer.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.File; import java.io.IOException; @@ -34,7 +34,8 @@ import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.resource.PathResource; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketConfiguration; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,9 +44,9 @@ import static org.hamcrest.Matchers.notNullValue; /** - * Utility to build out exploded directory WebApps, in the /target/tests/ directory, for testing out servers that use javax.websocket endpoints. + * Utility to build out exploded directory WebApps, in the /target/tests/ directory, for testing out servers that use jakarta.websocket endpoints. *

- * This is particularly useful when the WebSocket endpoints are discovered via the javax.websocket annotation scanning. + * This is particularly useful when the WebSocket endpoints are discovered via the jakarta.websocket annotation scanning. */ public class WSServer extends LocalServer implements LocalFuzzer.Provider { @@ -125,8 +126,8 @@ public WebAppContext createWebAppContext() throws IOException WebAppContext context = new WebAppContext(); context.setContextPath(this.contextPath); context.setBaseResource(new PathResource(this.contextDir)); - context.setAttribute("org.eclipse.jetty.websocket.javax", Boolean.TRUE); - context.addConfiguration(new JavaxWebSocketConfiguration()); + context.setAttribute("org.eclipse.jetty.websocket.jakarta", Boolean.TRUE); + context.addConfiguration(new JakartaWebSocketConfiguration()); return context; } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSURI.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSURI.java index ddb5bfedfc78..a2cfed89c67d 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSURI.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/WSURI.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.net.URI; import java.net.URISyntaxException; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameEcho.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameEcho.java index 313d5e540eda..d5c93ef700ac 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameEcho.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameEcho.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.framehandlers; +package org.eclipse.jetty.websocket.jakarta.tests.framehandlers; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameHandlerTracker.java similarity index 97% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameHandlerTracker.java index 3326b58f979e..03349b40c180 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/FrameHandlerTracker.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/FrameHandlerTracker.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.framehandlers; +package org.eclipse.jetty.websocket.jakarta.tests.framehandlers; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/StaticText.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/StaticText.java index f135c3a44d89..d5e8b183d144 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/StaticText.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/StaticText.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.framehandlers; +package org.eclipse.jetty.websocket.jakarta.tests.framehandlers; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.MessageHandler; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/WholeMessageEcho.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/WholeMessageEcho.java index 12a4d31fcf1e..4ae47d9e363e 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/framehandlers/WholeMessageEcho.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/framehandlers/WholeMessageEcho.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.framehandlers; +package org.eclipse.jetty.websocket.jakarta.tests.framehandlers; import java.nio.ByteBuffer; diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerType.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerType.java index 325d5fd71a1e..c5c1afb2a54c 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerType.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerType.java @@ -16,25 +16,24 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.matchers; +package org.eclipse.jetty.websocket.jakarta.tests.matchers; -import javax.websocket.Decoder; -import javax.websocket.MessageHandler; -import javax.websocket.PongMessage; - -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.tests.MessageType; +import jakarta.websocket.Decoder; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.tests.MessageType; import org.eclipse.jetty.websocket.util.ReflectUtils; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; public class IsMessageHandlerType extends TypeSafeMatcher { - private final JavaxWebSocketSession session; + private final JakartaWebSocketSession session; private final MessageType expectedType; - public IsMessageHandlerType(JavaxWebSocketSession session, MessageType expectedType) + public IsMessageHandlerType(JakartaWebSocketSession session, MessageType expectedType) { this.session = session; this.expectedType = expectedType; @@ -99,7 +98,7 @@ else if (MessageHandler.Partial.class.isAssignableFrom(handlerClass)) } } - public static IsMessageHandlerType isMessageHandlerType(JavaxWebSocketSession session, MessageType messageType) + public static IsMessageHandlerType isMessageHandlerType(JakartaWebSocketSession session, MessageType messageType) { return new IsMessageHandlerType(session, messageType); } diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerTypeRegistered.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java rename to jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerTypeRegistered.java index 4b89d83771f5..1d274d58bf71 100644 --- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/matchers/IsMessageHandlerTypeRegistered.java +++ b/jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/matchers/IsMessageHandlerTypeRegistered.java @@ -16,21 +16,21 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.matchers; +package org.eclipse.jetty.websocket.jakarta.tests.matchers; import java.util.Map; -import javax.websocket.Decoder; -import javax.websocket.MessageHandler; -import javax.websocket.PongMessage; - -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.common.RegisteredMessageHandler; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.tests.MessageType; + +import jakarta.websocket.Decoder; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.common.RegisteredMessageHandler; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.tests.MessageType; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -public class IsMessageHandlerTypeRegistered extends TypeSafeMatcher +public class IsMessageHandlerTypeRegistered extends TypeSafeMatcher { private final MessageType expectedType; @@ -47,7 +47,7 @@ public void describeTo(Description description) } @Override - protected boolean matchesSafely(JavaxWebSocketSession session) + protected boolean matchesSafely(JakartaWebSocketSession session) { Map handlerMap = session.getFrameHandler().getMessageHandlerMap(); @@ -96,7 +96,7 @@ protected boolean matchesSafely(JavaxWebSocketSession session) } @Override - protected void describeMismatchSafely(JavaxWebSocketSession session, Description mismatchDescription) + protected void describeMismatchSafely(JakartaWebSocketSession session, Description mismatchDescription) { Map handlerMap = session.getFrameHandler().getMessageHandlerMap(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java index b3690ba6d3af..e0c971bcdc80 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpoint.java @@ -18,12 +18,12 @@ package com.acme.websocket; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo") public class BasicEchoEndpoint extends Endpoint implements MessageHandler.Whole diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java index e6f3e1c8042e..9cfebeaf7d93 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java @@ -20,8 +20,9 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerEndpointConfig; public class BasicEchoEndpointConfigContextListener implements ServletContextListener { @@ -34,8 +35,8 @@ public void contextDestroyed(ServletContextEvent sce) @Override public void contextInitialized(ServletContextEvent sce) { - javax.websocket.server.ServerContainer container = (javax.websocket.server.ServerContainer)sce.getServletContext() - .getAttribute(javax.websocket.server.ServerContainer.class.getName()); + jakarta.websocket.server.ServerContainer container = (jakarta.websocket.server.ServerContainer)sce.getServletContext() + .getAttribute(jakarta.websocket.server.ServerContainer.class.getName()); if (container == null) throw new IllegalStateException("No Websocket ServerContainer in " + sce.getServletContext()); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java index 3d0f19b131be..d0bf857777d7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java @@ -20,12 +20,13 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; /** - * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically via config + * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config */ public class IdleTimeoutContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java index 4d8208aa967a..6dfc10998db0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenEndpoint.java @@ -18,10 +18,10 @@ package com.acme.websocket; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; public class IdleTimeoutOnOpenEndpoint extends Endpoint implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java index e6a10fb53739..03ffa80ddca9 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutOnOpenSocket.java @@ -18,12 +18,11 @@ package com.acme.websocket; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; - +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException; @ServerEndpoint(value = "/idle-onopen-socket") diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java index 0794a7ad477b..ce7cf6108e68 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java @@ -20,7 +20,8 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.server.ServerContainer; + +import jakarta.websocket.server.ServerContainer; public class LargeEchoContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java index a9a72a97b1bd..76183a4f240f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoDefaultSocket.java @@ -18,14 +18,14 @@ package com.acme.websocket; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/large") public class LargeEchoDefaultSocket { @OnMessage - public void echo(javax.websocket.Session session, String msg) + public void echo(jakarta.websocket.Session session, String msg) { // reply with echo session.getAsyncRemote().sendText(msg); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java index 5e9d4de2aa0f..481525b1a97b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/OnOpenIdleTimeoutEndpoint.java @@ -18,10 +18,10 @@ package com.acme.websocket; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; public class OnOpenIdleTimeoutEndpoint extends Endpoint implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongContextListener.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongContextListener.java index 48010b4e91ff..9e1c4ccb25c1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongContextListener.java @@ -20,11 +20,12 @@ import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.DeploymentException; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; public class PongContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java index 6be7d2a05227..805bd0c3b942 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongMessageEndpoint.java @@ -21,11 +21,12 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.PongMessage; -import javax.websocket.Session; + +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; +import jakarta.websocket.Session; public class PongMessageEndpoint extends Endpoint implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongSocket.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongSocket.java index ca5455ed18ed..ccf4394ac633 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/com/acme/websocket/PongSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongSocket.java @@ -21,12 +21,13 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import javax.websocket.EndpointConfig; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.PongMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.PongMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/pong-socket", configurator = PongContextListener.Config.class) public class PongSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxOnCloseTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JakartaOnCloseTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxOnCloseTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JakartaOnCloseTest.java index 138266304c82..8c7d6ef9a0bd 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JavaxOnCloseTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JakartaOnCloseTest.java @@ -16,26 +16,27 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.net.URI; import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.CloseReason.CloseCodes; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; + +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,13 +49,14 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertTrue; -public class JavaxOnCloseTest +public class JakartaOnCloseTest { + private static BlockingArrayQueue serverEndpoints = new BlockingArrayQueue<>(); private Server server; private ServerConnector connector; - private JavaxWebSocketClientContainer client = new JavaxWebSocketClientContainer(); + private JakartaWebSocketClientContainer client = new JakartaWebSocketClientContainer(); @ServerEndpoint("/") public static class OnCloseEndpoint extends EventSocket @@ -118,7 +120,7 @@ public void start() throws Exception contextHandler.setContextPath("/"); server.setHandler(contextHandler); - JavaxWebSocketServletContainerInitializer.configure(contextHandler, ((servletContext, container) -> + JakartaWebSocketServletContainerInitializer.configure(contextHandler, ((servletContext, container) -> container.addEndpoint(OnCloseEndpoint.class))); client.start(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JettySpecificConfigTest.java similarity index 77% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JettySpecificConfigTest.java index 4c48c3508987..36eda0af3dff 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/JettySpecificConfigTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/JettySpecificConfigTest.java @@ -16,30 +16,30 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.HandshakeResponse; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.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.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -65,9 +65,9 @@ public void onOpen(Session session) { this.session = session; - JavaxWebSocketSession javaxSession = (JavaxWebSocketSession)session; - assertThat(javaxSession.getCoreSession().isAutoFragment(), is(false)); - assertThat(javaxSession.getCoreSession().getMaxFrameSize(), is(1337L)); + JakartaWebSocketSession jakartaSession = (JakartaWebSocketSession)session; + assertThat(jakartaSession.getCoreSession().isAutoFragment(), is(false)); + assertThat(jakartaSession.getCoreSession().getMaxFrameSize(), is(1337L)); } @OnMessage @@ -112,7 +112,7 @@ public void startContainer() throws Exception _context.setContextPath("/"); _server.setHandler(_context); - JavaxWebSocketServletContainerInitializer.configure(_context, + JakartaWebSocketServletContainerInitializer.configure(_context, (context, container) -> container.addEndpoint(EchoParamSocket.class)); _server.start(); @@ -134,9 +134,9 @@ public void testJettySpecificConfig() throws Exception Session session = container.connectToServer(clientEndpoint, serverUri); // Check correct client config is set. - JavaxWebSocketSession javaxSession = (JavaxWebSocketSession)session; - assertThat(javaxSession.getCoreSession().isAutoFragment(), is(false)); - assertThat(javaxSession.getCoreSession().getMaxFrameSize(), is(1337L)); + JakartaWebSocketSession jakartaSession = (JakartaWebSocketSession)session; + assertThat(jakartaSession.getCoreSession().isAutoFragment(), is(false)); + assertThat(jakartaSession.getCoreSession().getMaxFrameSize(), is(1337L)); // Send and receive an echo. session.getBasicRemote().sendText("echo"); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/PathParamTest.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/PathParamTest.java index 2b3e28eeff84..db893d75b78f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/PathParamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/PathParamTest.java @@ -16,22 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -56,7 +56,7 @@ public void startContainer() throws Exception _context.setContextPath("/"); _server.setHandler(_context); - JavaxWebSocketServletContainerInitializer.configure(_context, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(_context, (context, container) -> container.addEndpoint(EchoParamSocket.class)); _server.start(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/RestartContextTest.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/RestartContextTest.java index dc8457956642..47f84fab1d39 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/RestartContextTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/RestartContextTest.java @@ -16,29 +16,29 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.net.URI; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DeploymentException; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -67,7 +67,7 @@ public void testStartStopStartServletContextListener() throws Exception // Setup Context ServletContextHandler context = new ServletContextHandler(); context.setContextPath("/"); - JavaxWebSocketServletContainerInitializer.configure(context, null); + JakartaWebSocketServletContainerInitializer.configure(context, null); // late initialization via my own ServletContextListener context.addEventListener(new AddEndpointListener()); @@ -107,7 +107,7 @@ public void testStartStopStartConfigurator() throws Exception // Setup Context ServletContextHandler context = new ServletContextHandler(); context.setContextPath("/"); - JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, serverContainer) -> + JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, serverContainer) -> { // Add endpoint via configurator serverContainer.addEndpoint(EchoEndpoint.class); @@ -154,7 +154,7 @@ public static class AddEndpointListener implements ServletContextListener @Override public void contextInitialized(ServletContextEvent sce) { - ServerContainer container = JavaxWebSocketServerContainer.getContainer(sce.getServletContext()); + ServerContainer container = JakartaWebSocketServerContainer.getContainer(sce.getServletContext()); try { container.addEndpoint(EchoEndpoint.class); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/ServerConfigTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/ServerConfigTest.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/ServerConfigTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/ServerConfigTest.java index 8c03beb12ee8..ec25e12fa060 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/ServerConfigTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/ServerConfigTest.java @@ -16,25 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests; +package org.eclipse.jetty.websocket.jakarta.tests; import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCodes; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.CloseReason.CloseCodes; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; @@ -66,7 +66,7 @@ public void start() throws Exception contextHandler.setContextPath("/"); server.setHandler(contextHandler); - JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> { container.setDefaultMaxSessionIdleTimeout(idleTimeout); container.setDefaultMaxTextMessageBufferSize(maxTextMessageSize); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnClient.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnClient.java index 2b38da9946dc..af4a07c4d8b1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnClient.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnClient.java @@ -16,17 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.autobahn; +package org.eclipse.jetty.websocket.jakarta.tests.autobahn; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; +import jakarta.websocket.CloseReason; import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.UrlEncoded; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,15 +60,15 @@ * Running Autobahn Fuzzing Server (which you run this client implementation against): *

* 
- *     # Change to websocket-javax-tests directory first.
- *     $ cd jetty-websocket/websocket-javax-tests/
+ *     # Change to websocket-jakarta-tests directory first.
+ *     $ cd jetty-websocket/websocket-jakarta-tests/
  *     $ wstest --mode=fuzzingserver --spec=fuzzingserver.json
  *
  *     # Report output is configured (in the fuzzingserver.json) at location:
  *     $ ls target/reports/clients/
  *
*/ -public class JavaxAutobahnClient +public class JakartaAutobahnClient { public static void main(String[] args) { @@ -92,11 +93,11 @@ public static void main(String[] args) } } - JavaxAutobahnClient client = null; + JakartaAutobahnClient client = null; try { String userAgent = "JettyWebsocketClient/" + Jetty.VERSION; - client = new JavaxAutobahnClient(hostname, port, userAgent); + client = new JakartaAutobahnClient(hostname, port, userAgent); LOG.info("Running test suite..."); LOG.info("Using Fuzzing Server: {}:{}", hostname, port); @@ -134,16 +135,17 @@ public static void main(String[] args) } } - private static final Logger LOG = LoggerFactory.getLogger(JavaxAutobahnClient.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaAutobahnClient.class); + private URI baseWebsocketUri; - private JavaxWebSocketClientContainer clientContainer; + private JakartaWebSocketClientContainer clientContainer; private String userAgent; - public JavaxAutobahnClient(String hostname, int port, String userAgent) throws Exception + public JakartaAutobahnClient(String hostname, int port, String userAgent) throws Exception { this.userAgent = userAgent; this.baseWebsocketUri = new URI("ws://" + hostname + ":" + port); - this.clientContainer = new JavaxWebSocketClientContainer(); + this.clientContainer = new JakartaWebSocketClientContainer(); clientContainer.start(); } @@ -177,7 +179,7 @@ public void runCaseByNumber(int caseNumber) throws Exception URI wsUri = baseWebsocketUri.resolve("/runCase?case=" + caseNumber + "&agent=" + UrlEncoded.encodeString(userAgent)); LOG.info("test uri: {}", wsUri); - JavaxAutobahnSocket echoHandler = new JavaxAutobahnSocket(); + JakartaAutobahnSocket echoHandler = new JakartaAutobahnSocket(); clientContainer.connectToServer(echoHandler, wsUri); // Wait up to 5 min as some of the tests can take a while diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnServer.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnServer.java index f57163e94a05..3a0f77a327af 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnServer.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnServer.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.autobahn; +package org.eclipse.jetty.websocket.jakarta.tests.autobahn; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; /** * WebSocket Server for use with autobahn websocket testsuite (wstest). @@ -49,15 +49,15 @@ * Running Autobahn Fuzzing Client (against this server implementation): *

* 
- *     # Change to websocket-javax-tests directory first.
- *     $ cd jetty-websocket/websocket-javax-tests/
+ *     # Change to websocket-jakarta-tests directory first.
+ *     $ cd jetty-websocket/websocket-jakarta-tests/
  *     $ wstest --mode=fuzzingclient --spec=fuzzingclient.json
  *
  *     # Report output is configured (in the fuzzingclient.json) at location:
  *     $ ls target/reports/servers/
  *
*/ -public class JavaxAutobahnServer +public class JakartaAutobahnServer { public static void main(String[] args) throws Exception { @@ -73,8 +73,8 @@ public static void main(String[] args) throws Exception context.setContextPath("/"); server.setHandler(context); - JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, container) -> - container.addEndpoint(JavaxAutobahnSocket.class)); + JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, container) -> + container.addEndpoint(JakartaAutobahnSocket.class)); server.start(); server.join(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java index 5e5f239be36a..1987e4814ca5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/autobahn/JavaxAutobahnSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/autobahn/JakartaAutobahnSocket.java @@ -16,27 +16,28 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.autobahn; +package org.eclipse.jetty.websocket.jakarta.tests.autobahn; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.CountDownLatch; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @ClientEndpoint @ServerEndpoint("/") -public class JavaxAutobahnSocket +public class JakartaAutobahnSocket { - private static final Logger LOG = LoggerFactory.getLogger(JavaxAutobahnSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaAutobahnSocket.class); public Session session; public CountDownLatch closeLatch = new CountDownLatch(1); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AbstractClientSessionTest.java similarity index 56% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AbstractClientSessionTest.java index 1c94084f950a..9bffa207ce0a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AbstractClientSessionTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AbstractClientSessionTest.java @@ -16,35 +16,36 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import org.eclipse.jetty.websocket.core.CoreSession; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.javax.tests.DummyEndpoint; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.jakarta.tests.DummyEndpoint; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; public abstract class AbstractClientSessionTest { - protected static JavaxWebSocketSession session; - protected static JavaxWebSocketContainer container; + protected static JakartaWebSocketSession session; + protected static JakartaWebSocketContainer container; @BeforeAll public static void initSession() throws Exception { - container = new JavaxWebSocketClientContainer(); + container = new JakartaWebSocketClientContainer(); container.start(); Object websocketPojo = new DummyEndpoint(); UpgradeRequest upgradeRequest = new UpgradeRequestAdapter(); - JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest); + JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(websocketPojo, upgradeRequest); CoreSession coreSession = new CoreSession.Empty(); - session = new JavaxWebSocketSession(container, coreSession, frameHandler, new BasicClientEndpointConfig()); + session = new JakartaWebSocketSession(container, coreSession, frameHandler, new BasicClientEndpointConfig()); } @AfterAll diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedClientEndpointTest.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedClientEndpointTest.java index 5c419efa4401..a1ed41ddda2c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedClientEndpointTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedClientEndpointTest.java @@ -16,25 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; import java.util.Date; -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.HandshakeResponse; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; - -import org.eclipse.jetty.websocket.javax.tests.CoreServer; -import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.jakarta.tests.coders.TimeEncoder; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoClient.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoClient.java index 94ce4dc6b67d..c7893e1fd700 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoClient.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoClient.java @@ -16,16 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.io.IOException; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; @ClientEndpoint public class AnnotatedEchoClient diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoTest.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoTest.java index 4b87604ea773..55cbf4a67278 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/AnnotatedEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/AnnotatedEchoTest.java @@ -16,21 +16,21 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.io.IOException; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.io.RuntimeIOException; -import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/ConfiguratorTest.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/ConfiguratorTest.java index b317d9fb6bad..13eaa49fc19d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/ConfiguratorTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/ConfiguratorTest.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.HandshakeResponse; -import javax.websocket.MessageHandler; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; - -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; + +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ import static org.hamcrest.core.Is.is; /** - * Tests of {@link javax.websocket.ClientEndpointConfig.Configurator} + * Tests of {@link jakarta.websocket.ClientEndpointConfig.Configurator} */ public class ConfiguratorTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/CookiesTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/CookiesTest.java index 86434f4204e3..a10bec78e9d0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/CookiesTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/CookiesTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.net.HttpCookie; import java.util.Collections; @@ -26,20 +26,20 @@ import java.util.function.Function; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.HandshakeResponse; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.server.Negotiation; -import org.eclipse.jetty.websocket.javax.tests.CoreServer; -import org.eclipse.jetty.websocket.javax.tests.DummyEndpoint; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.StaticText; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.WholeMessageEcho; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.DummyEndpoint; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.StaticText; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.WholeMessageEcho; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DecoderReaderManySmallTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DecoderReaderManySmallTest.java index caf99771299f..83dd0441669b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DecoderReaderManySmallTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DecoderReaderManySmallTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.io.BufferedReader; import java.io.IOException; @@ -26,20 +26,20 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.MessageHandler; import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator; -import org.eclipse.jetty.websocket.javax.tests.CoreServer; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DelayedStartClientTest.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DelayedStartClientTest.java index 8307148ba827..5e81b31019e4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/DelayedStartClientTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +24,9 @@ import java.util.List; import java.util.Set; import java.util.concurrent.Executor; -import javax.websocket.ContainerProvider; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.thread.QueuedThreadPool; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/EndpointEchoTest.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/EndpointEchoTest.java index 39066ed9167a..4dc9694a02d1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/EndpointEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/EndpointEchoTest.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -75,7 +75,7 @@ public void testEchoInstance() throws Exception { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); ClientEndpoint clientEndpoint = new ClientEndpoint(); - assertThat(clientEndpoint, Matchers.instanceOf(javax.websocket.Endpoint.class)); + assertThat(clientEndpoint, Matchers.instanceOf(jakarta.websocket.Endpoint.class)); // Issue connect using instance of class that extends Endpoint Session session = container.connectToServer(clientEndpoint, null, server.getWsUri().resolve("/echo/text")); session.getBasicRemote().sendText("Echo"); @@ -94,7 +94,7 @@ public void testEchoClassRef() throws Exception Session session = container.connectToServer(ClientEndpoint.class, null, server.getWsUri().resolve("/echo/text")); session.getBasicRemote().sendText("Echo"); - JavaxWebSocketSession jsrSession = (JavaxWebSocketSession)session; + JakartaWebSocketSession jsrSession = (JakartaWebSocketSession)session; Object obj = jsrSession.getEndpoint(); assertThat("session.endpoint", obj, Matchers.instanceOf(ClientEndpoint.class)); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientEchoTrackingSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientEchoTrackingSocket.java index ff3522b55ff3..04fe973599aa 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientEchoTrackingSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientEchoTrackingSocket.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; -import javax.websocket.PongMessage; -import org.eclipse.jetty.websocket.javax.tests.DataUtils; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.PongMessage; +import org.eclipse.jetty.websocket.jakarta.tests.DataUtils; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class JsrClientEchoTrackingSocket extends WSEventTracker.Basic diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientTrackingSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientTrackingSocket.java index 84241075903f..bcb9ce218710 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/JsrClientTrackingSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/JsrClientTrackingSocket.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.nio.ByteBuffer; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnMessage; -import javax.websocket.PongMessage; -import org.eclipse.jetty.websocket.javax.tests.DataUtils; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.PongMessage; +import org.eclipse.jetty.websocket.jakarta.tests.DataUtils; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class JsrClientTrackingSocket extends WSEventTracker.Basic diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/MessageReceivingTest.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/MessageReceivingTest.java index 5161bf2c05eb..39e6a6f42fc8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/MessageReceivingTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/MessageReceivingTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.io.IOException; import java.nio.ByteBuffer; @@ -28,14 +28,14 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.component.LifeCycle; @@ -45,8 +45,8 @@ import org.eclipse.jetty.websocket.core.MessageHandler; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.server.Negotiation; -import org.eclipse.jetty.websocket.javax.tests.CoreServer; -import org.eclipse.jetty.websocket.javax.tests.DataUtils; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.DataUtils; import org.eclipse.jetty.websocket.util.TextUtil; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.is; /** - * This class tests receiving of messages by different types of {@link javax.websocket.MessageHandler} + * This class tests receiving of messages by different types of {@link jakarta.websocket.MessageHandler} */ public class MessageReceivingTest { @@ -104,7 +104,7 @@ public void stopClient() throws Exception public void testPartialBinaryMessage() throws Exception { final TestEndpoint clientEndpoint = new TestEndpoint(new PartialByteBufferCaptureHandler()); - assertThat(clientEndpoint, instanceOf(javax.websocket.Endpoint.class)); + assertThat(clientEndpoint, instanceOf(jakarta.websocket.Endpoint.class)); ClientEndpointConfig clientConfig = ClientEndpointConfig.Builder.create() .preferredSubprotocols(Collections.singletonList("partial-binary")) @@ -147,7 +147,7 @@ public void testPartialBinaryMessage() throws Exception public void testPartialTextMessage() throws Exception { final TestEndpoint clientEndpoint = new TestEndpoint(new PartialStringCaptureHandler()); - assertThat(clientEndpoint, instanceOf(javax.websocket.Endpoint.class)); + assertThat(clientEndpoint, instanceOf(jakarta.websocket.Endpoint.class)); ClientEndpointConfig clientConfig = ClientEndpointConfig.Builder.create() .preferredSubprotocols(Collections.singletonList("partial-text")) @@ -179,7 +179,7 @@ public void testPartialTextMessage() throws Exception public void testWholeBinaryMessage() throws Exception { final TestEndpoint clientEndpoint = new TestEndpoint(new WholeByteBufferCaptureHandler()); - assertThat(clientEndpoint, instanceOf(javax.websocket.Endpoint.class)); + assertThat(clientEndpoint, instanceOf(jakarta.websocket.Endpoint.class)); ClientEndpointConfig clientConfig = ClientEndpointConfig.Builder.create() .preferredSubprotocols(Collections.singletonList("echo")) @@ -209,7 +209,7 @@ public void testWholeBinaryMessage() throws Exception public void testWholeTextMessage() throws Exception { final TestEndpoint clientEndpoint = new TestEndpoint(new WholeStringCaptureHandler()); - assertThat(clientEndpoint, instanceOf(javax.websocket.Endpoint.class)); + assertThat(clientEndpoint, instanceOf(jakarta.websocket.Endpoint.class)); ClientEndpointConfig clientConfig = ClientEndpointConfig.Builder.create() .preferredSubprotocols(Collections.singletonList("echo")) @@ -421,7 +421,7 @@ public void onError(Session session, Throwable thr) /** * Abstract message handler implementation, used for tests. */ - private abstract static class AbstractHandler implements javax.websocket.MessageHandler + private abstract static class AbstractHandler implements jakarta.websocket.MessageHandler { public final BlockingQueue messageQueue = new LinkedBlockingDeque<>(); } @@ -430,7 +430,7 @@ private abstract static class AbstractHandler implements javax.websocket.Message * Partial message handler for receiving binary messages. */ public static class PartialByteBufferCaptureHandler extends AbstractHandler implements - javax.websocket.MessageHandler.Partial + jakarta.websocket.MessageHandler.Partial { /** * Parts of the current message. This list is appended with every non-last part and is @@ -472,7 +472,7 @@ public void onMessage(ByteBuffer messagePart, boolean last) * Whole message handler for receiving binary messages. */ public static class WholeByteBufferCaptureHandler extends AbstractHandler implements - javax.websocket.MessageHandler.Whole + jakarta.websocket.MessageHandler.Whole { @Override public void onMessage(ByteBuffer message) @@ -486,7 +486,7 @@ public void onMessage(ByteBuffer message) * Partial message handler for receiving text messages. */ public static class PartialStringCaptureHandler extends AbstractHandler implements - javax.websocket.MessageHandler.Partial + jakarta.websocket.MessageHandler.Partial { /** * Parts of the current message. This list is appended with every non-last part and is @@ -510,7 +510,7 @@ public void onMessage(String messagePart, boolean last) * Whole message handler for receiving text messages. */ public static class WholeStringCaptureHandler extends AbstractHandler implements - javax.websocket.MessageHandler.Whole + jakarta.websocket.MessageHandler.Whole { @Override public void onMessage(String message) diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/OnCloseTest.java similarity index 74% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/OnCloseTest.java index 7c9ca2e19b8b..9b2285b3e435 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/OnCloseTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/OnCloseTest.java @@ -16,28 +16,29 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import javax.websocket.ClientEndpointConfig; +import jakarta.websocket.ClientEndpointConfig; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.CoreSession; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; -import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseReasonSessionSocket; -import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseReasonSocket; -import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSessionReasonSocket; -import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSessionSocket; -import org.eclipse.jetty.websocket.javax.tests.client.samples.CloseSocket; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; +import org.eclipse.jetty.websocket.jakarta.tests.client.samples.CloseReasonSessionSocket; +import org.eclipse.jetty.websocket.jakarta.tests.client.samples.CloseReasonSocket; +import org.eclipse.jetty.websocket.jakarta.tests.client.samples.CloseSessionReasonSocket; +import org.eclipse.jetty.websocket.jakarta.tests.client.samples.CloseSessionSocket; +import org.eclipse.jetty.websocket.jakarta.tests.client.samples.CloseSocket; + import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -77,7 +78,7 @@ public String toString() } } - private static JavaxWebSocketClientContainer container = new JavaxWebSocketClientContainer(); + private static JakartaWebSocketClientContainer container = new JakartaWebSocketClientContainer(); public static Stream data() throws Exception { @@ -99,11 +100,11 @@ public void testOnCloseCall(Case testcase) throws Exception ClientEndpointConfig config = new BasicClientEndpointConfig(); // TODO: use ConfiguredEndpoint here? - JavaxWebSocketClientContainer container = new JavaxWebSocketClientContainer(); + JakartaWebSocketClientContainer container = new JakartaWebSocketClientContainer(); container.start(); UpgradeRequest request = new UpgradeRequestAdapter(); - JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(endpoint, request); + JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(endpoint, request); frameHandler.onOpen(new CoreSession.Empty(), Callback.NOOP); // Execute onClose call diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/SessionAddMessageHandlerTest.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/SessionAddMessageHandlerTest.java index f980f1cd3e69..e66fe8d487cb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/SessionAddMessageHandlerTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/SessionAddMessageHandlerTest.java @@ -16,35 +16,36 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import javax.websocket.ClientEndpoint; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.MessageHandler; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.MessageHandler; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientFrameHandlerFactory; -import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.javax.tests.MessageType; -import org.eclipse.jetty.websocket.javax.tests.SessionMatchers; -import org.eclipse.jetty.websocket.javax.tests.handlers.ByteArrayWholeHandler; -import org.eclipse.jetty.websocket.javax.tests.handlers.ByteBufferPartialHandler; -import org.eclipse.jetty.websocket.javax.tests.handlers.LongMessageHandler; -import org.eclipse.jetty.websocket.javax.tests.handlers.StringWholeHandler; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.ConfiguredEndpoint; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.jakarta.tests.MessageType; +import org.eclipse.jetty.websocket.jakarta.tests.SessionMatchers; +import org.eclipse.jetty.websocket.jakarta.tests.handlers.ByteArrayWholeHandler; +import org.eclipse.jetty.websocket.jakarta.tests.handlers.ByteBufferPartialHandler; +import org.eclipse.jetty.websocket.jakarta.tests.handlers.LongMessageHandler; +import org.eclipse.jetty.websocket.jakarta.tests.handlers.StringWholeHandler; + import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -61,23 +62,23 @@ public static class DummyEndpoint { } - private JavaxWebSocketClientContainer container; - private JavaxWebSocketFrameHandler frameHandler; - private JavaxWebSocketSession session; + private JakartaWebSocketClientContainer container; + private JakartaWebSocketFrameHandler frameHandler; + private JakartaWebSocketSession session; @BeforeEach public void initSession() throws Exception { // Container - container = new JavaxWebSocketClientContainer(); + container = new JakartaWebSocketClientContainer(); container.start(); ClientEndpointConfig endpointConfig = new BasicClientEndpointConfig(); ConfiguredEndpoint ei = new ConfiguredEndpoint(new DummyEndpoint(), endpointConfig); UpgradeRequest handshakeRequest = new UpgradeRequestAdapter(); - JavaxWebSocketFrameHandlerFactory frameHandlerFactory = new JavaxWebSocketClientFrameHandlerFactory(container); - frameHandler = frameHandlerFactory.newJavaxWebSocketFrameHandler(ei, handshakeRequest); + JakartaWebSocketFrameHandlerFactory frameHandlerFactory = new JakartaWebSocketClientFrameHandlerFactory(container); + frameHandler = frameHandlerFactory.newJakartaWebSocketFrameHandler(ei, handshakeRequest); frameHandler.onOpen(new CoreSession.Empty(), Callback.NOOP); // Session @@ -216,7 +217,7 @@ public void testMessageHandlerText() } /** - * Test Java 8 Lamba of {@link javax.websocket.MessageHandler.Whole} + * Test Java 8 Lamba of {@link jakarta.websocket.MessageHandler.Whole} */ @Test public void testMessageHandler11WholeLambda() throws Exception @@ -241,7 +242,7 @@ public void testMessageHandler11WholeLambda() throws Exception } /** - * Test Java 8 Lamba of {@link javax.websocket.MessageHandler.Partial} + * Test Java 8 Lamba of {@link jakarta.websocket.MessageHandler.Partial} */ @Test public void testMessageHandler11PartialLambda() throws Exception diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/WriteTimeoutTest.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/WriteTimeoutTest.java index ca53d60dd66c..ddc559fdb5d0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/WriteTimeoutTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/WriteTimeoutTest.java @@ -16,18 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client; +package org.eclipse.jetty.websocket.jakarta.tests.client; import java.util.concurrent.TimeUnit; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.exception.WebSocketWriteTimeoutException; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketContainer; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -51,7 +52,7 @@ public void onOpen(Session session, EndpointConfig endpointConfig) } private LocalServer server; - private JavaxWebSocketContainer client; + private JakartaWebSocketContainer client; @BeforeEach public void start() throws Exception @@ -60,7 +61,7 @@ public void start() throws Exception server.start(); server.getServerContainer().addEndpoint(ServerSocket.class); - client = new JavaxWebSocketClientContainer(); + client = new JakartaWebSocketClientContainer(); client.start(); } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java index 79cecff7216a..2806ea993eb5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/AnnotatedRuntimeOnOpen.java @@ -16,17 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; +package org.eclipse.jetty.websocket.jakarta.tests.client.misbehaving; import java.util.LinkedList; import java.util.concurrent.CountDownLatch; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; /** * A JSR-356 Annotated that tosses a RuntimeException during its onOpen call diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/EndpointRuntimeOnOpen.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/EndpointRuntimeOnOpen.java index 4612678fb63c..cdc55512b0fc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/EndpointRuntimeOnOpen.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/EndpointRuntimeOnOpen.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; +package org.eclipse.jetty.websocket.jakarta.tests.client.misbehaving; import java.util.LinkedList; import java.util.concurrent.CountDownLatch; -import javax.websocket.CloseReason; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.Session; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Session; /** * A JSR-356 Endpoint that tosses a RuntimeException during its onOpen call diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/MisbehavingClassTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/MisbehavingClassTest.java index d59fa0d06486..4669fc538ecb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/misbehaving/MisbehavingClassTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/misbehaving/MisbehavingClassTest.java @@ -16,15 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.misbehaving; +package org.eclipse.jetty.websocket.jakarta.tests.client.misbehaving; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.WebSocketContainer; + +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession; -import org.eclipse.jetty.websocket.javax.tests.CoreServer; +import org.eclipse.jetty.websocket.jakarta.tests.CoreServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,7 +58,7 @@ public void testEndpointRuntimeOnOpen() throws Exception server.addBean(container); // allow to shutdown with server EndpointRuntimeOnOpen socket = new EndpointRuntimeOnOpen(); - try (StacklessLogging ignored = new StacklessLogging(WebSocketCoreSession.class)) + try (StacklessLogging ignored = new StacklessLogging( WebSocketCoreSession.class)) { // expecting RuntimeException during onOpen container.connectToServer(socket, null, server.getWsUri()); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseEndpointConfigSocket.java similarity index 78% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseEndpointConfigSocket.java index 325898b71b97..e57c7899e139 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseEndpointConfigSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseEndpointConfigSocket.java @@ -16,16 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseEndpointConfigSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSessionSocket.java similarity index 77% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSessionSocket.java index 64728894833d..96af91ec8161 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSessionSocket.java @@ -16,16 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseReasonSessionSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSocket.java similarity index 77% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSocket.java index a3e49b80992f..684b82df92ae 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseReasonSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseReasonSocket.java @@ -16,16 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseReasonSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionReasonSocket.java similarity index 77% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionReasonSocket.java index 005e7628bb34..57c0b9826651 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionReasonSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionReasonSocket.java @@ -16,16 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseSessionReasonSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionSocket.java similarity index 79% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionSocket.java index 7f93af19c39a..2a6d79acf3e2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSessionSocket.java @@ -16,15 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseSessionSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSocket.java similarity index 78% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSocket.java index 25acfc30abb7..f8fe50538656 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/CloseSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/CloseSocket.java @@ -16,15 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; -import javax.websocket.ClientEndpoint; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnOpen; -import javax.websocket.Session; - -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint public class CloseSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/IntSocket.java similarity index 79% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/IntSocket.java index 8ae2be5db148..00c93a0a7092 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/samples/IntSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/samples/IntSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.client.samples; +package org.eclipse.jetty.websocket.jakarta.tests.client.samples; import java.io.IOException; -import javax.websocket.ClientEndpoint; -import javax.websocket.EncodeException; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import org.eclipse.jetty.websocket.javax.tests.coders.BadDualDecoder; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.EncodeException; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.coders.BadDualDecoder; @ClientEndpoint(decoders = BadDualDecoder.class) public class IntSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableDecodersTest.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableDecodersTest.java index ff8050c6bbf2..972d97fb3442 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableDecodersTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableDecodersTest.java @@ -16,21 +16,22 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.nio.ByteBuffer; import java.time.Instant; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.toolchain.test.Hex; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.decoders.IntegerDecoder; + import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableEncodersTest.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableEncodersTest.java index acde049e0450..a09f81156d58 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/AvailableEncodersTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/AvailableEncodersTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,14 +25,15 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.toolchain.test.Hex; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; -import org.eclipse.jetty.websocket.javax.common.encoders.IntegerEncoder; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.jakarta.common.encoders.IntegerEncoder; + import org.eclipse.jetty.websocket.util.InvalidWebSocketException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualDecoder.java similarity index 94% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualDecoder.java index 131f49a6aec6..846446d2be4a 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualDecoder.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.BufferUtil; /** diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualEncoder.java index f42186b27bd6..2e6b436fbe73 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/BadDualEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/BadDualEncoder.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.IOException; import java.io.Writer; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Intentionally bad example of attempting to encode the same object for different message types. diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/CoderEventTracking.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/CoderEventTracking.java index 0c60f58c58de..1e3c4e16239b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/CoderEventTracking.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/CoderEventTracking.java @@ -16,16 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.websocket.Decoder; -import javax.websocket.Encoder; + +import jakarta.websocket.Decoder; +import jakarta.websocket.Encoder; /** - * Singleton used for tracking events of {@link javax.websocket.Decoder} and {@link javax.websocket.Encoder} + * Singleton used for tracking events of {@link jakarta.websocket.Decoder} and {@link jakarta.websocket.Encoder} */ public class CoderEventTracking { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateDecoder.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateDecoder.java index 1326ca6c129c..abab01042f89 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateDecoder.java @@ -16,15 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; /** * Decode Date diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateEncoder.java index bf5318475317..a476b3abc32b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateEncoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Encode Date diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeDecoder.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeDecoder.java index 1146d3180ab8..a6457934d6ca 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeDecoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; /** * Decode Date and Time diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeEncoder.java index ae3cb8613583..c131b57a89a1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DateTimeEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DateTimeEncoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Encode Date diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextStreamTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextStreamTest.java index 43aaa9db5b58..028f8319ff70 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextStreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextStreamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.Reader; import java.lang.invoke.MethodHandle; @@ -27,14 +27,14 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Function; -import javax.websocket.Decoder; +import jakarta.websocket.Decoder; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.websocket.core.Frame; -import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink; -import org.eclipse.jetty.websocket.javax.tests.FunctionMethod; -import org.eclipse.jetty.websocket.javax.tests.client.AbstractClientSessionTest; +import org.eclipse.jetty.websocket.jakarta.common.messages.DecodedTextStreamMessageSink; +import org.eclipse.jetty.websocket.jakarta.tests.FunctionMethod; +import org.eclipse.jetty.websocket.jakarta.tests.client.AbstractClientSessionTest; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.notNullValue; /** - * Test various {@link javax.websocket.Decoder.TextStream} scenarios + * Test various {@link jakarta.websocket.Decoder.TextStream} scenarios */ public class DecoderTextStreamTest extends AbstractClientSessionTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextTest.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextTest.java index 8aac66612242..c0abad2bc97b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/DecoderTextTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/DecoderTextTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import javax.websocket.DecodeException; +import jakarta.websocket.DecodeException; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/EncoderTextTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/EncoderTextTest.java index 0077c25d5f13..907acd55c6be 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/EncoderTextTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/EncoderTextTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.containsString; /** - * Test various {@link javax.websocket.Encoder.Text} scenarios + * Test various {@link jakarta.websocket.Encoder.Text} scenarios */ public class EncoderTextTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ExtDecoder.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ExtDecoder.java index 059609b804c6..7592f04202dc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ExtDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ExtDecoder.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.Decoder; +import jakarta.websocket.Decoder; /** * Testing scenario of an extended Decoder interface diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FloatDecoderTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FloatDecoderTest.java index 6695cc2ab9b1..6407ebf165ef 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FloatDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FloatDecoderTest.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.DecodeException; - -import org.eclipse.jetty.websocket.javax.common.decoders.FloatDecoder; +import jakarta.websocket.DecodeException; +import org.eclipse.jetty.websocket.jakarta.common.decoders.FloatDecoder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Fruit.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Fruit.java index 5961c4cddfeb..fb2b90a41bb2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Fruit.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Fruit.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; public class Fruit { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitBinaryEncoder.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitBinaryEncoder.java index cfd7ddf87854..06bb58afda64 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitBinaryEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitBinaryEncoder.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.nio.ByteBuffer; import java.nio.charset.Charset; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.util.BufferUtil; public class FruitBinaryEncoder implements Encoder.Binary diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitDecoder.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitDecoder.java index 7f7a15b4bc12..a7a6dc2ca80e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/FruitDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitDecoder.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.websocket.DecodeException; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.EndpointConfig; public class FruitDecoder implements ExtDecoder { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitTextEncoder.java similarity index 86% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitTextEncoder.java index 0011e46d4e58..bacf74e6f79f 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/coders/tests/FruitTextEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/FruitTextEncoder.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.coders.tests; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class FruitTextEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/IntegerDecoderTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/IntegerDecoderTest.java index d906331a7daa..218ff065b0c2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/IntegerDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/IntegerDecoderTest.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.DecodeException; - -import org.eclipse.jetty.websocket.javax.common.decoders.IntegerDecoder; +import jakarta.websocket.DecodeException; +import org.eclipse.jetty.websocket.jakarta.common.decoders.IntegerDecoder; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/LongDecoderTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/LongDecoderTest.java index 35a2a4b99afe..20218c1a45ac 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/LongDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/LongDecoderTest.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.DecodeException; - -import org.eclipse.jetty.websocket.javax.common.decoders.LongDecoder; +import jakarta.websocket.DecodeException; +import org.eclipse.jetty.websocket.jakarta.common.decoders.LongDecoder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Quotes.java similarity index 95% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Quotes.java index f149aa05c1a6..53a702161ea4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/Quotes.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/Quotes.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.util.ArrayList; import java.util.List; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesDecoder.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesDecoder.java index 3504bf418cee..0026bac60d42 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesDecoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesEncoder.java index f5b2a99d30e4..87fbd4833007 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesEncoder.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class QuotesEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesUtil.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesUtil.java index 37f2fc36b4c1..0c55a374ef69 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/QuotesUtil.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/QuotesUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.BufferedReader; import java.io.File; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ShortDecoderTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ShortDecoderTest.java index 951dca199b1d..d58d8ecae9ca 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ShortDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ShortDecoderTest.java @@ -16,11 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; -import javax.websocket.DecodeException; - -import org.eclipse.jetty.websocket.javax.common.decoders.ShortDecoder; +import jakarta.websocket.DecodeException; +import org.eclipse.jetty.websocket.jakarta.common.decoders.ShortDecoder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeDecoder.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeDecoder.java index f1f31e7a38aa..dc6a1b27b6f4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeDecoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; /** * Decode Time diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeEncoder.java index f18a3c12cb3a..7f5f43b2c526 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/TimeEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/TimeEncoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Encode Time diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualDecoder.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualDecoder.java index 31d6c8570772..be974b555fc1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualDecoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.nio.ByteBuffer; import java.text.DecimalFormat; import java.text.ParseException; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; /** * Example of a valid decoder impl declaring 2 decoders. diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualEncoder.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualEncoder.java index e0c86d446697..2810a0141037 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/coders/ValidDualEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/coders/ValidDualEncoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.coders; +package org.eclipse.jetty.websocket.jakarta.tests.coders; import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; /** * Example of a valid encoder impl declaring 2 encoders. diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/BaseMessageHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/BaseMessageHandler.java index 1df281c32f4f..ff2f894b7089 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/BaseMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/BaseMessageHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class BaseMessageHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayPartialHandler.java index 2685f869b27e..32e4d3f503c3 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteArrayPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayPartialHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class ByteArrayPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayWholeHandler.java index 9c93050a3734..76cecfcc06b4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteArrayWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteArrayWholeHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class ByteArrayWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferPartialHandler.java index 0b074b58979e..4fe61ca585d8 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ByteBufferPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferPartialHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ByteBufferPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferWholeHandler.java index 4e350776b286..b93a08f33698 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ByteBufferWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ByteBufferWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ByteBufferWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ComboMessageHandler.java similarity index 92% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ComboMessageHandler.java index 6f9ca6d77352..ffc8fa61a9d0 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/ComboMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ComboMessageHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; /** * A particularly annoying type of MessageHandler. One defining 2 implementations. diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ExtendedMessageHandler.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ExtendedMessageHandler.java index 9cb1f749d855..59f9aede3333 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ExtendedMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ExtendedMessageHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.nio.ByteBuffer; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ExtendedMessageHandler extends BaseMessageHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/InputStreamWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/InputStreamWholeHandler.java index 79358b8933c7..19c959cbed72 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/InputStreamWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/InputStreamWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.io.InputStream; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class InputStreamWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/LongMessageHandler.java similarity index 89% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/LongMessageHandler.java index 1038e1ae4137..48151a1164bf 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/LongMessageHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/LongMessageHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class LongMessageHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ReaderWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ReaderWholeHandler.java index d8637aa70804..e8c2525db71a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/ReaderWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/ReaderWholeHandler.java @@ -16,10 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; import java.io.Reader; -import javax.websocket.MessageHandler; + +import jakarta.websocket.MessageHandler; public class ReaderWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringPartialHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringPartialHandler.java index a23afd7c1d1c..54dc2ef6166d 100644 --- a/jetty-websocket/websocket-javax-common/src/test/java/org/eclipse/jetty/websocket/javax/common/handlers/StringPartialHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringPartialHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.common.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class StringPartialHandler implements MessageHandler.Partial { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringWholeHandler.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringWholeHandler.java index 2f072ebc9bbd..49b43c1b4212 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/handlers/StringWholeHandler.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/handlers/StringWholeHandler.java @@ -16,9 +16,9 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.handlers; +package org.eclipse.jetty.websocket.jakarta.tests.handlers; -import javax.websocket.MessageHandler; +import jakarta.websocket.MessageHandler; public class StringWholeHandler implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/Quotes.java similarity index 95% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/Quotes.java index a34d3fe0c2f0..d910875541d2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/Quotes.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/Quotes.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.util.ArrayList; import java.util.List; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoder.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoder.java index d500ee004fd0..395179d8d180 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoder.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; + +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTest.java index 9b36099fddca..772080aed8a6 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTest.java @@ -16,23 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.net.URI; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.OnClose; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; - -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; + +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTextStreamTest.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTextStreamTest.java index a65fd402498d..9beb78ffdc3d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesDecoderTextStreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesDecoderTextStreamTest.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; /** - * Tests a {@link javax.websocket.Decoder.TextStream} automatic decoding to a Socket onMessage parameter + * Tests a {@link jakarta.websocket.Decoder.TextStream} automatic decoding to a Socket onMessage parameter */ public class QuotesDecoderTextStreamTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoder.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoder.java index 871807b83993..c78030ec5a20 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoder.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoder.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; -import javax.websocket.EncodeException; -import javax.websocket.Encoder; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EncodeException; +import jakarta.websocket.Encoder; +import jakarta.websocket.EndpointConfig; public class QuotesEncoder implements Encoder.Text { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoderTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoderTest.java index 403b76ddc535..a1b878d9ca3d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesEncoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesEncoderTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.io.BufferedReader; import java.io.File; @@ -24,21 +24,21 @@ import java.io.IOException; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.EncodeException; -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 javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EncodeException; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesSocket.java similarity index 80% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesSocket.java index 0166f7567663..b7ab4d76a13c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesSocket.java @@ -16,19 +16,19 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; @ClientEndpoint(decoders = QuotesDecoder.class, subprotocols = "quotes") public class QuotesSocket extends WSEventTracker diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesUtil.java similarity index 98% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesUtil.java index e65549563fdd..d410eac18938 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/quotes/QuotesUtil.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/quotes/QuotesUtil.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.quotes; +package org.eclipse.jetty.websocket.jakarta.tests.quotes; import java.io.BufferedReader; import java.io.File; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AbstractJakartaWebSocketServerFrameHandlerTest.java similarity index 66% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AbstractJakartaWebSocketServerFrameHandlerTest.java index 9a2f5f1f3141..eff076dee2ab 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AbstractJavaxWebSocketServerFrameHandlerTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AbstractJakartaWebSocketServerFrameHandlerTest.java @@ -16,27 +16,28 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.util.HashMap; import java.util.Map; -import javax.websocket.EndpointConfig; +import jakarta.websocket.EndpointConfig; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.client.internal.BasicClientEndpointConfig; -import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders; -import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; +import org.eclipse.jetty.websocket.jakarta.client.BasicClientEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders; +import org.eclipse.jetty.websocket.jakarta.common.encoders.AvailableEncoders; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -public abstract class AbstractJavaxWebSocketServerFrameHandlerTest +public abstract class AbstractJakartaWebSocketServerFrameHandlerTest { private static Server server; protected static ServletContextHandler context; - protected static JavaxWebSocketServerContainer container; + protected static JakartaWebSocketServerContainer container; @BeforeAll public static void initContainer() throws Exception @@ -44,9 +45,9 @@ public static void initContainer() throws Exception server = new Server(); context = new ServletContextHandler(); server.setHandler(context); - JavaxWebSocketServletContainerInitializer.configure(context, null); + JakartaWebSocketServletContainerInitializer.configure(context, null); server.start(); - container = JavaxWebSocketServerContainer.getContainer(context.getServletContext()); + container = JakartaWebSocketServerContainer.getContainer(context.getServletContext()); } @AfterAll @@ -60,7 +61,7 @@ public static void stopContainer() throws Exception protected Map uriParams; protected EndpointConfig endpointConfig; - public AbstractJavaxWebSocketServerFrameHandlerTest() + public AbstractJakartaWebSocketServerFrameHandlerTest() { endpointConfig = new BasicClientEndpointConfig(); encoders = new AvailableEncoders(endpointConfig); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java index e6c93a0ce177..12de92d2dc5e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AltFilterTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.util.ArrayList; import java.util.List; @@ -28,9 +28,9 @@ import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -52,7 +52,7 @@ public void testEcho() throws Exception { WSServer wsb = new WSServer(testdir.getPath(), "app"); wsb.copyWebInf("alt-filter-web.xml"); - // the endpoint (extends javax.websocket.Endpoint) + // the endpoint (extends jakarta.websocket.Endpoint) wsb.copyClass(BasicEchoSocket.class); try diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java index d81f71df0bb5..2ae57015230f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AnnotatedServerEndpointTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/AnnotatedServerEndpointTest.java @@ -16,25 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; -import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.ConfiguredEchoSocket; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.jakarta.tests.coders.TimeEncoder; +import org.eclipse.jetty.websocket.jakarta.tests.server.configs.EchoSocketConfigurator; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.ConfiguredEchoSocket; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java similarity index 81% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java index 4dbb670e9e98..10628828665f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointConfigContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoEndpoint; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint; /** - * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically via config + * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config */ public class BasicEchoEndpointConfigContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java similarity index 81% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java index fdbfe9136345..8d7b2b2260ba 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoEndpointContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint; /** - * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically directly. + * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically directly. *

* NOTE: this shouldn't work as the endpoint has no path associated with it. */ diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java similarity index 79% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java index 7b0185b6a67f..fde5eb868adc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketConfigContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket; /** - * Example of adding a server socket (which extends {@link javax.websocket.Endpoint}) programmatically via the {@link ServerContainer#addEndpoint(ServerEndpointConfig)} + * Example of adding a server socket (which extends {@link jakarta.websocket.Endpoint}) programmatically via the {@link ServerContainer#addEndpoint(ServerEndpointConfig)} */ public class BasicEchoSocketConfigContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java index 3c80ed9a3136..ef9110cea70d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BasicEchoSocketContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.echo.BasicEchoSocket; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket; /** * Example of adding a server socket (annotated) programmatically directly with no config diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java index e63c75994f25..c23e88dc5a78 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/BinaryStreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BinaryStreamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.InputStream; @@ -26,17 +26,18 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.DataUtils; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.DataUtils; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java index 573ccd47b3c9..ad2d22eec5c3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ConfiguratorTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ConfiguratorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.PrintWriter; import java.io.StringWriter; @@ -37,18 +37,18 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import javax.websocket.DecodeException; -import javax.websocket.Decoder; -import javax.websocket.EndpointConfig; -import javax.websocket.Extension; -import javax.websocket.HandshakeResponse; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.DecodeException; +import jakarta.websocket.Decoder; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.Extension; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.websocket.core.CoreSession; @@ -56,10 +56,10 @@ import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketCreator; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.Timeouts; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketCreator; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Timeouts; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.hamcrest.Matcher; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -253,8 +253,8 @@ public static class AddrConfigurator extends ServerEndpointConfig.Configurator @Override public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) { - InetSocketAddress local = (InetSocketAddress)sec.getUserProperties().get(JavaxWebSocketCreator.PROP_LOCAL_ADDRESS); - InetSocketAddress remote = (InetSocketAddress)sec.getUserProperties().get(JavaxWebSocketCreator.PROP_REMOTE_ADDRESS); + InetSocketAddress local = (InetSocketAddress)sec.getUserProperties().get(JakartaWebSocketCreator.PROP_LOCAL_ADDRESS); + InetSocketAddress remote = (InetSocketAddress)sec.getUserProperties().get(JakartaWebSocketCreator.PROP_REMOTE_ADDRESS); sec.getUserProperties().put("found.local", local); sec.getUserProperties().put("found.remote", remote); @@ -271,8 +271,8 @@ public static class AddressSocket public String onMessage(Session session, String msg) { StringBuilder response = new StringBuilder(); - appendPropValue(session, response, "javax.websocket.endpoint.localAddress"); - appendPropValue(session, response, "javax.websocket.endpoint.remoteAddress"); + appendPropValue(session, response, "jakarta.websocket.endpoint.localAddress"); + appendPropValue(session, response, "jakarta.websocket.endpoint.remoteAddress"); appendPropValue(session, response, "found.local"); appendPropValue(session, response, "found.remote"); return response.toString(); @@ -566,8 +566,8 @@ public void testUserPropsAddress() throws Exception StringWriter expected = new StringWriter(); PrintWriter out = new PrintWriter(expected); // local <-> remote are opposite on server (duh) - out.printf("[javax.websocket.endpoint.localAddress] = %s%n", toSafeAddr(expectedRemote)); - out.printf("[javax.websocket.endpoint.remoteAddress] = %s%n", toSafeAddr(expectedLocal)); + out.printf("[jakarta.websocket.endpoint.localAddress] = %s%n", toSafeAddr(expectedRemote)); + out.printf("[jakarta.websocket.endpoint.remoteAddress] = %s%n", toSafeAddr(expectedLocal)); out.printf("[found.local] = %s%n", toSafeAddr(expectedRemote)); out.printf("[found.remote] = %s%n", toSafeAddr(expectedLocal)); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java index 849d329c8d76..e2993e58f2b3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ContainerProviderServerTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ContainerProviderServerTest.java @@ -16,26 +16,26 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.nio.file.Path; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -import javax.websocket.ContainerProvider; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; -import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static javax.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE; +import static jakarta.websocket.CloseReason.CloseCodes.NORMAL_CLOSURE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -76,7 +76,7 @@ public void stopServer() throws Exception } @Test - public void testJavaxWsContainerInServer() throws Exception + public void testJakartaWsContainerInServer() throws Exception { WebSocketContainer client = ContainerProvider.getWebSocketContainer(); EventSocket clientSocket = new EventSocket(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java similarity index 79% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java index e8abab0ecc65..01f3b81e710d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/DeploymentExceptionTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/DeploymentExceptionTest.java @@ -16,26 +16,26 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidCloseIntSocket; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorErrorSocket; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidErrorIntSocket; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenCloseReasonSocket; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenIntSocket; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.InvalidOpenSessionIntSocket; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidCloseIntSocket; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidErrorErrorSocket; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidErrorIntSocket; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenCloseReasonSocket; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenIntSocket; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.InvalidOpenSessionIntSocket; import org.eclipse.jetty.websocket.util.InvalidSignatureException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -97,7 +97,7 @@ public void testDeployInvalidSignature(Class pojo) throws Exception { ServletContextHandler context = new ServletContextHandler(); context.setServer(server); - JavaxWebSocketServletContainerInitializer.configure(context, null); + JakartaWebSocketServletContainerInitializer.configure(context, null); contexts.addHandler(context); try diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java index 57d9f839f375..14c121280814 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/EndpointViaConfigTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/EndpointViaConfigTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.util.concurrent.Future; @@ -32,8 +32,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; @@ -43,8 +43,8 @@ import static org.hamcrest.Matchers.is; /** - * Example of an {@link javax.websocket.Endpoint} extended echo server added programmatically via the - * {@link javax.websocket.server.ServerContainer#addEndpoint(javax.websocket.server.ServerEndpointConfig)} + * Example of an {@link jakarta.websocket.Endpoint} extended echo server added programmatically via the + * {@link jakarta.websocket.server.ServerContainer#addEndpoint(jakarta.websocket.server.ServerEndpointConfig)} */ @ExtendWith(WorkDirExtension.class) public class EndpointViaConfigTest @@ -58,7 +58,7 @@ public void testEcho() throws Exception { WSServer wsb = new WSServer(testdir.getPath(), "app"); wsb.copyWebInf("basic-echo-endpoint-config-web.xml"); - // the endpoint (extends javax.websocket.Endpoint) + // the endpoint (extends jakarta.websocket.Endpoint) wsb.copyClass(BasicEchoEndpoint.class); // the configuration (adds the endpoint) wsb.copyClass(BasicEchoEndpointConfigContextListener.class); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java similarity index 80% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java index df799eae4984..8316b6067226 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; /** - * Example of adding a server WebSocket (extending {@link javax.websocket.Endpoint}) programmatically via config + * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config */ public class IdleTimeoutContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java index 4948dc665151..1ee52d70d40a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/IdleTimeoutTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.nio.channels.ClosedChannelException; @@ -32,8 +32,8 @@ import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -53,7 +53,7 @@ public static void setupServer() throws Exception { server = new WSServer(MavenTestingUtils.getTargetTestingPath(IdleTimeoutTest.class.getName()), "app"); server.copyWebInf("idle-timeout-config-web.xml"); - // the endpoint (extends javax.websocket.Endpoint) + // the endpoint (extends jakarta.websocket.Endpoint) server.copyClass(IdleTimeoutOnOpenEndpoint.class); // the configuration that adds the endpoint server.copyClass(IdleTimeoutContextListener.class); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java index d7cf252ea8cd..23ab2687161d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/InputStreamEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/InputStreamEchoTest.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; /** - * Test various {@link javax.websocket.Decoder.BinaryStream Decoder.BinaryStream} echo behavior of Java InputStreams + * Test various {@link jakarta.websocket.Decoder.BinaryStream Decoder.BinaryStream} echo behavior of Java InputStreams */ public class InputStreamEchoTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java index 781172066728..85a03e03c11c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JavaxWebSocketFrameHandlerOnMessageTextStreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java @@ -16,40 +16,40 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.Reader; import java.net.URI; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.websocket.OnMessage; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.CoreSession; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequest; -import org.eclipse.jetty.websocket.javax.common.UpgradeRequestAdapter; -import org.eclipse.jetty.websocket.javax.tests.WSEventTracker; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandler; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequest; +import org.eclipse.jetty.websocket.jakarta.common.UpgradeRequestAdapter; +import org.eclipse.jetty.websocket.jakarta.tests.WSEventTracker; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class JavaxWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketServerFrameHandlerTest +public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJakartaWebSocketServerFrameHandlerTest { @SuppressWarnings("Duplicates") - private T performOnMessageInvocation(T socket, Consumer func) throws Exception + private T performOnMessageInvocation(T socket, Consumer func) throws Exception { UpgradeRequest request = new UpgradeRequestAdapter(URI.create("http://localhost:8080/msg/foo")); // Establish endpoint function - JavaxWebSocketFrameHandler frameHandler = container.newFrameHandler(socket, request); + JakartaWebSocketFrameHandler frameHandler = container.newFrameHandler(socket, request); frameHandler.onOpen(new CoreSession.Empty(), Callback.NOOP); func.accept(frameHandler); return socket; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java index 2b1cd0eb5e5b..c975649a6cbc 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JettyServerEndpointConfiguratorTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JettyServerEndpointConfiguratorTest.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.util.Iterator; import java.util.ServiceLoader; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.server.config.ContainerDefaultConfigurator; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -38,7 +38,7 @@ public class JettyServerEndpointConfiguratorTest @Test public void testServiceLoader() { - ServiceLoader loader = ServiceLoader.load(javax.websocket.server.ServerEndpointConfig.Configurator.class); + ServiceLoader loader = ServiceLoader.load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class); assertThat("loader", loader, notNullValue()); Iterator iter = loader.iterator(); assertThat("loader.iterator", iter, notNullValue()); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java index 1f7ad6ee2f30..245ad830d747 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrBatchModeTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrBatchModeTest.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpointConfig; - -import org.eclipse.jetty.websocket.javax.tests.LocalServer; + +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public class JsrBatchModeTest { public static class BasicEchoEndpoint extends Endpoint implements MessageHandler.Whole { - private javax.websocket.Session session; + private jakarta.websocket.Session session; @Override public void onMessage(String msg) @@ -54,7 +54,7 @@ public void onMessage(String msg) } @Override - public void onOpen(javax.websocket.Session session, EndpointConfig config) + public void onOpen(jakarta.websocket.Session session, EndpointConfig config) { this.session = session; this.session.addMessageHandler(this); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java index 64798e6a4bed..a1c54fd5078b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/JsrEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/JsrEchoTest.java @@ -16,25 +16,25 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java similarity index 90% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java index 66d21d6a25d1..ba37c1e4b088 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeAnnotatedTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeAnnotatedTest.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.Callback; @@ -34,8 +34,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.is; /** - * Test Echo of Large messages, targeting the {@link javax.websocket.Session#setMaxTextMessageBufferSize(int)} functionality + * Test Echo of Large messages, targeting the {@link jakarta.websocket.Session#setMaxTextMessageBufferSize(int)} functionality */ @ExtendWith(WorkDirExtension.class) public class LargeAnnotatedTest diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java index 541cc93b6487..d0675ad9ef85 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeContainerTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeContainerTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.nio.charset.StandardCharsets; @@ -33,8 +33,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.is; /** - * Test Echo of Large messages, targeting the {@link javax.websocket.WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)} functionality + * Test Echo of Large messages, targeting the {@link jakarta.websocket.WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)} functionality */ @ExtendWith(WorkDirExtension.class) public class LargeContainerTest diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java index 8f911b49656f..78d210f7e855 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/LargeEchoContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.server.ServerContainer; + +import jakarta.websocket.server.ServerContainer; /** * Configure the Large Text Message Size via the Container diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java index 55688823c0c9..12fd0f852ef6 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/MemoryUsageTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/MemoryUsageTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; @@ -24,18 +24,18 @@ import java.net.URI; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.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.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ public class MemoryUsageTest { public static class BasicEndpoint extends Endpoint implements MessageHandler.Whole { - private javax.websocket.Session session; + private jakarta.websocket.Session session; @Override public void onMessage(String msg) @@ -59,7 +59,7 @@ public void onMessage(String msg) } @Override - public void onOpen(javax.websocket.Session session, EndpointConfig config) + public void onOpen(jakarta.websocket.Session session, EndpointConfig config) { this.session = session; this.session.addMessageHandler(this); @@ -78,7 +78,7 @@ public void prepare() throws Exception server.addConnector(connector); ServletContextHandler contextHandler = new ServletContextHandler(server, "/", true, false); - JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> { ServerEndpointConfig config = ServerEndpointConfig.Builder.create(BasicEndpoint.class, "/").build(); container.addEndpoint(config); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java index 074205796b0d..583f602e69cf 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/OnMessageReturnTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/OnMessageReturnTest.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.net.URI; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.jupiter.WorkDir; import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension; import org.eclipse.jetty.util.Callback; @@ -36,8 +36,8 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -50,7 +50,7 @@ public class OnMessageReturnTest @ServerEndpoint(value = "/echoreturn") public static class EchoReturnEndpoint { - private javax.websocket.Session session = null; + private jakarta.websocket.Session session = null; public CloseReason close = null; public LinkedBlockingQueue messageQueue = new LinkedBlockingQueue<>(); @@ -68,7 +68,7 @@ public String onMessage(String message) } @OnOpen - public void onOpen(javax.websocket.Session session) + public void onOpen(jakarta.websocket.Session session) { this.session = session; } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java index f2da4b4a1ec1..df7e78144005 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PartialEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PartialEchoTest.java @@ -16,22 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java similarity index 94% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java index 4d548a2f05b2..c41d5e35c8e0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PingPongTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PingPongTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.nio.file.Path; @@ -35,9 +35,9 @@ import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; -import org.eclipse.jetty.websocket.javax.tests.Timeouts; -import org.eclipse.jetty.websocket.javax.tests.WSServer; -import org.eclipse.jetty.websocket.javax.tests.framehandlers.FrameHandlerTracker; +import org.eclipse.jetty.websocket.jakarta.tests.Timeouts; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.tests.framehandlers.FrameHandlerTracker; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java similarity index 81% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java index 28ebee0ac022..aa6f74699d8b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongContextListener.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java @@ -16,18 +16,18 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import javax.websocket.DeploymentException; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpointConfig; -import javax.websocket.server.ServerEndpointConfig.Configurator; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.pong.PongMessageEndpoint; +import jakarta.websocket.DeploymentException; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpointConfig; +import jakarta.websocket.server.ServerEndpointConfig.Configurator; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint; public class PongContextListener implements ServletContextListener { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java index ce1d2d82d5be..52de6061cb2d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PongSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.nio.charset.StandardCharsets; -import javax.websocket.EndpointConfig; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.PongMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.PongMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.BufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java similarity index 91% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java index a1bef5dec69f..f42e2cc75698 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesBinaryEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesBinaryEchoTest.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.Hex; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; /** - * Test various {@link javax.websocket.Decoder.Binary Decoder.Binary} / {@link javax.websocket.Encoder.Binary Encoder.Binary} echo behavior of Java Primitives + * Test various {@link jakarta.websocket.Decoder.Binary Decoder.Binary} / {@link jakarta.websocket.Encoder.Binary Encoder.Binary} echo behavior of Java Primitives */ public class PrimitivesBinaryEchoTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java similarity index 96% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java index da646af8a582..67d709963bcb 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/PrimitivesTextEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PrimitivesTextEchoTest.java @@ -16,22 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; @@ -41,7 +42,7 @@ import org.slf4j.LoggerFactory; /** - * Test various {@link javax.websocket.Decoder.Text Decoder.Text} / {@link javax.websocket.Encoder.Text Encoder.Text} echo behavior of Java Primitives + * Test various {@link jakarta.websocket.Decoder.Text Decoder.Text} / {@link jakarta.websocket.Encoder.Text Encoder.Text} echo behavior of Java Primitives */ public class PrimitivesTextEchoTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java index 794b24709991..57c0c56a56fe 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ReaderEchoTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ReaderEchoTest.java @@ -16,23 +16,23 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.List; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; /** - * Test various {@link javax.websocket.Decoder.TextStream Decoder.TextStream} and {@link javax.websocket.Encoder.TextStream Encoder.TextStream} echo behavior of Java Readers + * Test various {@link jakarta.websocket.Decoder.TextStream Decoder.TextStream} and {@link jakarta.websocket.Encoder.TextStream Encoder.TextStream} echo behavior of Java Readers */ public class ReaderEchoTest { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java index f64f11814fc2..88cb602cecf7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/ServerDecoderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/ServerDecoderTest.java @@ -16,27 +16,27 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.net.URI; import java.util.Collections; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.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.websocket.javax.common.decoders.StringDecoder; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; -import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; +import org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -111,7 +111,7 @@ public void startServer() throws Exception ServletContextHandler servletContextHandler = new ServletContextHandler(null, "/"); server.setHandler(servletContextHandler); - JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, ((servletContext, serverContainer) -> + JakartaWebSocketServletContainerInitializer.configure(servletContextHandler, ((servletContext, serverContainer) -> { serverContainer.addEndpoint(AnnotatedEndpoint.class); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java similarity index 95% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java index 91ab10a03ed1..18b650d046c3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.net.URI; @@ -26,21 +26,21 @@ import java.util.Map; import java.util.function.Consumer; import java.util.stream.Stream; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; @@ -53,7 +53,7 @@ public class SessionTest public static class SessionInfoSocket { @OnMessage - public String onMessage(javax.websocket.Session session, String message) + public String onMessage(jakarta.websocket.Session session, String message) { if ("pathParams".equalsIgnoreCase(message)) { @@ -105,10 +105,10 @@ public String onMessage(javax.websocket.Session session, String message) public static class SessionInfoEndpoint extends Endpoint implements MessageHandler.Whole { - private javax.websocket.Session session; + private jakarta.websocket.Session session; @Override - public void onOpen(javax.websocket.Session session, EndpointConfig config) + public void onOpen(jakarta.websocket.Session session, EndpointConfig config) { this.session = session; this.session.addMessageHandler(this); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java similarity index 92% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java index 7a660cc421ac..6355e070d75f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/SessionTrackingTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/SessionTrackingTest.java @@ -16,20 +16,21 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.util.Collection; import java.util.concurrent.TimeUnit; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.util.BlockingArrayQueue; -import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainer; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -77,7 +78,7 @@ public void onMessage(Session session, String msg) throws IOException } private static LocalServer server; - private static JavaxWebSocketClientContainer client; + private static JakartaWebSocketClientContainer client; @BeforeAll public static void startServer() throws Exception @@ -86,7 +87,7 @@ public static void startServer() throws Exception server.start(); server.getServerContainer().addEndpoint(SessionTrackingSocket.class); - client = new JavaxWebSocketClientContainer(); + client = new JakartaWebSocketClientContainer(); client.start(); } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java index ce70a7f39d9e..ee9259c4bf6e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/StreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/StreamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.File; import java.io.FileInputStream; @@ -29,31 +29,32 @@ import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.CloseReason.CloseCode; -import javax.websocket.CloseReason.CloseCodes; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.HandshakeResponse; -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 javax.websocket.server.HandshakeRequest; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.CloseReason.CloseCode; +import jakarta.websocket.CloseReason.CloseCodes; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.Sha1Sum; +import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Sha1Sum; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -137,7 +138,7 @@ private void upload(String filename) throws Exception } finally { - JavaxWebSocketClientContainerProvider.stop(client); + JakartaWebSocketClientContainerProvider.stop(client); } } diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java index 046608a90f21..9db831cc2e07 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/TextStreamTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/TextStreamTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.Reader; @@ -30,28 +30,28 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.ClientEndpointConfig; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerContainer; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; +import jakarta.websocket.ClientEndpointConfig; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerContainer; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; import org.eclipse.jetty.util.BlockingArrayQueue; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.tests.DataUtils; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; -import org.eclipse.jetty.websocket.javax.tests.WSEndpointTracker; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.tests.DataUtils; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.WSEndpointTracker; import org.hamcrest.Matchers; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -229,7 +229,7 @@ public void testMessageOrderingDoNotReadToEOF() throws Exception QueuedTextStreamer serverEndpoint = Objects.requireNonNull(serverEndpoints.poll(5, TimeUnit.SECONDS)); int serverInputBufferSize = 1024; - JavaxWebSocketSession serverSession = (JavaxWebSocketSession)serverEndpoint.session; + JakartaWebSocketSession serverSession = (JakartaWebSocketSession)serverEndpoint.session; serverSession.getCoreSession().setInputBufferSize(serverInputBufferSize); // Write some initial data. diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java similarity index 89% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java index 2accaf59ce2c..ab2eb1070d67 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/UriTemplateParameterTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/UriTemplateParameterTest.java @@ -16,21 +16,21 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.CloseStatus; import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.OpCode; -import org.eclipse.jetty.websocket.javax.tests.Fuzzer; -import org.eclipse.jetty.websocket.javax.tests.LocalServer; +import org.eclipse.jetty.websocket.jakarta.tests.Fuzzer; +import org.eclipse.jetty.websocket.jakarta.tests.LocalServer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java index 9e40e26ab78c..cbbb82fecb03 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebAppClassLoaderTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebAppClassLoaderTest.java @@ -16,28 +16,28 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.nio.file.Path; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.websocket.CloseReason; -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 javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession; -import org.eclipse.jetty.websocket.javax.tests.EventSocket; -import org.eclipse.jetty.websocket.javax.tests.WSServer; +import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketSession; +import org.eclipse.jetty.websocket.jakarta.tests.EventSocket; +import org.eclipse.jetty.websocket.jakarta.tests.WSServer; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; @@ -131,7 +131,7 @@ public void testForWebAppClassLoader(String event) throws Exception EventSocket clientSocket = new EventSocket(); Session session = client.connectToServer(clientSocket, server.getWsUri().resolve("/app/echo")); session.getBasicRemote().sendText("trigger onMessage -> onError -> onClose"); - ((JavaxWebSocketSession)session).abort(); + ((JakartaWebSocketSession)session).abort(); assertTrue(clientSocket.closeLatch.await(5, TimeUnit.SECONDS)); awaitServerClose(); diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java similarity index 80% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java index 081037827e15..d555c056f577 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/WebSocketServerContainerExecutorTest.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java @@ -16,7 +16,7 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server; +package org.eclipse.jetty.websocket.jakarta.tests.server; import java.io.IOException; import java.io.InputStream; @@ -30,27 +30,27 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.EndpointConfig; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer; -import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer; -import org.eclipse.jetty.websocket.javax.tests.WSURI; +import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer; +import org.eclipse.jetty.websocket.jakarta.tests.WSURI; import org.junit.jupiter.api.Test; -import static org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE; +import static org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.HTTPCLIENT_ATTRIBUTE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.sameInstance; @@ -122,9 +122,9 @@ public static class ServerConnectServlet extends HttpServlet protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { // Server specific technique - javax.websocket.server.ServerContainer container = - (javax.websocket.server.ServerContainer) - req.getServletContext().getAttribute("javax.websocket.server.ServerContainer"); + jakarta.websocket.server.ServerContainer container = + (jakarta.websocket.server.ServerContainer) + req.getServletContext().getAttribute("jakarta.websocket.server.ServerContainer"); try { URI wsURI = WSURI.toWebsocket(req.getRequestURL()).resolve("/echo"); @@ -142,9 +142,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se } } - private Executor getJavaxServerContainerExecutor(ServletContextHandler servletContextHandler) + private Executor getJakartaServerContainerExecutor(ServletContextHandler servletContextHandler) { - JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer( + JakartaWebSocketServerContainer serverContainer = JakartaWebSocketServerContainer.getContainer( servletContextHandler.getServletContext()); return serverContainer.getExecutor(); } @@ -161,14 +161,14 @@ public void testClientExecutor() throws Exception //set httpClient on server HttpClient httpClient = new HttpClient(); - httpClient.setName("Javax-WebSocketServer@" + Integer.toHexString(httpClient.hashCode())); + httpClient.setName("Jakarta-WebSocketServer@" + Integer.toHexString(httpClient.hashCode())); httpClient.setExecutor(executor); server.addBean(httpClient, true); server.setAttribute(HTTPCLIENT_ATTRIBUTE, httpClient); // Using JSR356 Server Techniques to connectToServer() contextHandler.addServlet(ServerConnectServlet.class, "/connect"); - JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> container.addEndpoint(EchoSocket.class)); try @@ -177,7 +177,7 @@ public void testClientExecutor() throws Exception String response = doGet(server.getURI().resolve("/connect")); assertThat("Response", response, startsWith("Connected to ws://")); - Executor containerExecutor = getJavaxServerContainerExecutor(contextHandler); + Executor containerExecutor = getJakartaServerContainerExecutor(contextHandler); assertThat(containerExecutor, sameInstance(executor)); } finally @@ -198,7 +198,7 @@ public void testServerExecutor() throws Exception // Using JSR356 Server Techniques to connectToServer() contextHandler.addServlet(ServerConnectServlet.class, "/connect"); - JavaxWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> + JakartaWebSocketServletContainerInitializer.configure(contextHandler, (context, container) -> container.addEndpoint(EchoSocket.class)); try { @@ -206,7 +206,7 @@ public void testServerExecutor() throws Exception String response = doGet(server.getURI().resolve("/connect")); assertThat("Response", response, startsWith("Connected to ws://")); - Executor containerExecutor = getJavaxServerContainerExecutor(contextHandler); + Executor containerExecutor = getJakartaServerContainerExecutor(contextHandler); assertThat(containerExecutor, sameInstance(executor)); } finally diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java index 1037e6e8e3d8..8b41fb643ba8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/configs/EchoSocketConfigurator.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/configs/EchoSocketConfigurator.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.configs; +package org.eclipse.jetty.websocket.jakarta.tests.server.configs; import java.util.Collections; -import javax.websocket.HandshakeResponse; -import javax.websocket.server.HandshakeRequest; -import javax.websocket.server.ServerEndpointConfig; + +import jakarta.websocket.HandshakeResponse; +import jakarta.websocket.server.HandshakeRequest; +import jakarta.websocket.server.ServerEndpointConfig; public class EchoSocketConfigurator extends ServerEndpointConfig.Configurator { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java index f0e10464f7a5..2fe70eb98957 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicBinaryMessageByteBufferSocket.java @@ -16,11 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; import java.nio.ByteBuffer; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/basic") public class BasicBinaryMessageByteBufferSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java index d749fade6084..e26003e52f45 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSessionSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/close/reason/session") public class BasicCloseReasonSessionSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java index 2f88a7b2e6de..e03bd519b3a6 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseReasonSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseReasonSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/close/reason") public class BasicCloseReasonSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java index 1c9c8c98083f..c4348f48a151 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSessionReasonSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSessionReasonSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/close/session/reason") public class BasicCloseSessionReasonSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java index a3ea2a243d6f..890909268e4e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicCloseSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicCloseSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnClose; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnClose; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/close") public class BasicCloseSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java index 35a8c754c000..901b21dd551a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicEchoSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicEchoSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; /** * Annotated echo socket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java index 72465a614dce..7ee0698c7487 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/error/session") public class BasicErrorSessionSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java index 0ca9f6e090af..5a2d797e0c0e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSessionThrowableSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSessionThrowableSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/error/session/throwable") public class BasicErrorSessionThrowableSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java index 4219628a1eac..560beef881e2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/error") public class BasicErrorSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java index b504bb6af19e..4800f124a4c5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSessionSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/error/throwable/session") public class BasicErrorThrowableSessionSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java index a5a2df0495de..e664e9b04756 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicErrorThrowableSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicErrorThrowableSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/error/throwable") public class BasicErrorThrowableSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java index 0100981b7a66..556b111c9e87 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSessionSocket.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/basic") public class BasicOpenCloseSessionSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java index f7f7eece16ed..853ef5c4e47f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenCloseSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenCloseSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnOpen; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/basic") public class BasicOpenCloseSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java index deff1f6761ff..38201b8e34e0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSessionSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/onOpen/session") public class BasicOpenSessionSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java index d5bd497cc1a0..d70e36923e87 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicOpenSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicOpenSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnOpen; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/onOpen") public class BasicOpenSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java index 418a5d40d07f..5dabd084ca42 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicPongMessageSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicPongMessageSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnMessage; -import javax.websocket.PongMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.PongMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echo/pong") public class BasicPongMessageSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java index f4ddd4bf9acc..ed8fb9149ea7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/BasicTextMessageStringSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/BasicTextMessageStringSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/basic") public class BasicTextMessageStringSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java index 29f0b43fe494..faffa14bcf0f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ByteBufferSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ByteBufferSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; import java.io.IOException; import java.nio.ByteBuffer; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java index 7e4c15cff58b..cc9912e93242 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/ConfiguredEchoSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/ConfiguredEchoSocket.java @@ -16,20 +16,20 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; import java.nio.ByteBuffer; import java.util.Locale; -import javax.websocket.EndpointConfig; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; -import javax.websocket.server.ServerEndpointConfig; -import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.javax.tests.coders.TimeEncoder; -import org.eclipse.jetty.websocket.javax.tests.server.configs.EchoSocketConfigurator; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; +import jakarta.websocket.server.ServerEndpointConfig; +import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.jakarta.tests.coders.TimeEncoder; +import org.eclipse.jetty.websocket.jakarta.tests.server.configs.EchoSocketConfigurator; import static java.util.Comparator.naturalOrder; import static java.util.stream.Collectors.joining; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java index 62f885d837de..8b1b8fd76c1e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/DateTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/DateTextSocket.java @@ -16,22 +16,24 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; import java.io.IOException; import java.util.Date; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; -import org.eclipse.jetty.websocket.javax.tests.coders.DateDecoder; -import org.eclipse.jetty.websocket.javax.tests.coders.DateEncoder; +import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder; +import org.eclipse.jetty.websocket.jakarta.tests.coders.DateEncoder; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + @ServerEndpoint(value = "/echo/beans/date", decoders = {DateDecoder.class}, encoders = {DateEncoder.class}) public class DateTextSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java index fe1dadcdace5..fbe8e7cdb555 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenEndpoint.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; public class IdleTimeoutOnOpenEndpoint extends Endpoint implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java index a0f500739412..e418084270a1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/IdleTimeoutOnOpenSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/IdleTimeoutOnOpenSocket.java @@ -16,14 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; - -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException; @ServerEndpoint(value = "/idle-onopen-socket") diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java index 9bf08efa13cc..9fd2bced1d00 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidCloseIntSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidCloseIntSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnClose; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnClose; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidCloseIntSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java index a30d53d1a4b1..ad9f73931689 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorErrorSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorErrorSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidErrorErrorSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java index e9641d6df64c..5457224b279c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidErrorIntSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidErrorIntSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnError; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidErrorIntSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java index 81f8182896f2..e959606e443a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenCloseReasonSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenCloseReasonSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.CloseReason; -import javax.websocket.OnOpen; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidOpenCloseReasonSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java index 2ceb4b482c88..c10008f3c5e3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenIntSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenIntSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnOpen; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnOpen; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidOpenIntSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java index d1b087d94eae..66dc3857cad2 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/InvalidOpenSessionIntSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/InvalidOpenSessionIntSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/invalid") public class InvalidOpenSessionIntSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java index b1004a0b2250..122111bfd159 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/StatelessTextMessageStringSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/StatelessTextMessageStringSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/stateless") public class StatelessTextMessageStringSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java similarity index 93% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java index 1ef52879c42d..1fd7f7d5e43c 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/TrackingSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/TrackingSocket.java @@ -16,12 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingDeque; -import javax.websocket.CloseReason; + +import jakarta.websocket.CloseReason; public abstract class TrackingSocket { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java index 95001d54f3ce..e157420a641e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/binary/ByteBufferSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/binary/ByteBufferSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.binary; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.binary; import java.io.IOException; import java.nio.ByteBuffer; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.BufferUtil; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java index 83356059e812..375bef5f879b 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoEndpoint.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; /** * Example of websocket endpoint based on extending {@link Endpoint} diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java index 810630e94741..c055ecb0f863 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/BasicEchoSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/BasicEchoSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; /** * Annotated echo socket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java index aeec2baefe9e..d4f8acfbd180 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoAsyncTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoAsyncTextSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo/text/async") public class EchoAsyncTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java index 705771aebbef..683dd5e42251 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoBasicTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoBasicTextSocket.java @@ -16,14 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; import java.io.IOException; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo/text/basic") public class EchoBasicTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java index 01561d25b50a..3435bb46960f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnEndpoint.java @@ -16,15 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; import java.io.IOException; import java.util.concurrent.LinkedBlockingQueue; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/echoreturn") public class EchoReturnEndpoint diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java index f1e576445d04..ddf4597236ef 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoReturnTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoReturnTextSocket.java @@ -16,10 +16,10 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo/text/return") public class EchoReturnTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java similarity index 83% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java index 881882d75531..b4ac2e3c81dd 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessAsyncTextSocket.java @@ -16,11 +16,11 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo/text/async/stateless") public class EchoStatelessAsyncTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java index d335fae8434e..e8f7296f3573 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/EchoStatelessBasicTextSocket.java @@ -16,13 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; import java.io.IOException; -import javax.websocket.CloseReason; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/echo/text/basic/stateless") public class EchoStatelessBasicTextSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java index 291aab54a0d4..861d5fca0521 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoConfiguredSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoConfiguredSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; /** * Annotated echo socket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java similarity index 82% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java index 1eb5d6e234c1..590f135bc4e5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/echo/LargeEchoDefaultSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/echo/LargeEchoDefaultSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.echo; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; +import jakarta.websocket.server.ServerEndpoint; /** * Annotated echo socket (default behavior as defined from {@link WebSocketContainer#setDefaultMaxTextMessageBufferSize(int)}) diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java index 569c9b8c9834..4cba5845b782 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutEndpoint.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.Session; public class OnOpenIdleTimeoutEndpoint extends Endpoint implements MessageHandler.Whole { diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java similarity index 81% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java index caef4148749e..765aad53f7d7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/idletimeout/OnOpenIdleTimeoutSocket.java @@ -16,12 +16,12 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.idletimeout; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint(value = "/idle-onopen-socket") public class OnOpenIdleTimeoutSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java index 94e6748af765..6928418e737e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSessionSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSessionSocket.java @@ -16,14 +16,14 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java index 72b64f102ba3..bdc59093892f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java similarity index 81% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java index 27aaa397a827..fa7596ac52d9 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/partial/PartialTrackingSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/partial/PartialTrackingSocket.java @@ -16,13 +16,13 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.partial; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.partial; import java.io.IOException; -import javax.websocket.OnMessage; -import javax.websocket.server.ServerEndpoint; -import org.eclipse.jetty.websocket.javax.tests.server.sockets.TrackingSocket; +import jakarta.websocket.OnMessage; +import jakarta.websocket.server.ServerEndpoint; +import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.TrackingSocket; @ServerEndpoint("/echo/partial/tracking") public class PartialTrackingSocket extends TrackingSocket diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java index bec0b116ec8c..0635dfad7fd0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/pong/PongMessageEndpoint.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/pong/PongMessageEndpoint.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.pong; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong; import java.nio.charset.StandardCharsets; -import javax.websocket.Endpoint; -import javax.websocket.EndpointConfig; -import javax.websocket.MessageHandler; -import javax.websocket.PongMessage; -import javax.websocket.Session; +import jakarta.websocket.Endpoint; +import jakarta.websocket.EndpointConfig; +import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; +import jakarta.websocket.Session; import org.eclipse.jetty.util.BufferUtil; public class PongMessageEndpoint extends Endpoint implements MessageHandler.Whole diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java index 56f572f0aac5..cde3f3abd211 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextParamSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java index a7f0ffd1fdfb..5bab989c9a3f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java index c45c25059e97..a20d02538aed 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextParamSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextParamSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java index d73bafcdd787..0087d50fc0f7 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/BooleanTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/BooleanTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java index 676a29d955bc..c7ccbf23fb5e 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java index 014fc4e55eb1..4194be9c3484 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ByteTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ByteTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java index 471a5c7646d7..c0cf15cf3499 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java index 635ca8736cb8..6b2088f1d20a 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/CharacterObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/CharacterObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java index 24d3471b5e67..37f166e963a4 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleObjectTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; import java.util.Locale; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java index 2bb42b77d4b4..70ea23f086bd 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/DoubleTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/DoubleTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; import java.util.Locale; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java index 700cf6cb1e5d..6d1ff4ed89b8 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatObjectTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; import java.util.Locale; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java index a862539626e0..35ccde342d1d 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/FloatTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/FloatTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; import java.util.Locale; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java similarity index 84% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java index d82a0a2837fc..ec3c487cf847 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntParamTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntParamTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java index 8a0e05e712b8..3412d598d201 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java index e8aaa7f271f2..e45d64d7f4d3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectParamTextSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java index df438c93cf38..3fd8fbdecca3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/IntegerObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/IntegerObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java index 24c800e2d5aa..2ba91cbfc4d1 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java index e8850a95af95..ad2fc3b778e5 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/LongTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/LongTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java index c9cabf12fd65..c06419a3f281 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortObjectTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortObjectTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java index 8a6974b52e30..517ccc394cc0 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/primitives/ShortTextSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/primitives/ShortTextSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.primitives; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.primitives; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java similarity index 87% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java index 361f44c3bc71..82f55d534f36 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/InputStreamSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/InputStreamSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming; import java.io.IOException; import java.io.InputStream; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.StringUtil; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java index 113a51a1a9e2..f795f7455739 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderParamSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderParamSocket.java @@ -16,17 +16,17 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming; import java.io.IOException; import java.io.Reader; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java index 538ff9885996..2b686d71251f 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/ReaderSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/ReaderSocket.java @@ -16,15 +16,15 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming; import java.io.IOException; import java.io.Reader; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java similarity index 86% rename from jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java rename to jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java index 3e5176f92cf0..d46ee4b68b08 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/sockets/streaming/StringReturnReaderParamSocket.java +++ b/jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/sockets/streaming/StringReturnReaderParamSocket.java @@ -16,16 +16,16 @@ // ======================================================================== // -package org.eclipse.jetty.websocket.javax.tests.server.sockets.streaming; +package org.eclipse.jetty.websocket.jakarta.tests.server.sockets.streaming; import java.io.IOException; import java.io.Reader; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.util.IO; import org.slf4j.Logger; diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml similarity index 88% rename from jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml index f1723581a3ab..a15dd514c3e9 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/alt-filter-web.xml +++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/alt-filter-web.xml @@ -7,7 +7,7 @@ version="3.1"> - org.eclipse.jetty.websocket.javax.addDynamicFilter + org.eclipse.jetty.websocket.jakarta.addDynamicFilter false diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/basic-echo-endpoint-config-web.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/basic-echo-endpoint-config-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/basic-echo-endpoint-config-web.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png.sha similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/larger.png.sha rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/larger.png.sha diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg.sha similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/largest.jpg.sha rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/largest.jpg.sha diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png.sha similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/medium.png.sha rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/medium.png.sha diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha b/jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png.sha similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/data/small.png.sha rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/data/small.png.sha diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/empty-web.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/empty-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/empty-web.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/idle-timeout-config-web.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/idle-timeout-config-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/idle-timeout-config-web.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-jakarta-tests/src/test/resources/jetty-logging.properties similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/jetty-logging.properties rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/jetty-logging.properties diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/keystore.p12 b/jetty-websocket/websocket-jakarta-tests/src/test/resources/keystore.p12 similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/keystore.p12 rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/keystore.p12 diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/large-echo-config-web.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/large-echo-config-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/large-echo-config-web.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/logback-test.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/logback-test.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/logback-test.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/pong-config-web.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/pong-config-web.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/pong-config-web.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt b/jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-ben.txt similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/quotes-ben.txt rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-ben.txt diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt b/jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-twain.txt similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/quotes-twain.txt rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/quotes-twain.txt diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/resources/simple/jetty-websocket-httpclient.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/simple/jetty-websocket-httpclient.xml diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml similarity index 85% rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml index 1479493aff3e..de48b0a2e937 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-alt-config-via-listener.xml +++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-alt-config-via-listener.xml @@ -7,7 +7,7 @@ version="3.1"> - org.eclipse.jetty.websocket.javax.tests.server.InfoContextAltAttributeListener + org.eclipse.jetty.websocket.jakarta.tests.server.InfoContextAltAttributeListener diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml similarity index 75% rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml index d9811f6e0e5e..450dafb4f062 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-listener.xml +++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-listener.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - + - org.eclipse.jetty.websocket.javax + org.eclipse.jetty.websocket.jakarta false - org.eclipse.jetty.websocket.javax.tests.server.InfoContextAttributeListener + org.eclipse.jetty.websocket.jakarta.tests.server.InfoContextAttributeListener diff --git a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml similarity index 79% rename from jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml rename to jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml index f8c8fbf61e92..790993bedee3 100644 --- a/jetty-websocket/websocket-javax-tests/src/test/resources/wsuf-config-via-servlet-init.xml +++ b/jetty-websocket/websocket-jakarta-tests/src/test/resources/wsuf-config-via-servlet-init.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - + - org.eclipse.jetty.websocket.javax + org.eclipse.jetty.websocket.jakarta false info-servlet - org.eclipse.jetty.websocket.javax.tests.server.InfoServlet + org.eclipse.jetty.websocket.jakarta.tests.server.InfoServlet 1 diff --git a/jetty-websocket/websocket-javax-tests/src/test/webapp/index.html b/jetty-websocket/websocket-jakarta-tests/src/test/webapp/index.html similarity index 100% rename from jetty-websocket/websocket-javax-tests/src/test/webapp/index.html rename to jetty-websocket/websocket-jakarta-tests/src/test/webapp/index.html diff --git a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JsrUpgradeListener.java b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JsrUpgradeListener.java index 8ce0df47cdb3..9c3d1ba87113 100644 --- a/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JsrUpgradeListener.java +++ b/jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JsrUpgradeListener.java @@ -16,16 +16,20 @@ // ======================================================================== // +<<<<<<< HEAD:jetty-websocket/websocket-javax-client/src/main/java/org/eclipse/jetty/websocket/javax/client/internal/JsrUpgradeListener.java package org.eclipse.jetty.websocket.javax.client.internal; +======= +package org.eclipse.jetty.websocket.jakarta.client; +>>>>>>> Issue #4568 - use jakarta.websocket for jetty-11:jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JsrUpgradeListener.java import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Stream; -import javax.websocket.ClientEndpointConfig.Configurator; -import javax.websocket.HandshakeResponse; +import jakarta.websocket.ClientEndpointConfig.Configurator; +import jakarta.websocket.HandshakeResponse; import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.http.HttpFields; diff --git a/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider b/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider deleted file mode 100644 index 283ed9d2000e..000000000000 --- a/jetty-websocket/websocket-javax-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider \ No newline at end of file diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod deleted file mode 100644 index 2f0ae30c75b1..000000000000 --- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod +++ /dev/null @@ -1,25 +0,0 @@ -DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html - -[description] -Enable javax.websocket for deployed web applications. - -[tags] -websocket - -[depend] -client -annotations - -[lib] -lib/websocket/websocket-core-${jetty.version}.jar -lib/websocket/websocket-servlet-${jetty.version}.jar -lib/websocket/websocket-util-${jetty.version}.jar -lib/websocket/jetty-javax-websocket-api-1.1.2.jar -lib/websocket/websocket-javax-client-${jetty.version}.jar -lib/websocket/websocket-javax-common-${jetty.version}.jar -lib/websocket/websocket-javax-server-${jetty.version}.jar - -[jpms] -# The implementation needs to access method handles in -# classes that are in the web application classloader. -add-reads: org.eclipse.jetty.websocket.javax.common=ALL-UNNAMED diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer deleted file mode 100644 index 68d8b37077cc..000000000000 --- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer \ No newline at end of file diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator deleted file mode 100644 index e9f7fc540a4f..000000000000 --- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator \ No newline at end of file diff --git a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration b/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration deleted file mode 100644 index 9c5a60b0447d..000000000000 --- a/jetty-websocket/websocket-javax-server/src/main/resources/META-INF/services/org.eclipse.jetty.webapp.Configuration +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketConfiguration \ No newline at end of file diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java index faf36ac1a020..082a149c081a 100644 --- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java +++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java @@ -57,7 +57,7 @@ public static JettyWebSocketServerContainer getContainer(ServletContext servletC public static JettyWebSocketServerContainer ensureContainer(ServletContext servletContext) { - ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Javax Websocket"); + ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(servletContext, "Jakarta Websocket"); if (contextHandler.getServer() == null) throw new IllegalStateException("Server has not been set on the ServletContextHandler"); diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 64490b1009e1..ba24485ba6ff 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -75,7 +75,7 @@ org.eclipse.jetty.websocket:websocket-jetty-api - javax.websocket + jakarta.websocket @@ -114,7 +114,7 @@ - javax.websocket.servlet Implementation + jakarta.websocket.servlet Implementation org.eclipse.jetty.websocket.servlet.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" diff --git a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java index c09827cc608a..77291111ef76 100644 --- a/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java +++ b/jetty-websocket/websocket-util/src/main/java/org/eclipse/jetty/websocket/util/InvokerUtils.java @@ -238,7 +238,7 @@ private static MethodHandle mutatedInvoker(MethodHandles.Lookup lookup, Class } // Build up Arg list representing the MethodHandle parameters - // ParamIdentifier is used to find named parameters (like javax.websocket's @PathParam declaration) + // ParamIdentifier is used to find named parameters (like jakarta.websocket's @PathParam declaration) boolean hasNamedParamArgs = false; Arg[] parameterArgs = new Arg[parameterTypes.length + 1]; parameterArgs[0] = new Arg(targetClass); // first type is always the calling object instance type diff --git a/pom.xml b/pom.xml index db0836654d22..113ae5b23211 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 5.1.1.RELEASE 1.2 4.0.3 - 1.1.2 + 2.0.0-SNAPSHOT 9.0.29 9.4.8.Final 2.4.0 @@ -965,7 +965,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api ${websocket.api.version} @@ -1427,7 +1427,8 @@ snapshot-repositories - false + + true @@ -1437,6 +1438,9 @@ true + + false + oss.snapshots diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 2313cff53af0..e83c87fdc854 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -155,7 +155,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} test diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaSimpleEchoSocket.java similarity index 83% rename from tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java rename to tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaSimpleEchoSocket.java index a0b66e578ef2..11b34176ee2a 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxSimpleEchoSocket.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaSimpleEchoSocket.java @@ -19,24 +19,25 @@ package org.eclipse.jetty.test.websocket; import java.util.concurrent.CountDownLatch; -import javax.websocket.ClientEndpoint; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; + +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.junit.jupiter.api.Assertions.fail; -@ClientEndpoint( - subprotocols = {"chat"}) -public class JavaxSimpleEchoSocket +@ClientEndpoint(subprotocols = {"chat"}) +public class JakartaSimpleEchoSocket { - private static final Logger LOG = LoggerFactory.getLogger(JavaxSimpleEchoSocket.class); + private static final Logger LOG = LoggerFactory.getLogger(JakartaSimpleEchoSocket.class); + private Session session; public CountDownLatch messageLatch = new CountDownLatch(1); public CountDownLatch closeLatch = new CountDownLatch(1); diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java similarity index 89% rename from tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java rename to tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java index 0ec110f873de..c722e86ebb5a 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JavaxWebSocketTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java @@ -20,11 +20,11 @@ import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.websocket.ContainerProvider; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.WebSocketContainer; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.WebSocketContainer; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.test.support.XmlBasedJettyServer; import org.eclipse.jetty.websocket.api.util.WSURI; @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -public class JavaxWebSocketTest +public class JakartaWebSocketTest { private static XmlBasedJettyServer server; @@ -63,14 +63,14 @@ public static void tearDownServer() throws Exception @Test public void testChatEndpoint() throws Exception { - URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/test-jetty-webapp/javax.websocket")); + URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/test-jetty-webapp/jakarta.websocket")); WebSocketContainer container = ContainerProvider.getWebSocketContainer(); // to encourage client container to shutdown with server ... server.getServer().addBean(container, true); - JavaxSimpleEchoSocket socket = new JavaxSimpleEchoSocket(); + JakartaSimpleEchoSocket socket = new JakartaSimpleEchoSocket(); Session session = container.connectToServer(socket, uri); try { diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 1b1d884af945..878d5e8a509b 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -92,7 +92,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} test diff --git a/tests/test-webapps/test-bad-websocket-webapp/pom.xml b/tests/test-webapps/test-bad-websocket-webapp/pom.xml index 22654890250f..8a08863f4e63 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-bad-websocket-webapp/pom.xml @@ -16,11 +16,11 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.eclipse.jetty.websocket - websocket-javax-common + websocket-jakarta-common ${project.version} diff --git a/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnCloseServerEndpoint.java b/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnCloseServerEndpoint.java index 9b8f02aea2de..e4a9f7540b2e 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnCloseServerEndpoint.java +++ b/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnCloseServerEndpoint.java @@ -19,12 +19,13 @@ package org.eclipse.jetty.tests.webapp.websocket.bad; import java.io.IOException; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/badonclose/{arg}") public class BadOnCloseServerEndpoint diff --git a/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnOpenServerEndpoint.java b/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnOpenServerEndpoint.java index c0602e05ce43..537435735c67 100644 --- a/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnOpenServerEndpoint.java +++ b/tests/test-webapps/test-bad-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/bad/BadOnOpenServerEndpoint.java @@ -19,12 +19,13 @@ package org.eclipse.jetty.tests.webapp.websocket.bad; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; @ServerEndpoint("/badonopen/{arg}") public class BadOnOpenServerEndpoint diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 8f47855d2b92..cb3543b83e21 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -203,7 +203,7 @@ org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api provided @@ -220,7 +220,7 @@ org.eclipse.jetty.websocket - websocket-javax-server + websocket-jakarta-server ${project.version} test diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml index 0e49d7291461..320d7da61c1b 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml @@ -31,7 +31,7 @@ detected. - org.eclipse.jetty.websocket.javax + org.eclipse.jetty.websocket.jakarta true diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java similarity index 76% rename from tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java rename to tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java index 6b82bb80e259..3c044283547c 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JavaxWebSocketChat.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/JakartaWebSocketChat.java @@ -22,18 +22,19 @@ import java.util.List; import java.util.ListIterator; import java.util.concurrent.CopyOnWriteArrayList; -import javax.websocket.CloseReason; -import javax.websocket.OnClose; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; -@ServerEndpoint(value = "/javax.websocket/", subprotocols = {"chat"}) -public class JavaxWebSocketChat +import jakarta.websocket.CloseReason; +import jakarta.websocket.OnClose; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; + +@ServerEndpoint(value = "/jakarta.websocket/", subprotocols = {"chat"}) +public class JakartaWebSocketChat { - private static final List members = new CopyOnWriteArrayList<>(); + private static final List members = new CopyOnWriteArrayList<>(); volatile Session session; volatile RemoteEndpoint.Async remote; @@ -62,10 +63,10 @@ public void onMessage(String data) return; } - ListIterator iter = members.listIterator(); + ListIterator iter = members.listIterator(); while (iter.hasNext()) { - JavaxWebSocketChat member = iter.next(); + JakartaWebSocketChat member = iter.next(); // Test if member is now disconnected if (!member.session.isOpen()) diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html index 27a73903bbee..bb240f8f0659 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html +++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html @@ -36,7 +36,7 @@

Jetty Tests:

  • JSP: examples
    • diff --git a/tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html b/tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html similarity index 98% rename from tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html rename to tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html index 7172f47e824e..050a0b1e3efc 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/webapp/javax.websocket/index.html +++ b/tests/test-webapps/test-jetty-webapp/src/main/webapp/jakarta.websocket/index.html @@ -104,7 +104,7 @@

    -This is a demonstration of the Jetty's support for javax.websocket server sockets. +This is a demonstration of the Jetty's support for jakarta.websocket server sockets.

    diff --git a/tests/test-webapps/test-websocket-webapp/pom.xml b/tests/test-webapps/test-websocket-webapp/pom.xml index 0902ccbdf185..5e86343463b7 100644 --- a/tests/test-webapps/test-websocket-webapp/pom.xml +++ b/tests/test-webapps/test-websocket-webapp/pom.xml @@ -24,11 +24,11 @@     org.eclipse.jetty.toolchain - jetty-javax-websocket-api + jetty-jakarta-websocket-api org.eclipse.jetty.websocket - websocket-javax-common + websocket-jakarta-common ${project.version} diff --git a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java index 11467a865f4f..20a5a134ea5b 100644 --- a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java +++ b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnCloseServerEndpoint.java @@ -19,15 +19,17 @@ package org.eclipse.jetty.tests.webapp.websocket; import java.io.IOException; -import javax.websocket.OnClose; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnClose; +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + @ServerEndpoint("/onclose/{arg}") public class OnCloseServerEndpoint { diff --git a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java index 32b79f14a67b..d0fa2b92386e 100644 --- a/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java +++ b/tests/test-webapps/test-websocket-webapp/src/main/java/org/eclipse/jetty/tests/webapp/websocket/OnOpenServerEndpoint.java @@ -19,11 +19,12 @@ package org.eclipse.jetty.tests.webapp.websocket; import java.io.IOException; -import javax.websocket.OnError; -import javax.websocket.OnMessage; -import javax.websocket.OnOpen; -import javax.websocket.Session; -import javax.websocket.server.ServerEndpoint; + +import jakarta.websocket.OnError; +import jakarta.websocket.OnMessage; +import jakarta.websocket.OnOpen; +import jakarta.websocket.Session; +import jakarta.websocket.server.ServerEndpoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory;