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 void dump(Appendable out, String indent) throws IOException
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.
*
@@ -171,12 +176,28 @@ public void dump(Appendable out, String indent) throws IOException
*
* @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.
+ *
+ * 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 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 boolean removeMapping(PathSpec pathSpec)
*/
public WebSocketNegotiator getMatchedNegotiator(String target, Consumer pathSpecConsumer)
{
- MappedResource mapping = this.mappings.getMatch(target);
+ MappedResource mapping = this.mappings.getMatch(target);
if (mapping == null)
return null;
@@ -224,59 +245,6 @@ public boolean upgrade(HttpServletRequest request, HttpServletResponse response,
LOG.debug("WebSocket Negotiated detected on {} for endpoint {}", target, negotiator);
// We have an upgrade request
- return handshaker.upgradeRequest(negotiator, request, response, 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