Merge branch 'TINKERPOP-1874' into tp32

Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/08391f8d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/08391f8d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/08391f8d

Branch: refs/heads/TINKERPOP-1447
Commit: 08391f8d8a1a19218f6ed6dd37f584b7460b2c56
Parents: 3e6e08a 1c33340
Author: Stephen Mallette <[email protected]>
Authored: Wed Jan 24 08:09:28 2018 -0500
Committer: Stephen Mallette <[email protected]>
Committed: Wed Jan 24 08:09:28 2018 -0500

----------------------------------------------------------------------
 docs/src/dev/io/graphson.asciidoc               | 192 ++++++++++---------
 ...aphSONMapperV2d0PartialEmbeddedTypeTest.java |  29 +++
 gremlin-dotnet/glv/P.template                   |   7 +-
 .../src/Gremlin.Net/Process/Traversal/P.cs      |   6 +-
 .../traversal/step/filter/GroovyHasTest.groovy  |  20 ++
 gremlin-test/features/filter/Has.feature        |  44 +++++
 .../process/traversal/step/filter/HasTest.java  |  60 ++++++
 7 files changed, 262 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/08391f8d/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/dev/io/graphson.asciidoc
index b769f61,37af4ed..4b1d219
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@@ -75,11 -72,10 +72,10 @@@ file.withWriter { writer -
    writer.write(toJson(msg, "Sessionless Eval", "The following 
`RequestMessage` is an example of a sessionless request for a script evaluation 
with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
  
    writer.write("\n")
-   writer.write("ResponseMessage\n")
-   writer.write("~~~~~~~~~~~~~~~\n\n")
+   writer.write("=== ResponseMessage\n\n")
    msg = 
ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
                          
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
 -  writer.write(toJson(msg, "Authentication Challenge", "When authentication 
is enabled, an initial request to the server will result in an authentication 
challenge. The typical response message will appear as follows, but handling it 
could be different dependending on the SASL implementation (e.g. multiple 
challenges maybe requested in some cases, but no in the default provided by 
Gremlin Server)."))
 +  writer.write(toJson(msg, "Authentication Challenge", "When authentication 
is enabled, an initial request to the server will result in an authentication 
challenge. The typical response message will appear as follows, but handling it 
could be different dependending on the SASL implementation (e.g. multiple 
challenges maybe requested in some cases, but not in the default provided by 
Gremlin Server)."))
    msg = 
ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
                          
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
                          
result(Arrays.asList(graph.vertices().next())).create()

Reply via email to