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 2017/01/24 12:24:13 UTC

[17/17] tinkerpop git commit: Merge branch 'TINKERPOP-1565'

Merge branch 'TINKERPOP-1565'


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

Branch: refs/heads/master
Commit: 6143b48b59de9a9916bb58938631f8d7c6788dcd
Parents: 748e765 8ffd0b8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 24 07:23:31 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 24 07:23:31 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |    2 +
 docs/src/dev/io/graphson.asciidoc               | 2367 ++++++++++++++++++
 docs/src/upgrade/release-3.3.x.asciidoc         |   65 +-
 .../structure/io/graphson/GraphSONIo.java       |    2 +-
 .../structure/io/graphson/GraphSONMapper.java   |   75 +-
 .../structure/io/graphson/GraphSONModule.java   |  206 ++
 .../io/graphson/GraphSONSerializersV2d0.java    |  138 +-
 .../io/graphson/GraphSONSerializersV3d0.java    |  584 +++++
 .../structure/io/graphson/GraphSONTokens.java   |    3 +-
 .../structure/io/graphson/GraphSONUtil.java     |    7 +
 .../structure/io/graphson/GraphSONVersion.java  |    3 +-
 .../io/graphson/GraphSONXModuleV3d0.java        |  142 ++
 .../io/graphson/JavaTimeSerializersV3d0.java    |  323 +++
 .../io/graphson/JavaUtilSerializersV3d0.java    |   85 +
 .../io/graphson/TraversalSerializersV3d0.java   |  390 +++
 .../util/reference/ReferenceVertexProperty.java |   10 +-
 .../ser/GraphSONMessageSerializerV3d0.java      |  115 +
 .../tinkerpop/gremlin/driver/ser/SerTokens.java |    1 +
 .../gremlin/driver/ser/Serializers.java         |    8 +-
 .../ser/GraphSONMessageSerializerV2d0Test.java  |   29 +-
 .../ser/GraphSONMessageSerializerV3d0Test.java  |  342 +++
 .../driver/driver_remote_connection.py          |    4 +-
 .../gremlin_python/structure/io/graphson.py     |    2 +-
 .../jython/tests/structure/io/test_graphson.py  |    2 +-
 .../jsr223/PythonGraphSONJavaTranslator.java    |    4 +-
 .../gremlin/python/jsr223/PythonProvider.java   |    1 +
 .../driver/gremlin-server-modern-secure-py.yaml |    2 +-
 gremlin-server/conf/gremlin-server-classic.yaml |   12 +-
 .../conf/gremlin-server-modern-py.yaml          |   12 +-
 .../conf/gremlin-server-modern-readonly.yaml    |   12 +-
 gremlin-server/conf/gremlin-server-modern.yaml  |   12 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml   |   12 +-
 .../conf/gremlin-server-rest-modern.yaml        |    6 +-
 .../conf/gremlin-server-rest-secure.yaml        |    6 +-
 gremlin-server/conf/gremlin-server-secure.yaml  |   12 +-
 gremlin-server/conf/gremlin-server-spark.yaml   |   12 +-
 gremlin-server/conf/gremlin-server.yaml         |   12 +-
 .../gremlin/server/AbstractChannelizer.java     |    5 +-
 .../handler/SaslAuthenticationHandler.java      |    1 +
 .../server/GremlinServerAuthIntegrateTest.java  |   25 +-
 .../GremlinServerAuthOldIntegrateTest.java      |   21 +-
 .../server/GremlinServerHttpIntegrateTest.java  |   76 +-
 .../server/GremlinServerIntegrateTest.java      |    2 +-
 .../remote/gremlin-server-integration.yaml      |    6 +-
 .../server/gremlin-server-integration.yaml      |    6 +-
 .../gremlin/structure/SerializationTest.java    |  229 +-
 .../gremlin/structure/io/IoCustomTest.java      |    3 +
 .../gremlin/structure/io/IoEdgeTest.java        |    3 +
 .../gremlin/structure/io/IoGraphTest.java       |    1 +
 .../gremlin/structure/io/IoPropertyTest.java    |   18 +-
 .../tinkerpop/gremlin/structure/io/IoTest.java  |  266 +-
 .../gremlin/structure/io/IoVertexTest.java      |    3 +
 .../tinkerpop-classic-normalized-v3d0.json      |    6 +
 gremlin-tools/gremlin-io-test/pom.xml           |   20 +-
 .../tinkerpop/gremlin/structure/io/Model.java   |   15 +-
 .../io/graphson/GraphSONCompatibility.java      |    3 +-
 .../GraphSONTypedCompatibilityTest.java         |    9 +-
 .../_3_3_0/authenticationchallenge-v3d0.json    |   12 +
 .../authenticationresponse-v2d0-partial.json    |    5 +-
 .../_3_3_0/authenticationresponse-v3d0.json     |    9 +
 .../io/graphson/_3_3_0/barrier-v3d0.json        |    4 +
 .../io/graphson/_3_3_0/bigdecimal-v3d0.json     |    4 +
 .../io/graphson/_3_3_0/biginteger-v3d0.json     |    4 +
 .../io/graphson/_3_3_0/binding-v3d0.json        |   10 +
 .../structure/io/graphson/_3_3_0/byte-v3d0.json |    4 +
 .../io/graphson/_3_3_0/bytebuffer-v3d0.json     |    4 +
 .../io/graphson/_3_3_0/bytecode-v3d0.json       |    6 +
 .../io/graphson/_3_3_0/cardinality-v3d0.json    |    4 +
 .../structure/io/graphson/_3_3_0/char-v3d0.json |    4 +
 .../io/graphson/_3_3_0/class-v3d0.json          |    4 +
 .../io/graphson/_3_3_0/column-v3d0.json         |    4 +
 .../structure/io/graphson/_3_3_0/date-v3d0.json |    4 +
 .../io/graphson/_3_3_0/direction-v3d0.json      |    4 +
 .../io/graphson/_3_3_0/double-v3d0.json         |    4 +
 .../io/graphson/_3_3_0/duration-v3d0.json       |    4 +
 .../io/graphson/_3_3_0/edge-v2d0-no-types.json  |    5 +-
 .../io/graphson/_3_3_0/edge-v2d0-partial.json   |   10 +-
 .../structure/io/graphson/_3_3_0/edge-v3d0.json |   32 +
 .../io/graphson/_3_3_0/float-v3d0.json          |    4 +
 .../io/graphson/_3_3_0/inetaddress-v3d0.json    |    4 +
 .../io/graphson/_3_3_0/instant-v3d0.json        |    4 +
 .../io/graphson/_3_3_0/integer-v3d0.json        |    4 +
 .../io/graphson/_3_3_0/lambda-v3d0.json         |    8 +
 .../io/graphson/_3_3_0/localdate-v3d0.json      |    4 +
 .../io/graphson/_3_3_0/localdatetime-v3d0.json  |    4 +
 .../io/graphson/_3_3_0/localtime-v3d0.json      |    4 +
 .../structure/io/graphson/_3_3_0/long-v3d0.json |    4 +
 .../io/graphson/_3_3_0/metrics-v3d0.json        |   54 +
 .../io/graphson/_3_3_0/monthday-v3d0.json       |    4 +
 .../io/graphson/_3_3_0/offsetdatetime-v3d0.json |    4 +
 .../io/graphson/_3_3_0/offsettime-v3d0.json     |    4 +
 .../io/graphson/_3_3_0/operator-v3d0.json       |    4 +
 .../io/graphson/_3_3_0/order-v3d0.json          |    4 +
 .../structure/io/graphson/_3_3_0/p-v3d0.json    |   10 +
 .../structure/io/graphson/_3_3_0/pand-v3d0.json |   25 +
 .../io/graphson/_3_3_0/path-v2d0-no-types.json  |    7 -
 .../io/graphson/_3_3_0/path-v2d0-partial.json   |   28 -
 .../structure/io/graphson/_3_3_0/path-v3d0.json |  150 ++
 .../io/graphson/_3_3_0/period-v3d0.json         |    4 +
 .../structure/io/graphson/_3_3_0/pick-v3d0.json |    4 +
 .../structure/io/graphson/_3_3_0/pop-v3d0.json  |    4 +
 .../structure/io/graphson/_3_3_0/por-v3d0.json  |   31 +
 .../graphson/_3_3_0/property-v2d0-no-types.json |   11 +-
 .../graphson/_3_3_0/property-v2d0-partial.json  |   18 -
 .../io/graphson/_3_3_0/property-v3d0.json       |   25 +
 .../io/graphson/_3_3_0/scope-v3d0.json          |    4 +
 .../_3_3_0/sessionclose-v2d0-partial.json       |    5 +-
 .../io/graphson/_3_3_0/sessionclose-v3d0.json   |   11 +
 .../_3_3_0/sessioneval-v2d0-partial.json        |    5 +-
 .../io/graphson/_3_3_0/sessioneval-v3d0.json    |   19 +
 .../_3_3_0/sessionevalaliased-v2d0-partial.json |    5 +-
 .../_3_3_0/sessionevalaliased-v3d0.json         |   22 +
 .../_3_3_0/sessionlesseval-v2d0-partial.json    |    5 +-
 .../graphson/_3_3_0/sessionlesseval-v3d0.json   |   15 +
 .../sessionlessevalaliased-v2d0-partial.json    |    5 +-
 .../_3_3_0/sessionlessevalaliased-v3d0.json     |   18 +
 .../io/graphson/_3_3_0/short-v3d0.json          |    4 +
 .../_3_3_0/standardresult-v2d0-no-types.json    |    5 -
 .../_3_3_0/standardresult-v2d0-partial.json     |   20 -
 .../io/graphson/_3_3_0/standardresult-v3d0.json |   91 +
 .../_3_3_0/stargraph-v2d0-no-types.json         |    5 -
 .../graphson/_3_3_0/stargraph-v2d0-partial.json |   20 -
 .../io/graphson/_3_3_0/stargraph-v3d0.json      |   82 +
 .../structure/io/graphson/_3_3_0/t-v3d0.json    |    4 +
 .../io/graphson/_3_3_0/timestamp-v3d0.json      |    4 +
 .../_3_3_0/tinkergraph-v2d0-no-types.json       |   85 +-
 .../_3_3_0/tinkergraph-v2d0-partial.json        |  210 +-
 .../io/graphson/_3_3_0/tinkergraph-v3d0.json    |  829 ++++++
 .../graphson/_3_3_0/traversalmetrics-v3d0.json  |  114 +
 .../_3_3_0/traverser-v2d0-no-types.json         |    5 -
 .../graphson/_3_3_0/traverser-v2d0-partial.json |   20 -
 .../io/graphson/_3_3_0/traverser-v3d0.json      |  109 +
 .../io/graphson/_3_3_0/tree-v2d0-no-types.json  |    7 -
 .../io/graphson/_3_3_0/tree-v2d0-partial.json   |   28 -
 .../structure/io/graphson/_3_3_0/tree-v3d0.json |  165 ++
 .../structure/io/graphson/_3_3_0/uuid-v3d0.json |    4 +
 .../graphson/_3_3_0/vertex-v2d0-no-types.json   |    5 -
 .../io/graphson/_3_3_0/vertex-v2d0-partial.json |   20 -
 .../io/graphson/_3_3_0/vertex-v3d0.json         |  100 +
 .../_3_3_0/vertexproperty-v2d0-no-types.json    |    1 -
 .../_3_3_0/vertexproperty-v2d0-partial.json     |    4 -
 .../io/graphson/_3_3_0/vertexproperty-v3d0.json |   11 +
 .../structure/io/graphson/_3_3_0/year-v3d0.json |    4 +
 .../io/graphson/_3_3_0/yearmonth-v3d0.json      |    4 +
 .../io/graphson/_3_3_0/zoneddatetime-v3d0.json  |    4 +
 .../io/graphson/_3_3_0/zoneoffset-v3d0.json     |    4 +
 .../tinkergraph/structure/TinkerGraph.java      |    2 +-
 .../structure/TinkerIoRegistryV3d0.java         |  217 ++
 148 files changed, 7934 insertions(+), 677 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6143b48b/CHANGELOG.asciidoc
----------------------------------------------------------------------