Issue #4568 - rename websocket methods containing the name javax

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Mar 3, 2020 · 09e076d · 09e076d
1 parent 4b5c10d
commit 09e076d
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 58 deletions.
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
@@ -23,7 +23,7 @@
     <module>websocket-jetty-client</module>
     <module>websocket-jetty-server</module>
     <module>websocket-jetty-tests</module>
-    <!-- Javax WebSocket Implementation -->
+    <!-- Jakarta WebSocket Implementation -->
     <module>websocket-jakarta-common</module>
     <module>websocket-jakarta-client</module>
     <module>websocket-jakarta-server</module>

diff --git a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod
@@ -1,7 +1,7 @@
 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

diff --git a/...main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java b/...main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java
@@ -75,7 +75,7 @@ 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;
         });
     }
@@ -85,7 +85,7 @@ 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;
         });
     }

diff --git a/...org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java b/...org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java
@@ -58,6 +58,6 @@ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class<?> endpointClass,
         }
 
         JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
-        return discoverJavaxFrameHandlerMetadata(endpointClass, metadata);
+        return discoverJakartaFrameHandlerMetadata(endpointClass, metadata);
     }
 }
diff --git a/...n/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java b/...n/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketContainer.java
@@ -155,7 +155,7 @@ public Set<jakarta.websocket.Session> getOpenSessions()
 
     public JakartaWebSocketFrameHandler newFrameHandler(Object websocketPojo, UpgradeRequest upgradeRequest)
     {
-        return getFrameHandlerFactory().newJavaxWebSocketFrameHandler(websocketPojo, upgradeRequest);
+        return getFrameHandlerFactory().newJakartaWebSocketFrameHandler(websocketPojo, upgradeRequest);
     }
 
     /**

diff --git a/...rc/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java b/...rc/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
@@ -83,7 +83,7 @@ public class JakartaWebSocketFrameHandler implements FrameHandler
      * </p>
      * <p>
      * 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).
      * </p>
@@ -197,7 +197,7 @@ public void onOpen(CoreSession coreSession, Callback callback)
             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)

diff --git a/.../java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java b/.../java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java
@@ -146,7 +146,7 @@ public JakartaWebSocketFrameHandlerFactory(JakartaWebSocketContainer container,
 
     public abstract EndpointConfig newDefaultEndpointConfig(Class<?> endpointClass, String path);
 
-    public JakartaWebSocketFrameHandler newJavaxWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest)
+    public JakartaWebSocketFrameHandler newJakartaWebSocketFrameHandler(Object endpointInstance, UpgradeRequest upgradeRequest)
     {
         Object endpoint;
         EndpointConfig config;
@@ -364,10 +364,10 @@ public static MethodHandle wrapNonVoidReturnType(MethodHandle handle, JakartaWeb
 
         // 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;
@@ -408,7 +408,7 @@ protected JakartaWebSocketFrameHandlerMetadata createEndpointMetadata(Class<? ex
         return metadata;
     }
 
-    protected JakartaWebSocketFrameHandlerMetadata discoverJavaxFrameHandlerMetadata(Class<?> endpointClass, JakartaWebSocketFrameHandlerMetadata metadata)
+    protected JakartaWebSocketFrameHandlerMetadata discoverJakartaFrameHandlerMetadata(Class<?> endpointClass, JakartaWebSocketFrameHandlerMetadata metadata)
     {
         MethodHandles.Lookup lookup = getMethodHandleLookup(endpointClass);
         Method onmethod;

diff --git a/...mon/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java b/...mon/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java
@@ -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)

diff --git a/...main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java b/...main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSessionListener.java
@@ -20,7 +20,7 @@
 
 public interface JakartaWebSocketSessionListener
 {
-    void onJavaxWebSocketSessionOpened(JakartaWebSocketSession session);
+    void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session);
 
-    void onJavaxWebSocketSessionClosed(JakartaWebSocketSession session);
+    void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session);
 }
diff --git a/...karta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java b/...karta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/SessionTracker.java
@@ -41,13 +41,13 @@ public Set<Session> getSessions()
     }
 
     @Override
-    public void onJavaxWebSocketSessionOpened(JakartaWebSocketSession session)
+    public void onJakartaWebSocketSessionOpened(JakartaWebSocketSession session)
     {
         sessions.add(session);
     }
 
     @Override
-    public void onJavaxWebSocketSessionClosed(JakartaWebSocketSession session)
+    public void onJakartaWebSocketSessionClosed(JakartaWebSocketSession session)
     {
         sessions.remove(session);
     }

diff --git a/...stractJavaxWebSocketFrameHandlerTest.java → ...ractJakartaWebSocketFrameHandlerTest.java b/...stractJavaxWebSocketFrameHandlerTest.java → ...ractJakartaWebSocketFrameHandlerTest.java
@@ -29,7 +29,7 @@
 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);
@@ -65,6 +65,6 @@ protected JakartaWebSocketFrameHandler newJakartaFrameHandler(Object websocket)
         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/...on/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java b/...on/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java
@@ -51,6 +51,6 @@ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class<?> endpointClass,
         }
 
         JakartaWebSocketFrameHandlerMetadata metadata = new JakartaWebSocketFrameHandlerMetadata(endpointConfig);
-        return discoverJavaxFrameHandlerMetadata(endpointClass, metadata);
+        return discoverJakartaFrameHandlerMetadata(endpointClass, metadata);
     }
 }
diff --git a/...eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java b/...eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java
@@ -31,7 +31,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class JakartaWebSocketFrameHandlerBadSignaturesTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerBadSignaturesTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private void assertBadSocket(Object socket, String expectedString) throws Exception
     {

diff --git a/...a/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java b/...a/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnCloseTest.java
@@ -35,7 +35,7 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 
-public class JakartaWebSocketFrameHandlerOnCloseTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnCloseTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private static final String EXPECTED_REASON = "CloseReason[1000,Normal]";
 
@@ -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/...a/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java b/...a/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnErrorTest.java
@@ -32,7 +32,7 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 
-public class JakartaWebSocketFrameHandlerOnErrorTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnErrorTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private static final String EXPECTED_THROWABLE = "java.lang.RuntimeException: From Testcase";
 
@@ -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/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java b/...jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest.java
@@ -36,7 +36,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageBinaryStreamTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     @SuppressWarnings("Duplicates")
     private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function<JakartaWebSocketFrameHandler, Void> func) throws Exception

diff --git a/...lipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java b/...lipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageBinaryTest.java
@@ -40,7 +40,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class JakartaWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageBinaryTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private void assertOnMessageInvocation(TrackingSocket socket, Matcher<String> eventMatcher) throws Exception
     {
@@ -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/...e/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java b/...e/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextStreamTest.java
@@ -35,7 +35,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageTextStreamTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     @SuppressWarnings("Duplicates")
     private TrackingSocket performOnMessageInvocation(TrackingSocket socket, Function<JakartaWebSocketFrameHandler, Void> func) throws Exception

diff --git a/...eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java b/...eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnMessageTextTest.java
@@ -39,7 +39,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class JakartaWebSocketFrameHandlerOnMessageTextTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnMessageTextTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private void onText(TrackingSocket socket, String msg) throws Exception
     {
@@ -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/...va/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java b/...va/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerOnOpenTest.java
@@ -32,7 +32,7 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 
-public class JakartaWebSocketFrameHandlerOnOpenTest extends AbstractJavaxWebSocketFrameHandlerTest
+public class JakartaWebSocketFrameHandlerOnOpenTest extends AbstractJakartaWebSocketFrameHandlerTest
 {
     private void assertOnOpenInvocation(TrackingSocket socket, Matcher<String> eventMatcher) throws Exception
     {
@@ -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/...java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java b/...java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketConfiguration.java
@@ -39,7 +39,7 @@ public JakartaWebSocketConfiguration()
         addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
         protectAndExpose("org.eclipse.jetty.websocket.servlet."); // For WebSocketUpgradeFilter
         protectAndExpose("org.eclipse.jetty.websocket.jakarta.server.config.");
-        protectAndExpose("JavaxWebSocketClientContainerProvider");
+        protectAndExpose("JakartaWebSocketClientContainerProvider");
         hide("org.eclipse.jetty.websocket.jakarta.server.internal");
     }
 }
diff --git a/...se/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java b/...se/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java
@@ -50,7 +50,7 @@ public class JakartaWebSocketServletContainerInitializer implements ServletConta
      * The ServletContext attribute key name for the
      * ServerContainer per jakarta.websocket spec 1.0 final section 6.4 Programmatic Server Deployment
      */
-    public static final String ATTR_JAVAX_SERVER_CONTAINER = jakarta.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.jakarta";
     public static final String HTTPCLIENT_ATTRIBUTE = "org.eclipse.jetty.websocket.jakarta.HttpClient";
@@ -175,11 +175,11 @@ public void onStartup(Set<Class<?>> 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/...va/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java b/...va/org/eclipse/jetty/websocket/jakarta/server/internal/AnnotatedServerEndpointConfig.java
@@ -79,7 +79,7 @@ public AnnotatedServerEndpointConfig(JakartaWebSocketContainer containerScope, C
         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/.../org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java b/.../org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java
@@ -84,7 +84,7 @@ public static JakartaWebSocketServerContainer ensureContainer(ServletContext ser
 
                     // 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);

diff --git a/...se/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java b/...se/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerFrameHandlerFactory.java
@@ -54,12 +54,12 @@ public JakartaWebSocketFrameHandlerMetadata getMetadata(Class<?> endpointClass,
         UriTemplatePathSpec templatePathSpec = new UriTemplatePathSpec(anno.value());
         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 JakartaServerUpgradeRequest(upgradeRequest));
+        return newJakartaWebSocketFrameHandler(websocketPojo, new JakartaServerUpgradeRequest(upgradeRequest));
     }
 }