GitHub user krlohnes opened a pull request:
https://github.com/apache/tinkerpop/pull/671
Add combined handler master
@spmallette I think this is pretty much the cleanest I get history with the
fixes etc needed for master.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/krlohnes/tinkerpop add_combined_handler_master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/tinkerpop/pull/671.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 #671
----
commit c2643905ede89c2cb8580280dcf42ecfb4cdfe01
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.
commit cee56f527ad4975878a9ac866bc00a24b7fd3a88
Author: Keith Lohnes <[email protected]>
Date: 2017-07-12T15:35:17Z
Merge Combined WS and Http Channelizer to master
commit 325499c706c79c1fe5d0489e2bacbcf8fefa76c3
Author: Keith Lohnes <[email protected]>
Date: 2017-07-12T16:23:48Z
TINKERPOP-915 Fix issues from merging master
Removed generics on ServerExecutor in merge
Update HttpChannelizer integration tests to use new json format
Fix issues created from merging tp32 in 960fde1 regarding creation of
the authenticationHandler
----
---
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.
---
