getAvailableExtensionNames()
- {
- return factory.getExtensionRegistry().getAvailableExtensionNames();
- }
-
- @Override
- public WebSocketBehavior getBehavior()
- {
- return WebSocketBehavior.SERVER;
- }
-
- @Override
- public boolean isAutoFragment()
- {
- return factory.isAutoFragment();
- }
-
- @Override
- public void setAutoFragment(boolean autoFragment)
- {
- factory.setAutoFragment(autoFragment);
- }
-
- @Override
- public long getMaxFrameSize()
- {
- return factory.getMaxFrameSize();
- }
-
- @Override
- public void setMaxFrameSize(long maxFrameSize)
- {
- factory.setMaxFrameSize(maxFrameSize);
- }
-
- @Override
- public Duration getIdleTimeout()
- {
- return factory.getIdleTimeout();
- }
-
- @Override
- public void setIdleTimeout(Duration duration)
- {
- factory.setIdleTimeout(duration);
- }
-
- @Override
- public int getInputBufferSize()
- {
- return factory.getInputBufferSize();
- }
-
- @Override
- public void setInputBufferSize(int bufferSize)
- {
- factory.setInputBufferSize(bufferSize);
- }
-
- @Override
- public long getMaxBinaryMessageSize()
- {
- return factory.getMaxBinaryMessageSize();
- }
-
- @Override
- public void setMaxBinaryMessageSize(long bufferSize)
- {
- factory.setMaxBinaryMessageSize(bufferSize);
- }
-
- @Override
- public long getMaxTextMessageSize()
- {
- return factory.getMaxTextMessageSize();
- }
-
- @Override
- public void setMaxTextMessageSize(long bufferSize)
- {
- factory.setMaxTextMessageSize(bufferSize);
- }
-
- @Override
- public int getOutputBufferSize()
- {
- return factory.getOutputBufferSize();
- }
-
- @Override
- public void setOutputBufferSize(int bufferSize)
- {
- factory.setOutputBufferSize(bufferSize);
- }
-
/**
- * add a WebSocket mapping to a provided {@link JettyWebSocketCreator}.
+ * Add a WebSocket mapping to a provided {@link JettyWebSocketCreator}.
*
* 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
@@ -145,30 +37,21 @@ public void setOutputBufferSize(int bufferSize)
* @param creator the WebSocketCreator to use
* @since 10.0
*/
- public void addMapping(String pathSpec, JettyWebSocketCreator creator)
- {
- factory.addMapping(pathSpec, new WrappedCreator(creator));
- }
+ void addMapping(String pathSpec, JettyWebSocketCreator creator);
/**
* Add a WebSocket mapping at PathSpec "/" for a creator which creates the endpointClass
*
* @param endpointClass the WebSocket class to use
*/
- public void register(Class endpointClass)
- {
- factory.register(endpointClass);
- }
+ void register(Class endpointClass);
/**
* Add a WebSocket mapping at PathSpec "/" for a creator
*
* @param creator the WebSocketCreator to use
*/
- public void setCreator(JettyWebSocketCreator creator)
- {
- factory.setCreator(new WrappedCreator(creator));
- }
+ void setCreator(JettyWebSocketCreator creator);
/**
* Returns the creator for the given path spec.
@@ -176,14 +59,7 @@ public void setCreator(JettyWebSocketCreator creator)
* @param pathSpec the pathspec to respond on
* @return the websocket creator if path spec exists, or null
*/
- public JettyWebSocketCreator getMapping(String pathSpec)
- {
- WebSocketCreator creator = factory.getMapping(parsePathSpec(pathSpec));
- if (creator instanceof WrappedCreator)
- return ((WrappedCreator)creator).getCreator();
-
- return null;
- }
+ JettyWebSocketCreator getMapping(String pathSpec);
/**
* Removes the mapping based on the given path spec.
@@ -191,40 +67,17 @@ public JettyWebSocketCreator getMapping(String pathSpec)
* @param pathSpec the pathspec to respond on
* @return true if underlying mapping were altered, false otherwise
*/
- public boolean removeMapping(String pathSpec)
- {
- return factory.removeMapping(parsePathSpec(pathSpec));
- }
+ boolean removeMapping(String pathSpec);
/**
- * Parse a PathSpec string into a PathSpec instance.
- *
- * @param rawSpec the raw path spec as String to parse.
- * @return the {@link PathSpec} implementation for the rawSpec
+ * Get the names of all available WebSocket Extensions.
+ * @return a set the available extension names.
*/
- private PathSpec parsePathSpec(String rawSpec)
- {
- return factory.parsePathSpec(rawSpec);
- }
+ Set getAvailableExtensionNames();
- private static class WrappedCreator implements WebSocketCreator
+ @Override
+ default WebSocketBehavior getBehavior()
{
- private JettyWebSocketCreator creator;
-
- private WrappedCreator(JettyWebSocketCreator creator)
- {
- this.creator = creator;
- }
-
- public JettyWebSocketCreator getCreator()
- {
- return creator;
- }
-
- @Override
- public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp)
- {
- return creator.createWebSocket(new JettyServerUpgradeRequest(req), new JettyServerUpgradeResponse(resp));
- }
+ return WebSocketBehavior.SERVER;
}
}
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
index 82c3f79383a0..405e957f8d72 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
@@ -27,8 +27,8 @@
import org.eclipse.jetty.servlet.listener.ContainerInitializer;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
-import org.eclipse.jetty.websocket.servlet.WebSocketMapping;
-import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.util.server.WebSocketMapping;
+import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
index 6c3acd2ea910..19abc5c08bc8 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/JettyServerFrameHandlerFactory.java
@@ -27,9 +27,9 @@
import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandler;
import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandlerFactory;
import org.eclipse.jetty.websocket.core.FrameHandler;
-import org.eclipse.jetty.websocket.servlet.FrameHandlerFactory;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+import org.eclipse.jetty.websocket.util.server.FrameHandlerFactory;
+import org.eclipse.jetty.websocket.util.server.ServletUpgradeRequest;
+import org.eclipse.jetty.websocket.util.server.ServletUpgradeResponse;
public class JettyServerFrameHandlerFactory
extends JettyWebSocketFrameHandlerFactory
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java
index fb72a2610053..ade89044129a 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeRequestAdapter.java
@@ -28,7 +28,7 @@
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
+import org.eclipse.jetty.websocket.util.server.ServletUpgradeRequest;
public class UpgradeRequestAdapter implements UpgradeRequest
{
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java
index 4e9eefed389b..e957b63697e3 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/UpgradeResponseAdapter.java
@@ -27,7 +27,7 @@
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
-import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
+import org.eclipse.jetty.websocket.util.server.ServletUpgradeResponse;
public class UpgradeResponseAdapter implements UpgradeResponse
{
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
index 0e077b8d7ff7..86dc8240721d 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
@@ -39,7 +39,7 @@
import org.eclipse.jetty.websocket.common.WebSocketSession;
import org.eclipse.jetty.websocket.core.internal.WebSocketCoreSession;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
+import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
index 1cd8a05caa4d..f3cd13561394 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketOverHTTP2Test.java
@@ -64,7 +64,7 @@
import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.servlet.internal.UpgradeHttpServletRequest;
+import org.eclipse.jetty.websocket.util.server.internal.UpgradeHttpServletRequest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
index bb6189b06d76..cfdef700f31b 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
@@ -45,11 +45,11 @@
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
import org.eclipse.jetty.websocket.tests.CloseTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.EchoSocket;
import org.eclipse.jetty.websocket.tests.GetAuthHeaderEndpoint;
import org.eclipse.jetty.websocket.tests.SimpleStatusServlet;
+import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
index 6b10557e8708..3725abbb25bc 100644
--- a/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
+++ b/jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
@@ -44,13 +44,13 @@
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.servlet.WebSocketUpgradeFilter;
import org.eclipse.jetty.websocket.tests.AnnoMaxMessageEndpoint;
import org.eclipse.jetty.websocket.tests.CloseTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.ConnectMessageEndpoint;
import org.eclipse.jetty.websocket.tests.EchoSocket;
import org.eclipse.jetty.websocket.tests.ParamsEndpoint;
import org.eclipse.jetty.websocket.tests.util.FutureWriteCallback;
+import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
deleted file mode 100644
index beeeab4b0fc5..000000000000
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
- org.eclipse.jetty.websocket
- websocket-parent
- 10.0.0-SNAPSHOT
-
-
- 4.0.0
- websocket-servlet
- Jetty :: Websocket :: Servlet
-
-
- ${project.groupId}.servlet
-
-
-
-
- org.eclipse.jetty.websocket
- websocket-core
- ${project.version}
-
-
- org.eclipse.jetty
- jetty-servlet
- ${project.version}
-
-
- org.slf4j
- slf4j-api
-
-
- org.eclipse.jetty
- jetty-slf4j-impl
- test
-
-
- org.eclipse.jetty.toolchain
- jetty-test-helper
- test
-
-
- org.eclipse.jetty.websocket
- websocket-jetty-api
- ${project.version}
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
- artifact-jars
-
- test-jar
-
-
-
-
-
- org.apache.maven.plugins
- maven-enforcer-plugin
-
-
- ban-ws-apis
-
- enforce
-
-
-
-
-
- org.eclipse.jetty.websocket:websocket-jetty-api
- javax.websocket
-
-
-
-
-
-
- ban-java-servlet-api
-
- enforce
-
-
-
-
-
- javax.servlet
- servletapi
- org.eclipse.jetty.orbit:javax.servlet
- org.mortbay.jetty:servlet-api
- jetty:servlet-api
- jetty-servlet-api
-
-
-
-
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
-
- manifest
-
-
-
- javax.websocket.servlet Implementation
-
- org.eclipse.jetty.websocket.servlet.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-
-
-
-
-
-
-
-
-
diff --git a/jetty-websocket/websocket-servlet/src/main/java/module-info.java b/jetty-websocket/websocket-servlet/src/main/java/module-info.java
deleted file mode 100644
index 93715204b9dd..000000000000
--- a/jetty-websocket/websocket-servlet/src/main/java/module-info.java
+++ /dev/null
@@ -1,26 +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
-// ========================================================================
-//
-
-module org.eclipse.jetty.websocket.servlet
-{
- exports org.eclipse.jetty.websocket.servlet;
-
- requires transitive org.eclipse.jetty.servlet;
- requires transitive org.eclipse.jetty.websocket.core;
- requires org.slf4j;
-}
diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
deleted file mode 100644
index 6a3e00a84bf0..000000000000
--- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
+++ /dev/null
@@ -1,263 +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.servlet;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.time.Duration;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.http.pathmap.PathSpec;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
-import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract Servlet used to bridge the Servlet API to the WebSocket API.
- *
- * To use this servlet, you will be required to register your websockets with the {@link WebSocketMapping} so that it can create your websockets under the
- * appropriate conditions.
- *
- * The most basic implementation would be as follows:
- *
- * package my.example;
- *
- * import WebSocketServlet;
- * import WebSocketServletFactory;
- *
- * public class MyEchoServlet extends WebSocketServlet
- * {
- * @Override
- * public void configure(WebSocketServletFactory factory)
- * {
- * factory.setDefaultMaxFrameSize(4096);
- * factory.addMapping(factory.parsePathSpec("/"), (req,res)->new EchoSocket());
- * }
- * }
- *
- *
- * Only request that conforms to a "WebSocket: Upgrade" handshake request will trigger the {@link WebSocketMapping} handling of creating
- * WebSockets. All other requests are treated as normal servlet requests. The configuration defined by this servlet init parameters will
- * be used as the customizer for any mappings created by {@link WebSocketServletFactory#addMapping(PathSpec, WebSocketCreator)} during
- * {@link #configure(WebSocketServletFactory)} calls. The request upgrade may be peformed by this servlet, or is may be performed by a
- * {@link WebSocketUpgradeFilter} instance that will share the same {@link WebSocketMapping} instance. If the filter is used, then the
- * filter configuraton is used as the default configuration prior to this servlets configuration being applied.
- *
- *
- * Configuration / Init-Parameters:
- *
- *
- * - idleTimeout
- * - set the time in ms that a websocket may be idle before closing
- * - maxTextMessageSize
- * - set the size in UTF-8 bytes that a websocket may be accept as a Text Message before closing
- * - maxBinaryMessageSize
- * - set the size in bytes that a websocket may be accept as a Binary Message before closing
- * - inputBufferSize
- * - set the size in bytes of the buffer used to read raw bytes from the network layer
* - outputBufferSize
- * - set the size in bytes of the buffer used to write bytes to the network layer
- * - maxFrameSize
- * - The maximum frame size sent or received.
- * - autoFragment
- * - If true, frames are automatically fragmented to respect the maximum frame size.
- *
- */
-@SuppressWarnings("serial")
-public abstract class WebSocketServlet extends HttpServlet
-{
- private static final Logger LOG = LoggerFactory.getLogger(WebSocketServlet.class);
- private final CustomizedWebSocketServletFactory customizer = new CustomizedWebSocketServletFactory();
-
- private WebSocketMapping mapping;
- private WebSocketComponents components;
-
- /**
- * Configure the WebSocketServletFactory for this servlet instance by setting default
- * configuration (which may be overriden by annotations) and mapping {@link WebSocketCreator}s.
- * This method assumes a single {@link FrameHandlerFactory} will be available as a bean on the
- * {@link ContextHandler}, which in practise will mostly the the Jetty WebSocket API factory.
- *
- * @param factory the WebSocketServletFactory
- */
- protected abstract void configure(WebSocketServletFactory factory);
-
- /**
- * @return the instance of {@link FrameHandlerFactory} to be used to create the FrameHandler
- */
- protected abstract FrameHandlerFactory getFactory();
-
- @Override
- public void init() throws ServletException
- {
- try
- {
- ServletContext servletContext = getServletContext();
-
- components = WebSocketComponents.ensureWebSocketComponents(servletContext);
- mapping = new WebSocketMapping(components);
-
- String max = getInitParameter("idleTimeout");
- if (max == null)
- {
- max = getInitParameter("maxIdleTime");
- if (max != null)
- LOG.warn("'maxIdleTime' init param is deprecated, use 'idleTimeout' instead");
- }
- if (max != null)
- customizer.setIdleTimeout(Duration.ofMillis(Long.parseLong(max)));
-
- max = getInitParameter("maxTextMessageSize");
- if (max != null)
- customizer.setMaxTextMessageSize(Long.parseLong(max));
-
- max = getInitParameter("maxBinaryMessageSize");
- if (max != null)
- customizer.setMaxBinaryMessageSize(Long.parseLong(max));
-
- max = getInitParameter("inputBufferSize");
- if (max != null)
- customizer.setInputBufferSize(Integer.parseInt(max));
-
- max = getInitParameter("outputBufferSize");
- if (max != null)
- customizer.setOutputBufferSize(Integer.parseInt(max));
-
- max = getInitParameter("maxFrameSize");
- if (max == null)
- max = getInitParameter("maxAllowedFrameSize");
- if (max != null)
- customizer.setMaxFrameSize(Long.parseLong(max));
-
- String autoFragment = getInitParameter("autoFragment");
- if (autoFragment != null)
- customizer.setAutoFragment(Boolean.parseBoolean(autoFragment));
-
- configure(customizer); // Let user modify customizer prior after init params
- }
- catch (Throwable x)
- {
- throw new ServletException(x);
- }
- }
-
- @Override
- protected void service(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
- {
- // provide a null default customizer the customizer will be on the negotiator in the mapping
- if (mapping.upgrade(req, resp, null))
- return;
-
- // If we reach this point, it means we had an incoming request to upgrade
- // but it was either not a proper websocket upgrade, or it was possibly rejected
- // due to incoming request constraints (controlled by WebSocketCreator)
- if (resp.isCommitted())
- return;
-
- // Handle normally
- super.service(req, resp);
- }
-
- private class CustomizedWebSocketServletFactory extends Configuration.ConfigurationCustomizer implements WebSocketServletFactory
- {
- @Override
- public WebSocketExtensionRegistry getExtensionRegistry()
- {
- return components.getExtensionRegistry();
- }
-
- @Override
- public void addMapping(String pathSpec, WebSocketCreator creator)
- {
- addMapping(WebSocketMapping.parsePathSpec(pathSpec), creator);
- }
-
- @Override
- public void addMapping(PathSpec pathSpec, WebSocketCreator creator)
- {
- mapping.addMapping(pathSpec, creator, getFactory(), this);
- }
-
- @Override
- public void register(Class endpointClass)
- {
- Constructor constructor;
- try
- {
- constructor = endpointClass.getDeclaredConstructor();
- }
- catch (NoSuchMethodException e)
- {
- throw new RuntimeException(e);
- }
-
- WebSocketCreator creator = (req, resp) ->
- {
- try
- {
- return constructor.newInstance();
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- return null;
- }
- };
-
- addMapping("/", creator);
- }
-
- @Override
- public void setCreator(WebSocketCreator creator)
- {
- addMapping("/", creator);
- }
-
- @Override
- public WebSocketCreator getMapping(PathSpec pathSpec)
- {
- return mapping.getMapping(pathSpec);
- }
-
- @Override
- public WebSocketCreator getMatch(String target)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean removeMapping(PathSpec pathSpec)
- {
- return mapping.removeMapping(pathSpec);
- }
-
- @Override
- public PathSpec parsePathSpec(String pathSpec)
- {
- return WebSocketMapping.parsePathSpec(pathSpec);
- }
- }
-}
diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
deleted file mode 100644
index f62a25056e5c..000000000000
--- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
+++ /dev/null
@@ -1,101 +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.servlet;
-
-import org.eclipse.jetty.http.pathmap.PathSpec;
-import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
-
-public interface WebSocketServletFactory extends Configuration
-{
- WebSocketExtensionRegistry getExtensionRegistry();
-
- void addMapping(String pathSpec, WebSocketCreator creator);
-
- /**
- * add a WebSocket mapping to a provided {@link WebSocketCreator}.
- *
- * 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.
- *
- *
- * @param pathSpec the pathspec to respond on
- * @param creator the WebSocketCreator to use
- * @since 10.0
- */
- void addMapping(PathSpec pathSpec, WebSocketCreator creator);
-
- /**
- * Add a WebSocket mapping at PathSpec "/" for a creator which creates the endpointClass
- *
- * @param endpointClass the WebSocket class to use
- */
- void register(Class endpointClass);
-
- /**
- * Add a WebSocket mapping at PathSpec "/" for a creator
- *
- * @param creator the WebSocketCreator to use
- */
- void setCreator(WebSocketCreator creator);
-
- /**
- * Returns the creator for the given path spec.
- *
- * @param pathSpec the pathspec to respond on
- * @return the websocket creator if path spec exists, or null
- */
- WebSocketCreator getMapping(PathSpec pathSpec);
-
- /**
- * Get the MappedResource for the given target path.
- *
- * @param target the target path
- * @return the MappedResource if matched, or null if not matched.
- */
- WebSocketCreator getMatch(String target);
-
- /**
- * Parse a PathSpec string into a PathSpec instance.
- *
- * Recognized Path Spec syntaxes:
- *
- *
- * - {@code /path/to} or {@code /} or {@code *.ext} or {@code servlet|{spec}}
- * - Servlet Syntax
- * - {@code ^{spec}} or {@code regex|{spec}}
- * - Regex Syntax
- * - {@code uri-template|{spec}}
- * - URI Template (see JSR356 and RFC6570 level 1)
- *
- *
- * @param rawSpec the raw path spec as String to parse.
- * @return the {@link PathSpec} implementation for the rawSpec
- */
- PathSpec parsePathSpec(String rawSpec);
-
- /**
- * Removes the mapping based on the given path spec.
- *
- * @param pathSpec the pathspec to respond on
- * @return true if underlying mapping were altered, false otherwise
- */
- boolean removeMapping(PathSpec pathSpec);
-}
diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml
index 9412101ce9fe..bf962dad58fe 100644
--- a/jetty-websocket/websocket-util/pom.xml
+++ b/jetty-websocket/websocket-util/pom.xml
@@ -51,6 +51,11 @@
websocket-core
${project.version}