You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2021/04/16 10:31:12 UTC

[tinkerpop] 01/01: Merge branch 'TINKERPOP-2245'

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit e052ccc57ed908c3c7d9d9774b58fb3d65c00329
Merge: ac58141 7fe6359
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Apr 16 06:30:57 2021 -0400

    Merge branch 'TINKERPOP-2245'

 .travis.yml                                        |   4 +
 CHANGELOG.asciidoc                                 |   6 +-
 .../gremlin-server-integration-krb5.yaml           |   1 +
 .../gremlin-server-integration-secure.yaml         |   1 +
 .../gremlin-server/gremlin-server-integration.yaml |   1 +
 docs/src/reference/gremlin-applications.asciidoc   |  87 ++-
 docs/src/reference/gremlin-variants.asciidoc       |  14 +-
 docs/src/upgrade/release-3.5.x.asciidoc            |  59 +-
 .../gremlin/process/traversal/Bytecode.java        |   8 +-
 .../gremlin/process/traversal/GraphOp.java         |  56 ++
 .../process/traversal/util/BytecodeHelper.java     |   6 +-
 .../tinkerpop/gremlin/structure/Transaction.java   |   4 -
 .../process/traversal/util/BytecodeHelperTest.java |   6 +-
 .../apache/tinkerpop/gremlin/driver/Client.java    |  37 +-
 .../apache/tinkerpop/gremlin/driver/Handler.java   |   1 -
 .../tinkerpop/gremlin/driver/RequestOptions.java   |   1 +
 .../apache/tinkerpop/gremlin/driver/Tokens.java    |   7 +
 .../gremlin/driver/message/ResponseStatusCode.java |   7 +
 .../driver/remote/DriverRemoteTransaction.java     |  12 +-
 .../gremlin/server/AbstractChannelizer.java        |  29 +-
 .../apache/tinkerpop/gremlin/server/Context.java   |  79 ++
 .../tinkerpop/gremlin/server/GraphManager.java     |  10 +
 .../tinkerpop/gremlin/server/GremlinServer.java    |  14 +-
 .../apache/tinkerpop/gremlin/server/Settings.java  |  58 ++
 .../gremlin/server/channel/HttpChannelizer.java    |   4 +-
 .../gremlin/server/channel/UnifiedChannelizer.java |  86 +++
 .../server/channel/WebSocketChannelizer.java       |  12 +-
 .../handler/AbstractAuthenticationHandler.java     |  12 +-
 .../gremlin/server/handler/AbstractSession.java    | 847 +++++++++++++++++++++
 .../handler/HttpBasicAuthenticationHandler.java    |  11 +-
 .../gremlin/server/handler/MultiTaskSession.java   | 296 +++++++
 .../SaslAndHttpBasicAuthenticationHandler.java     |  25 +-
 .../server/handler/SaslAuthenticationHandler.java  |  11 +-
 .../tinkerpop/gremlin/server/handler/Session.java  |  84 ++
 ...nticationHandler.java => SessionException.java} |  24 +-
 .../gremlin/server/handler/SessionTask.java        |  42 +
 .../gremlin/server/handler/SingleTaskSession.java  |  92 +++
 .../gremlin/server/handler/UnifiedHandler.java     | 345 +++++++++
 .../handler/WsAndHttpChannelizerHandler.java       |  19 +-
 .../gremlin/server/op/AbstractEvalOpProcessor.java | 104 +--
 .../gremlin/server/op/session/Session.java         |   8 +-
 .../server/op/session/SessionOpProcessor.java      |   6 +-
 .../server/op/traversal/TraversalOpProcessor.java  |  14 +-
 .../gremlin/server/util/ServerGremlinExecutor.java |   9 +-
 .../AbstractGremlinServerIntegrationTest.java      |  36 +-
 .../tinkerpop/gremlin/server/ContextTest.java      |   3 +-
 .../gremlin/server/GremlinDriverIntegrateTest.java |  63 +-
 ...emlinServerAuditLogDeprecatedIntegrateTest.java |   5 +-
 .../server/GremlinServerAuditLogIntegrateTest.java |   4 +-
 .../server/GremlinServerAuthKrb5IntegrateTest.java |   2 +-
 .../server/GremlinServerAuthzIntegrateTest.java    |   3 +
 .../server/GremlinServerHttpIntegrateTest.java     |   4 +-
 .../gremlin/server/GremlinServerIntegrateTest.java |  74 +-
 .../server/GremlinServerSessionIntegrateTest.java  | 266 ++++++-
 .../server/GremlinSessionTxIntegrateTest.java      |  36 +-
 .../channel/HttpChannelizerIntegrateTest.java      |   5 +
 ...t.java => UnifiedChannelizerIntegrateTest.java} |  42 +-
 .../src/test/resources/log4j-test.properties       |   3 +
 .../gremlin/server/gremlin-server-integration.yaml |   2 +
 gremlin-tools/gremlin-benchmark/pom.xml            |   5 -
 hadoop-gremlin/pom.xml                             |   5 -
 61 files changed, 2843 insertions(+), 274 deletions(-)