Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

demos/embedded/pom.xml

@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-bom/pom.xml

@@ -359,7 +359,7 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-util-server</artifactId>
+        <artifactId>websocket-servlet</artifactId>
         <version>11.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

jetty-gcloud/jetty-gcloud-session-manager/pom.xml

@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

jetty-home/pom.xml

@@ -620,7 +620,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -330,7 +330,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <artifactId>websocket-servlet</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java

@@ -193,8 +193,7 @@ public class TestOSGiUtil
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start());

jetty-websocket/pom.xml

@@ -28,9 +28,8 @@
     <module>websocket-jakarta-client</module>
     <module>websocket-jakarta-server</module>
     <module>websocket-jakarta-tests</module>
-    <!-- Common WebSocket Implementation -->
+    <!-- Common Servlet WebSocket Implementation -->
-    <module>websocket-util</module>
+    <module>websocket-servlet</module>
-    <module>websocket-util-server</module>
   </modules>
   <build>
     <plugins>

jetty-websocket/websocket-core-client/pom.xml

@@ -77,6 +77,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Export-Package>*,org.eclipse.jetty.websocket.core.client.internal.*</Export-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java

@@ -52,6 +52,8 @@ import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP;
+import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP2;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
@@ -281,7 +283,7 @@ public abstract class CoreClientUpgradeRequest extends HttpRequest implements Re
 
     public abstract FrameHandler getFrameHandler();
 
-    void requestComplete()
+    public void requestComplete()
     {
         // Add extensions header filtering out internal extensions and internal parameters.
         String extensionString = requestedExtensions.stream()

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java

@@ -32,6 +32,7 @@ import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
+import org.eclipse.jetty.websocket.core.client.internal.HttpClientProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpClientProvider.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -34,6 +34,7 @@ import org.eclipse.jetty.http.PreEncodedHttpField;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCore;
 
 public class HttpUpgraderOverHTTP implements HttpUpgrader

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/HttpUpgraderOverHTTP2.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import org.eclipse.jetty.client.HttpRequest;
 import org.eclipse.jetty.client.HttpResponse;
@@ -27,6 +27,7 @@ import org.eclipse.jetty.http.PreEncodedHttpField;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 
 public class HttpUpgraderOverHTTP2 implements HttpUpgrader
 {

jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.client;
+package org.eclipse.jetty.websocket.core.client.internal;
 
 import java.net.URL;
 
@@ -26,7 +26,7 @@ import org.eclipse.jetty.xml.XmlConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class XmlHttpClientProvider implements HttpClientProvider
+public class XmlHttpClientProvider implements HttpClientProvider
 {
     private static final Logger LOG = LoggerFactory.getLogger(XmlHttpClientProvider.class);
 

jetty-websocket/websocket-core-common/src/main/java/module-info.java

@@ -26,7 +26,27 @@ module org.eclipse.jetty.websocket.core.common
 {
     exports org.eclipse.jetty.websocket.core;
     exports org.eclipse.jetty.websocket.core.exception;
-    exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;
+
+    exports org.eclipse.jetty.websocket.core.internal to
+        org.eclipse.jetty.websocket.core.client,
+        org.eclipse.jetty.websocket.core.server;
+
+    // The Jetty & Jakarta API Layers need to access both access some internal utilities which we don't want to expose.
+    exports org.eclipse.jetty.websocket.core.internal.util to
+        org.eclipse.jetty.websocket.jetty.common,
+        org.eclipse.jetty.websocket.jetty.client,
+        org.eclipse.jetty.websocket.jetty.server,
+        org.eclipse.jetty.websocket.jakarta.common,
+        org.eclipse.jetty.websocket.jakarta.client,
+        org.eclipse.jetty.websocket.jakarta.server;
+
+    exports org.eclipse.jetty.websocket.core.internal.messages to
+        org.eclipse.jetty.websocket.jetty.common,
+        org.eclipse.jetty.websocket.jetty.client,
+        org.eclipse.jetty.websocket.jetty.server,
+        org.eclipse.jetty.websocket.jakarta.common,
+        org.eclipse.jetty.websocket.jakarta.client,
+        org.eclipse.jetty.websocket.jakarta.server;
 
     requires org.eclipse.jetty.http;
     requires transitive org.eclipse.jetty.io;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/DuplicateAnnotationException.java

@@ -16,11 +16,13 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.exception;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
+
 @SuppressWarnings("serial")
 public class DuplicateAnnotationException extends InvalidWebSocketException
 {

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidSignatureException.java

@@ -16,12 +16,14 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.exception;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
+
 @SuppressWarnings("serial")
 public class InvalidSignatureException extends InvalidWebSocketException
 {

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/InvalidWebSocketException.java

@@ -16,9 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.exception;
-
-import org.eclipse.jetty.websocket.core.exception.WebSocketException;
 
 /**
  * Indicating that the provided Class is not a valid WebSocket per the chosen API.

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/MessageHandler.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core;
+package org.eclipse.jetty.websocket.core.internal;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
@@ -27,6 +27,11 @@ import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.IteratingNestedCallback;
 import org.eclipse.jetty.util.Utf8Appendable;
 import org.eclipse.jetty.util.Utf8StringBuilder;
+import org.eclipse.jetty.websocket.core.CloseStatus;
+import org.eclipse.jetty.websocket.core.CoreSession;
+import org.eclipse.jetty.websocket.core.Frame;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
 import org.slf4j.Logger;
@@ -87,7 +92,7 @@ public class MessageHandler implements FrameHandler
         };
     }
 
-    protected static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);
 
     private CoreSession coreSession;
     private Utf8StringBuilder textMessageBuffer;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,8 +28,8 @@ 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.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
 
 public class ByteArrayMessageSink extends AbstractMessageSink
 {

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,8 +29,8 @@ 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.exception.InvalidSignatureException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
 
 public class ByteBufferMessageSink extends AbstractMessageSink
 {

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.Closeable;
 import java.lang.invoke.MethodHandle;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageInputStream.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.InputStream;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageOutputStream.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.OutputStream;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageReader.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.Reader;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.Frame;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/MessageWriter.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.io.IOException;
 import java.io.Writer;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.messages;
+package org.eclipse.jetty.websocket.core.internal.messages;
 
 import java.lang.invoke.MethodHandle;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/InvokerUtils.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/ReflectUtils.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodType;
@@ -31,6 +31,9 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+import org.eclipse.jetty.websocket.core.exception.DuplicateAnnotationException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
+
 public class ReflectUtils
 {
 

jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/util/TextUtils.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.internal.util;
 
 /**
  * Collection of utility methods for Text content

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/FrameHandlerFactory.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import org.eclipse.jetty.websocket.core.FrameHandler;
 

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.net.HttpCookie;
 import java.net.InetSocketAddress;
@@ -41,22 +41,19 @@ import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.internal.UpgradeHttpServletRequest;
 
-/**
- * Holder of request data for a WebSocket upgrade request.
- */
 public class ServerUpgradeRequest
 {
     private final URI requestURI;
     private final String queryString;
     private final UpgradeHttpServletRequest request;
     private final boolean secure;
-    private final Negotiation negotiation;
+    private final WebSocketNegotiation negotiation;
     private List<HttpCookie> cookies;
     private Map<String, List<String>> parameterMap;
 
-    public ServerUpgradeRequest(Negotiation negotiation) throws BadMessageException
+    public ServerUpgradeRequest(WebSocketNegotiation negotiation) throws BadMessageException
     {
         this.negotiation = negotiation;
         HttpServletRequest httpRequest = negotiation.getRequest();
@@ -114,7 +111,7 @@ public class ServerUpgradeRequest
 
     /**
      * @return The extensions offered
-     * @see Negotiation#getOfferedExtensions()
+     * @see WebSocketNegotiation#getOfferedExtensions()
      */
     public List<ExtensionConfig> getExtensions()
     {

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,17 +31,13 @@ import java.util.stream.Collectors;
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
 
-/**
- * Servlet Specific UpgradeResponse implementation.
- */
 public class ServerUpgradeResponse
 {
     private final HttpServletResponse response;
-    private final Negotiation negotiation;
+    private final WebSocketNegotiation negotiation;
 
-    public ServerUpgradeResponse(Negotiation negotiation)
+    public ServerUpgradeResponse(WebSocketNegotiation negotiation)
     {
         this.negotiation = negotiation;
         this.response = negotiation.getResponse();

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketCreator.java

@@ -16,13 +16,13 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 /**
  * Abstract WebSocket creator interface.
  * <p>
- * Should you desire filtering of the WebSocket object creation due to criteria such as origin or sub-protocol, then you will be required to implement a custom
+ * Should you desire filtering of the WebSocket object creation due to criteria such as origin or sub-protocol,
- * WebSocketCreator implementation.
+ * then you will be required to implement a custom WebSocketCreator implementation.
  * </p>
  */
 public interface WebSocketCreator

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketMappings.java

@@ -16,10 +16,9 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
 import jakarta.servlet.ServletContext;
@@ -39,10 +38,9 @@ import org.eclipse.jetty.websocket.core.CoreSession;
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
+import org.eclipse.jetty.websocket.core.server.internal.CreatorNegotiator;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.internal.Handshaker;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
+import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
-import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,20 +59,14 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketMappings.class);
     public static final String WEBSOCKET_MAPPING_ATTRIBUTE = WebSocketMappings.class.getName();
 
-    public static WebSocketMappings getMapping(ServletContext servletContext)
+    public static WebSocketMappings getWebSocketNegotiator(ServletContext servletContext)
     {
         return (WebSocketMappings)servletContext.getAttribute(WEBSOCKET_MAPPING_ATTRIBUTE);
     }
 
-    public WebSocketCreator getMapping(PathSpec pathSpec)
+    public static WebSocketMappings ensureMappings(ServletContext servletContext)
     {
-        Negotiator cn = mappings.get(pathSpec);
+        WebSocketMappings mapping = getWebSocketNegotiator(servletContext);
-        return cn == null ? null : cn.getWebSocketCreator();
-    }
-
-    public static WebSocketMappings ensureMapping(ServletContext servletContext)
-    {
-        WebSocketMappings mapping = getMapping(servletContext);
         if (mapping == null)
         {
             mapping = new WebSocketMappings(WebSocketServerComponents.getWebSocketComponents(servletContext));
@@ -123,9 +115,9 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
         throw new IllegalArgumentException("Unrecognized path spec syntax [" + rawSpec + "]");
     }
 
-    private final PathMappings<Negotiator> mappings = new PathMappings<>();
+    private final PathMappings<WebSocketNegotiator> mappings = new PathMappings<>();
     private final WebSocketComponents components;
-    private final Handshaker handshaker = Handshaker.newInstance();
+    private final Handshaker handshaker = new HandshakerSelector();
 
     public WebSocketMappings()
     {
@@ -161,6 +153,19 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
         Dumpable.dumpObjects(out, indent, this, mappings);
     }
 
+    public WebSocketNegotiator getWebSocketNegotiator(PathSpec pathSpec)
+    {
+        return mappings.get(pathSpec);
+    }
+
+    public WebSocketCreator getWebSocketCreator(PathSpec pathSpec)
+    {
+        WebSocketNegotiator negotiator = getWebSocketNegotiator(pathSpec);
+        if (negotiator instanceof CreatorNegotiator)
+            return  ((CreatorNegotiator)negotiator).getWebSocketCreator();
+        return null;
+    }
+
     /**
      * Manually add a WebSocket mapping.
      * <p>
@@ -171,12 +176,28 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
      *
      * @param pathSpec the pathspec to respond on
      * @param creator the websocket creator to activate on the provided mapping.
-     * @param factory the factory to use to create a FrameHandler for the websocket
+     * @param factory the factory to use to create a FrameHandler for the websocket.
      * @param customizer the customizer to use to customize the WebSocket session.
      */
     public void addMapping(PathSpec pathSpec, WebSocketCreator creator, FrameHandlerFactory factory, Configuration.Customizer customizer) throws WebSocketException
     {
-        mappings.put(pathSpec, new Negotiator(creator, factory, customizer));
+        mappings.put(pathSpec, new CreatorNegotiator(creator, factory, customizer));
+    }
+
+    /**
+     * Manually add a WebSocket mapping.
+     * <p>
+     * If mapping is added before this configuration is started, then it is persisted through
+     * stop/start of this configuration's lifecycle.  Otherwise it will be removed when
+     * this configuration is stopped.
+     * </p>
+     *
+     * @param pathSpec the pathspec to respond on
+     * @param negotiator the WebSocketNegotiator to use to create a FrameHandler for the websocket.
+     */
+    public void addMapping(PathSpec pathSpec, WebSocketNegotiator negotiator) throws WebSocketException
+    {
+        mappings.put(pathSpec, negotiator);
     }
 
     public boolean removeMapping(PathSpec pathSpec)
@@ -193,7 +214,7 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
      */
     public WebSocketNegotiator getMatchedNegotiator(String target, Consumer<PathSpec> pathSpecConsumer)
     {
-        MappedResource<Negotiator> mapping = this.mappings.getMatch(target);
+        MappedResource<WebSocketNegotiator> mapping = this.mappings.getMatch(target);
         if (mapping == null)
             return null;
 
@@ -224,59 +245,6 @@ public class WebSocketMappings implements Dumpable, LifeCycle.Listener
             LOG.debug("WebSocket Negotiated detected on {} for endpoint {}", target, negotiator);
 
         // We have an upgrade request
-        return handshaker.upgradeRequest(negotiator, request, response, defaultCustomizer);
+        return handshaker.upgradeRequest(negotiator, request, response, components, defaultCustomizer);
-    }
-
-    private class Negotiator extends WebSocketNegotiator.AbstractNegotiator
-    {
-        private final WebSocketCreator creator;
-        private final FrameHandlerFactory factory;
-
-        public Negotiator(WebSocketCreator creator, FrameHandlerFactory factory, Configuration.Customizer customizer)
-        {
-            super(components, customizer);
-            this.creator = creator;
-            this.factory = factory;
-        }
-
-        public WebSocketCreator getWebSocketCreator()
-        {
-            return creator;
-        }
-
-        @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
-        {
-            ServletContext servletContext = negotiation.getRequest().getServletContext();
-            if (servletContext == null)
-                throw new IllegalStateException("null servletContext from request");
-
-            ServerUpgradeRequest upgradeRequest = new ServerUpgradeRequest(negotiation);
-            ServerUpgradeResponse upgradeResponse = new ServerUpgradeResponse(negotiation);
-
-            AtomicReference<Object> result = new AtomicReference<>();
-            ((ContextHandler.Context)servletContext).getContextHandler().handle(() ->
-                result.set(creator.createWebSocket(upgradeRequest, upgradeResponse)));
-            Object websocketPojo = result.get();
-
-            // Handling for response forbidden (and similar paths)
-            if (upgradeResponse.isCommitted())
-                return null;
-
-            if (websocketPojo == null)
-            {
-                // no creation, sorry
-                upgradeResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, "WebSocket Endpoint Creation Refused");
-                return null;
-            }
-
-            return factory.newFrameHandler(websocketPojo, upgradeRequest, upgradeResponse);
-        }
-
-        @Override
-        public String toString()
-        {
-            return String.format("%s@%x{%s,%s,%s}", getClass().getSimpleName(), hashCode(), creator, factory, getCustomizer());
-        }
     }
 }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiation.java

@@ -33,9 +33,8 @@ import org.eclipse.jetty.http.QuotedCSV;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
 
-public abstract class Negotiation
+public abstract class WebSocketNegotiation
 {
     private final Request baseRequest;
     private final HttpServletRequest request;
@@ -45,10 +44,9 @@ public abstract class Negotiation
     private List<ExtensionConfig> offeredExtensions;
     private List<ExtensionConfig> negotiatedExtensions;
     private List<String> offeredProtocols;
-    private ExtensionStack extensionStack;
     private String protocol;
 
-    public Negotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    public WebSocketNegotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         this.baseRequest = baseRequest;
         this.request = request;
@@ -180,7 +178,6 @@ public abstract class Negotiation
         if (extensions == offeredExtensions)
             return;
         negotiatedExtensions = extensions;
-        extensionStack = null;
     }
 
     @Override

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java

@@ -21,77 +21,41 @@ package org.eclipse.jetty.websocket.core.server;
 import java.io.IOException;
 import java.util.function.Function;
 
-import org.eclipse.jetty.io.ByteBufferPool;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
 
 public interface WebSocketNegotiator extends Configuration.Customizer
 {
-    FrameHandler negotiate(Negotiation negotiation) throws IOException;
+    FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException;
 
-    WebSocketExtensionRegistry getExtensionRegistry();
+    static WebSocketNegotiator from(Function<WebSocketNegotiation, FrameHandler> negotiate)
-
-    DecoratedObjectFactory getObjectFactory();
-
-    ByteBufferPool getByteBufferPool();
-
-    WebSocketComponents getWebSocketComponents();
-
-    static WebSocketNegotiator from(Function<Negotiation, FrameHandler> negotiate)
     {
-        return new AbstractNegotiator()
+        return from(negotiate, null);
+    }
+
+    static WebSocketNegotiator from(Function<WebSocketNegotiation, FrameHandler> negotiate, Configuration.Customizer customizer)
+    {
+        return new AbstractNegotiator(customizer)
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation)
+            public FrameHandler negotiate(WebSocketNegotiation negotiation)
             {
                 return negotiate.apply(negotiation);
             }
         };
     }
 
-    static WebSocketNegotiator from(Function<Negotiation, FrameHandler> negotiate, Configuration.Customizer customizer)
+    abstract class AbstractNegotiator extends Configuration.ConfigurationCustomizer implements WebSocketNegotiator
     {
-        return new AbstractNegotiator(null, customizer)
-        {
-            @Override
-            public FrameHandler negotiate(Negotiation negotiation)
-            {
-                return negotiate.apply(negotiation);
-            }
-        };
-    }
-
-    static WebSocketNegotiator from(
-        Function<Negotiation, FrameHandler> negotiate,
-        WebSocketComponents components,
-        Configuration.Customizer customizer)
-    {
-        return new AbstractNegotiator(components, customizer)
-        {
-            @Override
-            public FrameHandler negotiate(Negotiation negotiation)
-            {
-                return negotiate.apply(negotiation);
-            }
-        };
-    }
-
-    abstract class AbstractNegotiator implements WebSocketNegotiator
-    {
-        final WebSocketComponents components;
         final Configuration.Customizer customizer;
 
         public AbstractNegotiator()
         {
-            this(null, null);
+            this(null);
         }
 
-        public AbstractNegotiator(WebSocketComponents components, Configuration.Customizer customizer)
+        public AbstractNegotiator(Configuration.Customizer customizer)
         {
-            this.components = components == null ? new WebSocketComponents() : components;
             this.customizer = customizer;
         }
 
@@ -100,35 +64,7 @@ public interface WebSocketNegotiator extends Configuration.Customizer
         {
             if (customizer != null)
                 customizer.customize(configurable);
-        }
+            super.customize(configurable);
-
-        @Override
-        public WebSocketExtensionRegistry getExtensionRegistry()
-        {
-            return components.getExtensionRegistry();
-        }
-
-        @Override
-        public DecoratedObjectFactory getObjectFactory()
-        {
-            return components.getObjectFactory();
-        }
-
-        @Override
-        public ByteBufferPool getByteBufferPool()
-        {
-            return components.getBufferPool();
-        }
-
-        @Override
-        public WebSocketComponents getWebSocketComponents()
-        {
-            return components;
-        }
-
-        public Configuration.Customizer getCustomizer()
-        {
-            return customizer;
         }
     }
 }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java

@@ -19,65 +19,46 @@
 package org.eclipse.jetty.websocket.core.server;
 
 import java.io.IOException;
-import java.util.Objects;
-import java.util.function.Function;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.http.pathmap.PathSpecSet;
+import org.eclipse.jetty.http.pathmap.PathSpec;
+import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.Configuration;
-import org.slf4j.Logger;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.slf4j.LoggerFactory;
 
 public class WebSocketUpgradeHandler extends HandlerWrapper
 {
-    private static final Logger LOG = LoggerFactory.getLogger(WebSocketUpgradeHandler.class);
+    private final WebSocketMappings mappings;
-    final Handshaker handshaker = Handshaker.newInstance();
+    private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
-    final PathSpecSet paths = new PathSpecSet();
-    final WebSocketNegotiator negotiator;
 
-    public WebSocketUpgradeHandler(
+    public WebSocketUpgradeHandler()
-        Function<Negotiation, FrameHandler> negotiate,
-        String... pathSpecs)
     {
-        this(WebSocketNegotiator.from(negotiate), pathSpecs);
+        this(new WebSocketComponents());
     }
 
-    public WebSocketUpgradeHandler(WebSocketNegotiator negotiator, String... pathSpecs)
+    public WebSocketUpgradeHandler(WebSocketComponents components)
     {
-        this.negotiator = Objects.requireNonNull(negotiator);
+        this.mappings = new WebSocketMappings(components);
-        addPathSpec(pathSpecs);
     }
 
-    public WebSocketNegotiator getWebSocketNegotiator()
+    public void addMapping(String pathSpec, WebSocketNegotiator negotiator)
     {
-        return negotiator;
+        mappings.addMapping(new ServletPathSpec(pathSpec), negotiator);
     }
 
-    public void addPathSpec(String... pathSpecs)
+    public void addMapping(PathSpec pathSpec, WebSocketNegotiator negotiator)
     {
-        if (pathSpecs != null)
+        mappings.addMapping(pathSpec, negotiator);
-        {
-            for (String spec : pathSpecs)
-            {
-                this.paths.add(spec);
-            }
-        }
     }
 
     @Override
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
-        if (!paths.isEmpty() && !paths.test(target))
+        if (mappings.upgrade(request, response, customizer))
-        {
-            super.handle(target, baseRequest, request, response);
-            return;
-        }
-
-        if (handshaker.upgradeRequest(negotiator, request, response, null))
             return;
 
         if (!baseRequest.isHandled())

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java

@@ -47,8 +47,7 @@ import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
 import org.eclipse.jetty.websocket.core.internal.Negotiated;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,13 +58,12 @@ public abstract class AbstractHandshaker implements Handshaker
     private static final HttpField SERVER_VERSION = new PreEncodedHttpField(HttpHeader.SERVER, HttpConfiguration.SERVER_VERSION);
 
     @Override
-    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException
+    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException
     {
         if (!validateRequest(request))
             return false;
 
-        WebSocketComponents components = negotiator.getWebSocketComponents();
+        WebSocketNegotiation negotiation = newNegotiation(request, response, components);
-        Negotiation negotiation = newNegotiation(request, response, components);
         if (LOG.isDebugEnabled())
             LOG.debug("negotiation {}", negotiation);
         negotiation.negotiate();
@@ -173,11 +171,11 @@ public abstract class AbstractHandshaker implements Handshaker
 
     protected abstract boolean validateRequest(HttpServletRequest request);
 
-    protected abstract Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents);
+    protected abstract WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents);
 
     protected abstract boolean validateFrameHandler(FrameHandler frameHandler, HttpServletResponse response);
 
-    protected boolean validateNegotiation(Negotiation negotiation)
+    protected boolean validateNegotiation(WebSocketNegotiation negotiation)
     {
         if (!negotiation.validateHeaders())
         {
@@ -219,5 +217,5 @@ public abstract class AbstractHandshaker implements Handshaker
         return new WebSocketConnection(endPoint, executor, scheduler, byteBufferPool, coreSession);
     }
 
-    protected abstract void prepareResponse(Response response, Negotiation negotiation);
+    protected abstract void prepareResponse(Response response, WebSocketNegotiation negotiation);
 }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/CreatorNegotiator.java

@@ -0,0 +1,86 @@
+//
+// ========================================================================
+// 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.core.server.internal;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicReference;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.websocket.core.FrameHandler;
+import org.eclipse.jetty.websocket.core.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeRequest;
+import org.eclipse.jetty.websocket.core.server.ServerUpgradeResponse;
+import org.eclipse.jetty.websocket.core.server.WebSocketCreator;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
+
+public class CreatorNegotiator extends WebSocketNegotiator.AbstractNegotiator
+{
+    private final WebSocketCreator creator;
+    private final FrameHandlerFactory factory;
+
+    public CreatorNegotiator(WebSocketCreator creator, FrameHandlerFactory factory, Customizer customizer)
+    {
+        super(customizer);
+        this.creator = creator;
+        this.factory = factory;
+    }
+
+    public WebSocketCreator getWebSocketCreator()
+    {
+        return creator;
+    }
+
+    @Override
+    public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
+    {
+        ServletContext servletContext = negotiation.getRequest().getServletContext();
+        if (servletContext == null)
+            throw new IllegalStateException("null servletContext from request");
+
+        ServerUpgradeRequest upgradeRequest = new ServerUpgradeRequest(negotiation);
+        ServerUpgradeResponse upgradeResponse = new ServerUpgradeResponse(negotiation);
+
+        AtomicReference<Object> result = new AtomicReference<>();
+        ((ContextHandler.Context)servletContext).getContextHandler().handle(() ->
+            result.set(creator.createWebSocket(upgradeRequest, upgradeResponse)));
+        Object websocketPojo = result.get();
+
+        // Handling for response forbidden (and similar paths)
+        if (upgradeResponse.isCommitted())
+            return null;
+
+        if (websocketPojo == null)
+        {
+            // no creation, sorry
+            upgradeResponse.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, "WebSocket Endpoint Creation Refused");
+            return null;
+        }
+
+        return factory.newFrameHandler(websocketPojo, upgradeRequest, upgradeResponse);
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x{%s,%s}", getClass().getSimpleName(), hashCode(), creator, factory);
+    }
+}

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/Handshaker.java

@@ -16,21 +16,17 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.core.server;
+package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.IOException;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.server.internal.HandshakerSelector;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 public interface Handshaker
 {
-    static Handshaker newInstance()
+    boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException;
-    {
-        return new HandshakerSelector();
-    }
-
-    boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException;
 }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.server.Handshaker;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
 /**
@@ -37,10 +37,10 @@ public class HandshakerSelector implements Handshaker
     private final RFC8441Handshaker rfc8441 = new RFC8441Handshaker();
 
     @Override
-    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, Configuration.Customizer defaultCustomizer) throws IOException
+    public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components, Configuration.Customizer defaultCustomizer) throws IOException
     {
         // Try HTTP/1.1 WS upgrade, if this fails try an HTTP/2 WS upgrade if no response was committed.
-        return rfc6455.upgradeRequest(negotiator, request, response, defaultCustomizer) ||
+        return rfc6455.upgradeRequest(negotiator, request, response, components, defaultCustomizer) ||
-            !response.isCommitted() && rfc8441.upgradeRequest(negotiator, request, response, defaultCustomizer);
+            !response.isCommitted() && rfc8441.upgradeRequest(negotiator, request, response, components, defaultCustomizer);
     }
 }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java

@@ -36,7 +36,7 @@ import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCore;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
 public final class RFC6455Handshaker extends AbstractHandshaker
 {
@@ -64,13 +64,13 @@ public final class RFC6455Handshaker extends AbstractHandshaker
     }
 
     @Override
-    protected Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    protected WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         return new RFC6455Negotiation(Request.getBaseRequest(request), request, response, webSocketComponents);
     }
 
     @Override
-    protected boolean validateNegotiation(Negotiation negotiation)
+    protected boolean validateNegotiation(WebSocketNegotiation negotiation)
     {
         boolean result = super.validateNegotiation(negotiation);
         if (!result)
@@ -102,7 +102,7 @@ public final class RFC6455Handshaker extends AbstractHandshaker
     }
 
     @Override
-    protected void prepareResponse(Response response, Negotiation negotiation)
+    protected void prepareResponse(Response response, WebSocketNegotiation negotiation)
     {
         response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS);
         HttpFields.Mutable responseFields = response.getHttpFields();

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java

@@ -26,9 +26,9 @@ import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.QuotedCSV;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
-public class RFC6455Negotiation extends Negotiation
+public class RFC6455Negotiation extends WebSocketNegotiation
 {
     private boolean successful;
     private String key;

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java

@@ -32,7 +32,7 @@ import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.internal.WebSocketConnection;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
 public class RFC8441Handshaker extends AbstractHandshaker
 {
@@ -57,7 +57,7 @@ public class RFC8441Handshaker extends AbstractHandshaker
     }
 
     @Override
-    protected Negotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
+    protected WebSocketNegotiation newNegotiation(HttpServletRequest request, HttpServletResponse response, WebSocketComponents webSocketComponents)
     {
         return new RFC8441Negotiation(Request.getBaseRequest(request), request, response, webSocketComponents);
     }
@@ -86,7 +86,7 @@ public class RFC8441Handshaker extends AbstractHandshaker
     }
 
     @Override
-    protected void prepareResponse(Response response, Negotiation negotiation)
+    protected void prepareResponse(Response response, WebSocketNegotiation negotiation)
     {
         response.setStatus(HttpStatus.OK_200);
     }

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java

@@ -24,9 +24,9 @@ import org.eclipse.jetty.http.BadMessageException;
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 
-public class RFC8441Negotiation extends Negotiation
+public class RFC8441Negotiation extends WebSocketNegotiation
 {
     public RFC8441Negotiation(Request baseRequest, HttpServletRequest request, HttpServletResponse response, WebSocketComponents components) throws BadMessageException
     {

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util.server.internal;
+package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.BufferedReader;
 import java.net.InetSocketAddress;

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java

@@ -29,6 +29,11 @@ public class EchoFrameHandler extends TestAsyncFrameHandler
         throwOnFrame = true;
     }
 
+    public EchoFrameHandler()
+    {
+        super(EchoFrameHandler.class.getName());
+    }
+
     public EchoFrameHandler(String name)
     {
         super(name);
@@ -48,7 +53,7 @@ public class EchoFrameHandler extends TestAsyncFrameHandler
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("[{}] echoDataFrame {}", name, frame);
-            Frame echo = Frame.copy(frame).setMask(null);
+            Frame echo = new Frame(frame.getOpCode(), frame.isFin(), frame.getPayload());
             coreSession.sendFrame(echo, callback, false);
         }
         else

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java

@@ -48,7 +48,7 @@ public class FlushTest
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverHandler);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler);
         server = new WebSocketServer(negotiator);
         client = new WebSocketCoreClient(null, components);
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java

@@ -47,7 +47,7 @@ public class FrameBufferTest extends WebSocketTester
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverHandler);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler);
         server = new WebSocketServer(negotiator);
         client = new WebSocketCoreClient(null, components);
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java

@@ -31,6 +31,7 @@ import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
 import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java

@@ -24,6 +24,7 @@ import java.util.concurrent.CountDownLatch;
 
 import org.eclipse.jetty.util.BlockingArrayQueue;
 import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java

@@ -1,49 +0,0 @@
-//
-// ========================================================================
-// 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.core;
-
-import java.io.IOException;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
-
-public class TestUpgradeHandler extends WebSocketUpgradeHandler
-{
-    public TestUpgradeHandler(WebSocketNegotiator negotiator)
-    {
-        super(negotiator);
-        setHandler(new AbstractHandler()
-        {
-            @Override
-            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException
-            {
-                response.setStatus(200);
-                response.setContentType("text/plain");
-                response.getOutputStream().println("Test WS Upgrade Handler!");
-                baseRequest.setHandled(true);
-            }
-        });
-    }
-}

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java

@@ -21,29 +21,26 @@ package org.eclipse.jetty.websocket.core;
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.jetty.io.ByteBufferPool;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
-import org.eclipse.jetty.util.DecoratedObjectFactory;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 
-public class TestWebSocketNegotiator implements WebSocketNegotiator
+public class TestWebSocketNegotiator extends WebSocketNegotiator.AbstractNegotiator
 {
-    final WebSocketComponents components;
     private final FrameHandler frameHandler;
 
     public TestWebSocketNegotiator(FrameHandler frameHandler)
     {
-        this (frameHandler, new WebSocketComponents());
+        this(frameHandler, null);
     }
 
-    public TestWebSocketNegotiator(FrameHandler frameHandler, WebSocketComponents components)
+    public TestWebSocketNegotiator(FrameHandler frameHandler, Configuration.Customizer customizer)
     {
-        this.components = components;
+        super(customizer);
         this.frameHandler = frameHandler;
     }
 
     @Override
-    public FrameHandler negotiate(Negotiation negotiation) throws IOException
+    public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
     {
         List<String> offeredSubprotocols = negotiation.getOfferedSubprotocols();
         if (!offeredSubprotocols.isEmpty())
@@ -51,33 +48,4 @@ public class TestWebSocketNegotiator implements WebSocketNegotiator
 
         return frameHandler;
     }
-
-    @Override
-    public void customize(Configuration configurable)
-    {
-    }
-
-    @Override
-    public WebSocketExtensionRegistry getExtensionRegistry()
-    {
-        return components.getExtensionRegistry();
-    }
-
-    @Override
-    public DecoratedObjectFactory getObjectFactory()
-    {
-        return components.getObjectFactory();
-    }
-
-    @Override
-    public ByteBufferPool getByteBufferPool()
-    {
-        return components.getBufferPool();
-    }
-
-    @Override
-    public WebSocketComponents getWebSocketComponents()
-    {
-        return components;
-    }
 }

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java

@@ -1,50 +0,0 @@
-//
-// ========================================================================
-// 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.core;
-
-import java.io.IOException;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
-import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
-
-public class TestWebSocketUpgradeHandler extends WebSocketUpgradeHandler
-{
-    public TestWebSocketUpgradeHandler(WebSocketNegotiator negotiator)
-    {
-        super(negotiator);
-
-        setHandler(new AbstractHandler()
-        {
-            @Override
-            public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-                throws IOException, ServletException
-            {
-                response.setStatus(200);
-                response.setContentType("text/plain");
-                response.getOutputStream().println("Hello World!");
-                baseRequest.setHandled(true);
-            }
-        });
-    }
-}

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java

@@ -42,7 +42,7 @@ import org.eclipse.jetty.websocket.core.client.UpgradeListener;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -81,10 +81,10 @@ public class WebSocketNegotiationTest extends WebSocketTester
     @BeforeEach
     public void startup() throws Exception
     {
-        WebSocketNegotiator negotiator = new WebSocketNegotiator.AbstractNegotiator(components, null)
+        WebSocketNegotiator negotiator = new WebSocketNegotiator.AbstractNegotiator()
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation) throws IOException
+            public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
             {
                 if (negotiation.getOfferedSubprotocols().isEmpty())
                 {
@@ -127,7 +127,7 @@ public class WebSocketNegotiationTest extends WebSocketTester
             }
         };
 
-        server = new WebSocketServer(negotiator);
+        server = new WebSocketServer(components, negotiator, false);
         client = new WebSocketCoreClient(null, components);
 
         server.start();

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java

@@ -27,7 +27,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 
@@ -73,6 +73,11 @@ public class WebSocketServer
     }
 
     public WebSocketServer(WebSocketNegotiator negotiator, boolean tls)
+    {
+        this(new WebSocketComponents(), negotiator, tls);
+    }
+
+    public WebSocketServer(WebSocketComponents components, WebSocketNegotiator negotiator, boolean tls)
     {
         ServerConnector connector;
         if (tls)
@@ -84,7 +89,8 @@ public class WebSocketServer
         ContextHandler context = new ContextHandler("/");
         server.setHandler(context);
 
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(components);
+        upgradeHandler.addMapping("/*", negotiator);
         context.setHandler(upgradeHandler);
     }
 
@@ -111,7 +117,7 @@ public class WebSocketServer
         }
 
         @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             List<String> offeredSubprotocols = negotiation.getOfferedSubprotocols();
             if (!offeredSubprotocols.isEmpty())

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketUpgradeHandlerTest.java

@@ -0,0 +1,76 @@
+//
+// ========================================================================
+// 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.core;
+
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class WebSocketUpgradeHandlerTest
+{
+    private Server server;
+    private WebSocketCoreClient client;
+    private URI serverUri;
+
+    @BeforeEach
+    public void before() throws Exception
+    {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        server.addConnector(connector);
+
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/path/echo", new TestWebSocketNegotiator(new EchoFrameHandler()));
+        server.setHandler(upgradeHandler);
+        server.start();
+
+        client = new WebSocketCoreClient();
+        client.start();
+
+        serverUri = URI.create("ws://localhost:" + connector.getLocalPort());
+    }
+
+    @AfterEach
+    public void after() throws Exception
+    {
+        server.stop();
+        client.stop();
+    }
+
+    @Test
+    public void testUpgradeByWebSocketUpgradeHandler() throws Exception
+    {
+        TestMessageHandler clientEndpoint = new TestMessageHandler();
+        CoreSession coreSession = client.connect(clientEndpoint, serverUri.resolve("/path/echo")).get(5, TimeUnit.SECONDS);
+        assertNotNull(coreSession);
+        coreSession.close(Callback.NOOP);
+        assertTrue(clientEndpoint.closeLatch.await(5, TimeUnit.SECONDS));
+    }
+}

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnTests.java

@@ -52,14 +52,12 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerStatus;
 import org.testcontainers.utility.MountableFile;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Testcontainers
 public class AutobahnTests
 {
-    
     private static final Logger LOG = LoggerFactory.getLogger(AutobahnTests.class);
     private static final Path USER_DIR = Paths.get(System.getProperty("user.dir"));
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java

@@ -28,10 +28,10 @@ import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.Jetty;
 import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.websocket.core.CoreSession;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.TestMessageHandler;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java

@@ -21,6 +21,8 @@ package org.eclipse.jetty.websocket.core.autobahn;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
 
 /**
@@ -78,9 +80,11 @@ public class CoreAutobahnServer
         ContextHandler context = new ContextHandler("/");
         server.setHandler(context);
 
-        WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler((neg) -> new AutobahnFrameHandler());
+        WebSocketComponents components = new WebSocketComponents();
-        context.setHandler(handler);
+        WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler(components);
+        handler.addMapping("/*", new TestWebSocketNegotiator(new AutobahnFrameHandler()));
 
+        context.setHandler(handler);
         server.start();
         return server;
     }

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java

@@ -28,9 +28,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.MessageHandler;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java

@@ -26,6 +26,7 @@ import java.util.Set;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.pathmap.ServletPathSpec;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
@@ -36,18 +37,23 @@ 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.core.FrameHandler;
-import org.eclipse.jetty.websocket.core.MessageHandler;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.internal.MessageHandler;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.server.WebSocketUpgradeHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.eclipse.jetty.util.Callback.NOOP;
 
 public class ChatWebSocketServer
 {
+    protected static final Logger LOG = LoggerFactory.getLogger(ChatWebSocketServer.class);
+
     private final Set<MessageHandler> members = new HashSet<>();
 
-    private FrameHandler negotiate(Negotiation negotiation)
+    private FrameHandler negotiate(WebSocketNegotiation negotiation)
     {
         // Finalize negotiations in API layer involves:
         //  + MAY mutate the policy
@@ -113,7 +119,9 @@ public class ChatWebSocketServer
         server.setHandler(context);
 
         ChatWebSocketServer chat = new ChatWebSocketServer();
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(WebSocketNegotiator.from(chat::negotiate));
+        WebSocketComponents components = new WebSocketComponents();
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(components);
+        upgradeHandler.addMapping(new ServletPathSpec("/*"), WebSocketNegotiator.from(chat::negotiate));
         context.setHandler(upgradeHandler);
 
         upgradeHandler.setHandler(new AbstractHandler()

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java

@@ -41,7 +41,7 @@ import org.eclipse.jetty.websocket.core.WebSocketServer;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.UpgradeListener;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +69,7 @@ public class PerMessageDeflaterBufferSizeTest
         int inflateBufferSize = -1;
 
         @Override
-        public FrameHandler negotiate(Negotiation negotiation) throws IOException
+        public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
         {
             for (ExtensionConfig extensionConfig : negotiation.getOfferedExtensions())
             {

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java

@@ -35,7 +35,7 @@ import org.eclipse.jetty.websocket.core.TestFrameHandler;
 import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.WebSocketServer;
 import org.eclipse.jetty.websocket.core.WebSocketTester;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
+import org.eclipse.jetty.websocket.core.server.WebSocketNegotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -58,7 +58,7 @@ public class ValidationExtensionTest extends WebSocketTester
         WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverHandler)
         {
             @Override
-            public FrameHandler negotiate(Negotiation negotiation) throws IOException
+            public FrameHandler negotiate(WebSocketNegotiation negotiation) throws IOException
             {
                 List<ExtensionConfig> negotiatedExtensions = new ArrayList<>();
                 negotiatedExtensions.add(ExtensionConfig.parse(

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java

@@ -45,6 +45,7 @@ import org.eclipse.jetty.websocket.core.EchoFrameHandler;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.TestAsyncFrameHandler;
+import org.eclipse.jetty.websocket.core.TestWebSocketNegotiator;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
@@ -112,14 +113,16 @@ public class WebSocketProxyTest
 
         ContextHandler serverContext = new ContextHandler("/server");
         serverFrameHandler = new EchoFrameHandler("SERVER");
-        WebSocketNegotiator negotiator = WebSocketNegotiator.from((negotiation) -> serverFrameHandler, defaultCustomizer);
+        WebSocketNegotiator negotiator = new TestWebSocketNegotiator(serverFrameHandler, defaultCustomizer);
-        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        WebSocketUpgradeHandler upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/*", negotiator);
         serverContext.setHandler(upgradeHandler);
         handlers.addHandler(serverContext);
 
         ContextHandler proxyContext = new ContextHandler("/proxy");
-        negotiator = WebSocketNegotiator.from((negotiation) -> proxy.client2Proxy, defaultCustomizer);
+        negotiator = WebSocketNegotiator.from(negotiation -> proxy.client2Proxy, defaultCustomizer);
-        upgradeHandler = new WebSocketUpgradeHandler(negotiator);
+        upgradeHandler = new WebSocketUpgradeHandler();
+        upgradeHandler.addMapping("/*", negotiator);
         proxyContext.setHandler(upgradeHandler);
         handlers.addHandler(proxyContext);
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageReaderTest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -31,7 +31,7 @@ import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
-import org.eclipse.jetty.websocket.util.messages.MessageReader;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageReader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/MessageWriterTest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.io.IOException;
 import java.nio.charset.MalformedInputException;
@@ -32,7 +32,7 @@ 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.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/PartialStringMessageSinkTest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -34,7 +34,7 @@ import org.eclipse.jetty.util.Utf8Appendable;
 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.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/util/StringMessageSinkTest.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.util;
+package org.eclipse.jetty.websocket.core.util;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -32,7 +32,7 @@ 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.core.exception.MessageTooLargeException;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;

jetty-websocket/websocket-jakarta-client/pom.xml

@@ -24,11 +24,6 @@
       <artifactId>websocket-jakarta-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-client</artifactId>

jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/AnnotatedClientEndpointConfig.java

@@ -23,8 +23,8 @@ import java.util.List;
 
 import jakarta.websocket.ClientEndpoint;
 import jakarta.websocket.ClientEndpointConfig;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.jakarta.common.ClientEndpointConfigWrapper;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 
 public class AnnotatedClientEndpointConfig extends ClientEndpointConfigWrapper
 {

jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainer.java

@@ -40,6 +40,7 @@ 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.core.exception.InvalidWebSocketException;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
 import org.eclipse.jetty.websocket.core.exception.WebSocketTimeoutException;
 import org.eclipse.jetty.websocket.jakarta.client.internal.JsrUpgradeListener;
@@ -48,7 +49,6 @@ 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;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
 
 /**
  * Container for Client use of the jakarta.websocket API.

jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientFrameHandlerFactory.java

@@ -20,10 +20,10 @@ package org.eclipse.jetty.websocket.jakarta.client;
 
 import jakarta.websocket.ClientEndpoint;
 import jakarta.websocket.EndpointConfig;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 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.util.InvokerUtils;
 
 public class JakartaWebSocketClientFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory
 {

jetty-websocket/websocket-jakarta-common/pom.xml

@@ -70,11 +70,6 @@
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-jakarta-websocket-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-client</artifactId>

jetty-websocket/websocket-jakarta-common/src/main/java/module-info.java

@@ -26,5 +26,4 @@ module org.eclipse.jetty.websocket.jakarta.common
     requires org.slf4j;
     requires transitive jetty.websocket.api;
     requires transitive org.eclipse.jetty.websocket.core.client;
-    requires transitive org.eclipse.jetty.websocket.util;
 }

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketAsyncRemote.java

@@ -31,9 +31,9 @@ import org.eclipse.jetty.util.FutureCallback;
 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.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
-import org.eclipse.jetty.websocket.util.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketBasicRemote.java

@@ -31,7 +31,7 @@ import org.eclipse.jetty.util.FutureCallback;
 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.TextUtils;
+import org.eclipse.jetty.websocket.core.internal.util.TextUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandler.java

@@ -45,17 +45,17 @@ import org.eclipse.jetty.websocket.core.FrameHandler;
 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.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.AvailableDecoders;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
 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;
-import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerFactory.java

@@ -43,20 +43,20 @@ 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.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteArrayMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.PartialStringMessageSink;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
 import org.eclipse.jetty.websocket.jakarta.common.messages.AbstractDecodedMessageSink;
 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.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteArrayMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.PartialStringMessageSink;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerMetadata.java

@@ -23,9 +23,9 @@ import java.lang.invoke.MethodHandle;
 import jakarta.websocket.Encoder;
 import jakarta.websocket.EndpointConfig;
 import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
 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;
 
 public class JakartaWebSocketFrameHandlerMetadata
 {

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketMessageMetadata.java

@@ -21,8 +21,8 @@ package org.eclipse.jetty.websocket.jakarta.common;
 import java.lang.invoke.MethodHandle;
 import java.util.List;
 
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 
 public class JakartaWebSocketMessageMetadata
 {

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketRemoteEndpoint.java

@@ -34,8 +34,8 @@ import org.eclipse.jetty.websocket.core.Frame;
 import org.eclipse.jetty.websocket.core.OpCode;
 import org.eclipse.jetty.websocket.core.OutgoingFrames;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
-import org.eclipse.jetty.websocket.util.messages.MessageOutputStream;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageOutputStream;
-import org.eclipse.jetty.websocket.util.messages.MessageWriter;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketSession.java

@@ -43,9 +43,9 @@ 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.core.internal.util.ReflectUtils;
 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;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/decoders/AvailableDecoders.java

@@ -30,9 +30,9 @@ import java.util.stream.Stream;
 
 import jakarta.websocket.Decoder;
 import jakarta.websocket.EndpointConfig;
-import org.eclipse.jetty.websocket.util.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
-import org.eclipse.jetty.websocket.util.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
-import org.eclipse.jetty.websocket.util.ReflectUtils;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 
 public class AvailableDecoders implements Iterable<RegisteredDecoder>
 {

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/encoders/AvailableEncoders.java

@@ -29,10 +29,10 @@ import java.util.stream.Collectors;
 
 import jakarta.websocket.Encoder;
 import jakarta.websocket.EndpointConfig;
+import org.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
+import org.eclipse.jetty.websocket.core.exception.InvalidWebSocketException;
+import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;
 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;
 
 public class AvailableEncoders implements Predicate<Class<?>>
 {

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/AbstractDecodedMessageSink.java

@@ -28,8 +28,8 @@ 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.exception.CloseException;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryMessageSink.java

@@ -28,10 +28,10 @@ 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.core.internal.messages.ByteBufferMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.ByteBufferMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedBinaryStreamMessageSink.java

@@ -29,10 +29,10 @@ 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.core.internal.messages.InputStreamMessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.MessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.InputStreamMessageSink;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
 
 public class DecodedBinaryStreamMessageSink<T> extends AbstractDecodedMessageSink.Stream<Decoder.BinaryStream<T>>
 {

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextMessageSink.java

@@ -27,10 +27,10 @@ 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.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.StringMessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.StringMessageSink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

jetty-websocket/websocket-jakarta-common/src/main/java/org/eclipse/jetty/websocket/jakarta/common/messages/DecodedTextStreamMessageSink.java

@@ -29,10 +29,10 @@ 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.core.internal.messages.MessageSink;
+import org.eclipse.jetty.websocket.core.internal.messages.ReaderMessageSink;
 import org.eclipse.jetty.websocket.jakarta.common.JakartaWebSocketFrameHandlerFactory;
 import org.eclipse.jetty.websocket.jakarta.common.decoders.RegisteredDecoder;
-import org.eclipse.jetty.websocket.util.messages.MessageSink;
-import org.eclipse.jetty.websocket.util.messages.ReaderMessageSink;
 
 public class DecodedTextStreamMessageSink<T> extends AbstractDecodedMessageSink.Stream<Decoder.TextStream<T>>
 {

jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/DummyFrameHandlerFactory.java

@@ -21,7 +21,7 @@ package org.eclipse.jetty.websocket.jakarta.common;
 import jakarta.websocket.ClientEndpoint;
 import jakarta.websocket.ClientEndpointConfig;
 import jakarta.websocket.EndpointConfig;
-import org.eclipse.jetty.websocket.util.InvokerUtils;
+import org.eclipse.jetty.websocket.core.internal.util.InvokerUtils;
 
 public class DummyFrameHandlerFactory extends JakartaWebSocketFrameHandlerFactory
 {

jetty-websocket/websocket-jakarta-common/src/test/java/org/eclipse/jetty/websocket/jakarta/common/JakartaWebSocketFrameHandlerBadSignaturesTest.java

@@ -24,7 +24,7 @@ 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.eclipse.jetty.websocket.core.exception.InvalidSignatureException;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;