GitHub user krlohnes opened a pull request:
https://github.com/apache/tinkerpop/pull/618
[TINKERPOP-915]Add combined handler for Http and Websockets
[TINKERPOP-915](https://issues.apache.org/jira/browse/TINKERPOP-915)
Most of this is tests. I added an integration test that goes over the
functionality of both the http and websocket channelizers using the new
`WsAndHttpChannelizer`. I added an additional test on top of that to
switch between using WebSockets and http.
The change itself leverages the existing `WebSocketChannelizer` to
provide the base pipeline setup. It has everything needed handler-wise
to service both http and ws connections. The
`WsAndHttpChannelizerHandler` then detects whether the incoming request
is a plain http connection or a WebSockets connection. If it's an http
connection, the channelizer handler swaps out the request handler
appropriately for whether or not authentication has been enabled.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/krlohnes/tinkerpop
add_combined_http_ws_handler
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/tinkerpop/pull/618.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #618
----
commit 928d9a6566a4387fd91f43425f8a6ff77a7bce66
Author: Keith Lohnes <[email protected]>
Date: 2017-05-30T14:02:54Z
[TINKERPOP-915]Add combined handler for Http and Websockets
[TINKERPOP-915](https://issues.apache.org/jira/browse/TINKERPOP-915)
Most of this is tests. I added an integration test that goes over the
functionality of both the http and websocket channelizers using the new
`WsAndHttpChannelizer`. I added an additional test on top of that to
switch between using WebSockets and http.
The change itself leverages the existing `WebSocketChannelizer` to
provide the base pipeline setup. It has everything needed handler-wise
to service both http and ws connections. The
`WsAndHttpChannelizerHandler` then detects whether the incoming request
is a plain http connection or a WebSockets connection. If it's an http
connection, the channelizer handler swaps out the request handler
appropriately for whether or not authentication has been enabled.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
