Merge branch 'TINKERPOP-1520'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a492f876 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a492f876 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a492f876 Branch: refs/heads/master Commit: a492f876308298b53676e3dca78003f8cf6049c7 Parents: e70e400 73859cc Author: Marko A. Rodriguez <[email protected]> Authored: Thu Nov 24 04:52:16 2016 -0700 Committer: Marko A. Rodriguez <[email protected]> Committed: Thu Nov 24 04:52:16 2016 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 6 + docs/src/dev/io/graphson.asciidoc | 618 +++++++++++++------ .../gremlin/jsr223/JavaTranslator.java | 6 - .../remote/traversal/step/map/RemoteStep.java | 2 + .../gremlin/process/traversal/Bytecode.java | 4 +- .../traversal/dsl/graph/GraphTraversal.java | 11 +- .../finalization/MatchAlgorithmStrategy.java | 6 +- .../process/traversal/util/BytecodeHelper.java | 35 ++ .../io/graphson/GraphSONSerializersV2d0.java | 133 ++-- .../structure/io/graphson/GraphSONTokens.java | 1 + .../structure/io/graphson/GraphSONUtil.java | 10 +- .../gremlin/structure/io/gryo/GryoMapper.java | 49 +- .../structure/io/gryo/GryoSerializers.java | 11 +- .../util/detached/DetachedVertexProperty.java | 4 +- .../gremlin/process/traversal/BytecodeTest.java | 4 +- .../traversal/dsl/graph/GraphTraversalTest.java | 104 +++- .../src/test/resources/log4j-silent.properties | 5 +- .../src/test/resources/log4j-test.properties | 5 +- .../ser/GraphSONMessageSerializerV2d0Test.java | 4 +- .../step/map/GroovyPropertiesTest.groovy | 6 + .../step/sideEffect/GroovySackTest.groovy | 8 +- .../gremlin/groovy/jsr223/GroovyTranslator.java | 24 +- .../python/GraphTraversalSourceGenerator.groovy | 14 +- .../gremlin/python/jsr223/PythonTranslator.java | 38 +- .../gremlin_python/process/graph_traversal.py | 17 +- .../jython/gremlin_python/process/strategies.py | 2 +- .../jython/gremlin_python/structure/graph.py | 11 +- .../gremlin_python/structure/io/graphson.py | 84 ++- .../driver/test_driver_remote_connection.py | 2 +- .../jython/tests/structure/io/test_graphson.py | 82 ++- .../main/jython/tests/structure/test_graph.py | 12 +- .../jsr223/PythonGraphSONJavaTranslator.java | 34 +- .../gremlin/python/jsr223/PythonProvider.java | 3 - .../RemoteGraphGroovyTranslatorProvider.java | 29 +- .../process/traversal/CoreTraversalTest.java | 32 +- .../traversal/step/map/PropertiesTest.java | 16 + .../traversal/step/sideEffect/SackTest.java | 8 +- .../decoration/TranslationStrategy.java | 26 +- .../gremlin/structure/io/IoPropertyTest.java | 17 + .../TinkerGraphGroovyTranslatorProvider.java | 4 - .../TinkerGraphJavaTranslatorProvider.java | 2 - .../io/graphson/GraphSONTranslator.java | 5 +- .../TinkerGraphGraphSONTranslatorProvider.java | 6 - .../structure/io/gryo/GryoTranslator.java | 6 +- .../gryo/TinkerGraphGryoTranslatorProvider.java | 8 +- 45 files changed, 1131 insertions(+), 383 deletions(-) ----------------------------------------------------------------------
