Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1130 472043e37 -> 70c5920ea
TINKERPOP-1130 Revised the model for Tree Added more asserts for the Tree. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/70c5920e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/70c5920e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/70c5920e Branch: refs/heads/TINKERPOP-1130 Commit: 70c5920ea6913ecb7438ad5d1fb3ec617902b759 Parents: 472043e Author: Stephen Mallette <[email protected]> Authored: Thu Dec 29 09:34:39 2016 -0500 Committer: Stephen Mallette <[email protected]> Committed: Thu Dec 29 09:34:39 2016 -0500 ---------------------------------------------------------------------- .../tinkerpop/gremlin/structure/io/Model.java | 2 +- .../io/AbstractTypedCompatibilityTest.java | 12 + .../_3_2_3/manual-graphson-generator.groovy | 4 +- .../structure/io/graphson/_3_2_3/tree-v1d0.json | 202 -------- .../io/graphson/_3_2_3/tree-v2d0-no-types.json | 197 ------- .../io/graphson/_3_2_3/tree-v2d0-partial.json | 443 ---------------- .../_3_2_4/manual-graphson-generator.groovy | 4 +- .../structure/io/graphson/_3_2_4/tree-v1d0.json | 202 -------- .../io/graphson/_3_2_4/tree-v2d0-no-types.json | 197 ------- .../io/graphson/_3_2_4/tree-v2d0-partial.json | 443 ---------------- .../io/graphson/_3_3_0/tree-v2d0-no-types.json | 216 -------- .../io/graphson/_3_3_0/tree-v2d0-partial.json | 519 ------------------- .../io/gryo/_3_2_3/manual-gryo-generator.groovy | 2 +- .../structure/io/gryo/_3_2_3/tree-v1d0.kryo | Bin 762 -> 284 bytes .../io/gryo/_3_2_4/manual-gryo-generator.groovy | 2 +- .../structure/io/gryo/_3_2_4/tree-v1d0.kryo | Bin 762 -> 284 bytes .../structure/io/gryo/_3_3_0/tree-v1d0.kryo | Bin 762 -> 284 bytes .../structure/io/gryo/_3_3_0/tree-v3d0.kryo | Bin 762 -> 284 bytes 18 files changed, 19 insertions(+), 2426 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java index d2a646e..3ecaccb 100644 --- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java +++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java @@ -135,7 +135,7 @@ public class Model { put(GryoCompatibility.V1D0_3_2_3, "Serialization of TinkerGraph had a bug that prevented proper operation in versions prior to 3.2.4."); put(GraphSONCompatibility.V2D0_PARTIAL_3_2_3, "Serialization of TinkerGraph had a bug that prevented proper operation in versions prior to 3.2.4."); }}, GryoCompatibility.V1D0_3_2_3, GraphSONCompatibility.V2D0_PARTIAL_3_2_3); - addEntry("Graph Structure", g.V().out().out().tree().next(), "Tree", "", GRYO_ONLY); + addEntry("Graph Structure", g.V(1).out().out().tree().next(), "Tree", "", GRYO_ONLY); addGraphStructureEntry(graph.vertices().next(), "Vertex"); addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty"); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java index 49fd939..66626b2 100644 --- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java +++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java @@ -873,6 +873,18 @@ public abstract class AbstractTypedCompatibilityTest extends AbstractCompatibili final Tree fromStatic = read(getCompatibility().readFromResource(resourceName), Tree.class); final Tree recycled = read(write(fromStatic, Tree.class), Tree.class); assertNotSame(fromStatic, recycled); + assertEquals(resource.size(), fromStatic.size()); + assertVertex((Vertex) resource.keySet().iterator().next(), (Vertex) fromStatic.keySet().iterator().next()); + assertEquals(resource.getLeafObjects().size(), fromStatic.getLeafObjects().size()); + assertVertex((Vertex) resource.getLeafObjects().get(0), (Vertex) fromStatic.getLeafObjects().get(0)); + assertEquals(resource.getObjectsAtDepth(1).size(), fromStatic.getObjectsAtDepth(1).size()); + assertVertex((Vertex) resource.getObjectsAtDepth(1).get(0), (Vertex) fromStatic.getObjectsAtDepth(1).get(0)); + assertEquals(resource.size(), recycled.size()); + assertVertex((Vertex) resource.keySet().iterator().next(), (Vertex) recycled.keySet().iterator().next()); + assertEquals(resource.getLeafObjects().size(), recycled.getLeafObjects().size()); + assertVertex((Vertex) resource.getLeafObjects().get(0), (Vertex) recycled.getLeafObjects().get(0)); + assertEquals(resource.getObjectsAtDepth(1).size(), recycled.getObjectsAtDepth(1).size()); + assertVertex((Vertex) resource.getObjectsAtDepth(1).get(0), (Vertex) recycled.getObjectsAtDepth(1).get(0)); } @Test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy index 2e6c5bc..f4afd07 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/manual-graphson-generator.groovy @@ -70,7 +70,7 @@ writeSupportedV1Objects = { writer, mapper -> writer.write(toJsonV1d0NoTypes(graph.edges().next().properties().next(), "Property", mapper)) writer.write(toJsonV1d0NoTypes(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper)) writer.write(toJsonV1d0NoTypes(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.")) - writer.write(toJsonV1d0NoTypes(g.V().out().out().tree().next(), "Tree", mapper)) + writer.write(toJsonV1d0NoTypes(g.V(1).out().out().tree().next(), "Tree", mapper)) writer.write(toJsonV1d0NoTypes(graph.vertices().next(), "Vertex", mapper)) writer.write(toJsonV1d0NoTypes(graph.vertices().next().properties().next(), "VertexProperty", mapper)) @@ -203,7 +203,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction -> writer.write(toJsonFunction(graph.edges().next().properties().next(), "Property", mapper)) writer.write(toJsonFunction(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper)) writer.write(toJsonFunction(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.")) - writer.write(toJsonFunction(g.V().out().out().tree().next(), "Tree", mapper)) + writer.write(toJsonFunction(g.V(1).out().out().tree().next(), "Tree", mapper)) writer.write(toJsonFunction(graph.vertices().next(), "Vertex", mapper)) writer.write(toJsonFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper)) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json index db030dd..7efbb83 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v1d0.json @@ -70,207 +70,5 @@ } } } - }, - "7" : { - "key" : { - "id" : 7, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 1, - "value" : "stephen" - } ], - "location" : [ { - "id" : 10, - "value" : "centreville", - "properties" : { - "startTime" : 1990, - "endTime" : 2000 - } - }, { - "id" : 11, - "value" : "dulles", - "properties" : { - "startTime" : 2000, - "endTime" : 2006 - } - }, { - "id" : 12, - "value" : "purcellville", - "properties" : { - "startTime" : 2006 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } - }, - "8" : { - "key" : { - "id" : 8, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 2, - "value" : "matthias" - } ], - "location" : [ { - "id" : 13, - "value" : "bremen", - "properties" : { - "startTime" : 2004, - "endTime" : 2007 - } - }, { - "id" : 14, - "value" : "baltimore", - "properties" : { - "startTime" : 2007, - "endTime" : 2011 - } - }, { - "id" : 15, - "value" : "oakland", - "properties" : { - "startTime" : 2011, - "endTime" : 2014 - } - }, { - "id" : 16, - "value" : "seattle", - "properties" : { - "startTime" : 2014 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } - }, - "9" : { - "key" : { - "id" : 9, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 3, - "value" : "daniel" - } ], - "location" : [ { - "id" : 17, - "value" : "spremberg", - "properties" : { - "startTime" : 1982, - "endTime" : 2005 - } - }, { - "id" : 18, - "value" : "kaiserslautern", - "properties" : { - "startTime" : 2005, - "endTime" : 2009 - } - }, { - "id" : 19, - "value" : "aachen", - "properties" : { - "startTime" : 2009 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json index 50c2417..79231e8 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-no-types.json @@ -69,201 +69,4 @@ "value" : [ ] } ] } ] -}, { - "key" : { - "id" : 7, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 1, - "value" : "stephen", - "label" : "name" - } ], - "location" : [ { - "id" : 10, - "value" : "centreville", - "label" : "location", - "properties" : { - "startTime" : 1990, - "endTime" : 2000 - } - }, { - "id" : 11, - "value" : "dulles", - "label" : "location", - "properties" : { - "startTime" : 2000, - "endTime" : 2006 - } - }, { - "id" : 12, - "value" : "purcellville", - "label" : "location", - "properties" : { - "startTime" : 2006 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 8, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 2, - "value" : "matthias", - "label" : "name" - } ], - "location" : [ { - "id" : 13, - "value" : "bremen", - "label" : "location", - "properties" : { - "startTime" : 2004, - "endTime" : 2007 - } - }, { - "id" : 14, - "value" : "baltimore", - "label" : "location", - "properties" : { - "startTime" : 2007, - "endTime" : 2011 - } - }, { - "id" : 15, - "value" : "oakland", - "label" : "location", - "properties" : { - "startTime" : 2011, - "endTime" : 2014 - } - }, { - "id" : 16, - "value" : "seattle", - "label" : "location", - "properties" : { - "startTime" : 2014 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 9, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 3, - "value" : "daniel", - "label" : "name" - } ], - "location" : [ { - "id" : 17, - "value" : "spremberg", - "label" : "location", - "properties" : { - "startTime" : 1982, - "endTime" : 2005 - } - }, { - "id" : 18, - "value" : "kaiserslautern", - "label" : "location", - "properties" : { - "startTime" : 2005, - "endTime" : 2009 - } - }, { - "id" : 19, - "value" : "aachen", - "label" : "location", - "properties" : { - "startTime" : 2009 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] } ] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json index 03b4a5a..74dcffc 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/tree-v2d0-partial.json @@ -161,448 +161,5 @@ } } ] } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 1 - }, - "value" : "stephen", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 10 - }, - "value" : "centreville", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1990 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2000 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 11 - }, - "value" : "dulles", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2000 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 12 - }, - "value" : "purcellville", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 2 - }, - "value" : "matthias", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 13 - }, - "value" : "bremen", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2004 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2007 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 14 - }, - "value" : "baltimore", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2007 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2011 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 15 - }, - "value" : "oakland", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2011 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 16 - }, - "value" : "seattle", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 3 - }, - "value" : "daniel", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 17 - }, - "value" : "spremberg", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1982 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2005 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 18 - }, - "value" : "kaiserslautern", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2005 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 19 - }, - "value" : "aachen", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy index 2e6c5bc..f4afd07 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/manual-graphson-generator.groovy @@ -70,7 +70,7 @@ writeSupportedV1Objects = { writer, mapper -> writer.write(toJsonV1d0NoTypes(graph.edges().next().properties().next(), "Property", mapper)) writer.write(toJsonV1d0NoTypes(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper)) writer.write(toJsonV1d0NoTypes(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.")) - writer.write(toJsonV1d0NoTypes(g.V().out().out().tree().next(), "Tree", mapper)) + writer.write(toJsonV1d0NoTypes(g.V(1).out().out().tree().next(), "Tree", mapper)) writer.write(toJsonV1d0NoTypes(graph.vertices().next(), "Vertex", mapper)) writer.write(toJsonV1d0NoTypes(graph.vertices().next().properties().next(), "VertexProperty", mapper)) @@ -203,7 +203,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction -> writer.write(toJsonFunction(graph.edges().next().properties().next(), "Property", mapper)) writer.write(toJsonFunction(new org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), Direction.BOTH), "StarGraph", mapper)) writer.write(toJsonFunction(graph, "TinkerGraph", mapper, "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.")) - writer.write(toJsonFunction(g.V().out().out().tree().next(), "Tree", mapper)) + writer.write(toJsonFunction(g.V(1).out().out().tree().next(), "Tree", mapper)) writer.write(toJsonFunction(graph.vertices().next(), "Vertex", mapper)) writer.write(toJsonFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper)) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json index db030dd..7efbb83 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v1d0.json @@ -70,207 +70,5 @@ } } } - }, - "7" : { - "key" : { - "id" : 7, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 1, - "value" : "stephen" - } ], - "location" : [ { - "id" : 10, - "value" : "centreville", - "properties" : { - "startTime" : 1990, - "endTime" : 2000 - } - }, { - "id" : 11, - "value" : "dulles", - "properties" : { - "startTime" : 2000, - "endTime" : 2006 - } - }, { - "id" : 12, - "value" : "purcellville", - "properties" : { - "startTime" : 2006 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } - }, - "8" : { - "key" : { - "id" : 8, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 2, - "value" : "matthias" - } ], - "location" : [ { - "id" : 13, - "value" : "bremen", - "properties" : { - "startTime" : 2004, - "endTime" : 2007 - } - }, { - "id" : 14, - "value" : "baltimore", - "properties" : { - "startTime" : 2007, - "endTime" : 2011 - } - }, { - "id" : 15, - "value" : "oakland", - "properties" : { - "startTime" : 2011, - "endTime" : 2014 - } - }, { - "id" : 16, - "value" : "seattle", - "properties" : { - "startTime" : 2014 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } - }, - "9" : { - "key" : { - "id" : 9, - "label" : "person", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 3, - "value" : "daniel" - } ], - "location" : [ { - "id" : 17, - "value" : "spremberg", - "properties" : { - "startTime" : 1982, - "endTime" : 2005 - } - }, { - "id" : 18, - "value" : "kaiserslautern", - "properties" : { - "startTime" : 2005, - "endTime" : 2009 - } - }, { - "id" : 19, - "value" : "aachen", - "properties" : { - "startTime" : 2009 - } - } ] - } - }, - "value" : { - "10" : { - "key" : { - "id" : 10, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin" - } ] - } - }, - "value" : { - "11" : { - "key" : { - "id" : 11, - "label" : "software", - "type" : "vertex", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph" - } ] - } - }, - "value" : { } - } - } - } - } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json index 50c2417..79231e8 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-no-types.json @@ -69,201 +69,4 @@ "value" : [ ] } ] } ] -}, { - "key" : { - "id" : 7, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 1, - "value" : "stephen", - "label" : "name" - } ], - "location" : [ { - "id" : 10, - "value" : "centreville", - "label" : "location", - "properties" : { - "startTime" : 1990, - "endTime" : 2000 - } - }, { - "id" : 11, - "value" : "dulles", - "label" : "location", - "properties" : { - "startTime" : 2000, - "endTime" : 2006 - } - }, { - "id" : 12, - "value" : "purcellville", - "label" : "location", - "properties" : { - "startTime" : 2006 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 8, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 2, - "value" : "matthias", - "label" : "name" - } ], - "location" : [ { - "id" : 13, - "value" : "bremen", - "label" : "location", - "properties" : { - "startTime" : 2004, - "endTime" : 2007 - } - }, { - "id" : 14, - "value" : "baltimore", - "label" : "location", - "properties" : { - "startTime" : 2007, - "endTime" : 2011 - } - }, { - "id" : 15, - "value" : "oakland", - "label" : "location", - "properties" : { - "startTime" : 2011, - "endTime" : 2014 - } - }, { - "id" : 16, - "value" : "seattle", - "label" : "location", - "properties" : { - "startTime" : 2014 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 9, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 3, - "value" : "daniel", - "label" : "name" - } ], - "location" : [ { - "id" : 17, - "value" : "spremberg", - "label" : "location", - "properties" : { - "startTime" : 1982, - "endTime" : 2005 - } - }, { - "id" : 18, - "value" : "kaiserslautern", - "label" : "location", - "properties" : { - "startTime" : 2005, - "endTime" : 2009 - } - }, { - "id" : 19, - "value" : "aachen", - "label" : "location", - "properties" : { - "startTime" : 2009 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] } ] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json index 03b4a5a..74dcffc 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/tree-v2d0-partial.json @@ -161,448 +161,5 @@ } } ] } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 1 - }, - "value" : "stephen", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 10 - }, - "value" : "centreville", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1990 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2000 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 11 - }, - "value" : "dulles", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2000 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 12 - }, - "value" : "purcellville", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 2 - }, - "value" : "matthias", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 13 - }, - "value" : "bremen", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2004 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2007 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 14 - }, - "value" : "baltimore", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2007 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2011 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 15 - }, - "value" : "oakland", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2011 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 16 - }, - "value" : "seattle", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 3 - }, - "value" : "daniel", - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 17 - }, - "value" : "spremberg", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1982 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2005 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 18 - }, - "value" : "kaiserslautern", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2005 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 19 - }, - "value" : "aachen", - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json index 17b9648..c23fc2f 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-no-types.json @@ -76,220 +76,4 @@ "value" : [ ] } ] } ] -}, { - "key" : { - "id" : 7, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 1, - "value" : "stephen", - "vertex" : 7, - "label" : "name" - } ], - "location" : [ { - "id" : 10, - "value" : "centreville", - "vertex" : 7, - "label" : "location", - "properties" : { - "startTime" : 1990, - "endTime" : 2000 - } - }, { - "id" : 11, - "value" : "dulles", - "vertex" : 7, - "label" : "location", - "properties" : { - "startTime" : 2000, - "endTime" : 2006 - } - }, { - "id" : 12, - "value" : "purcellville", - "vertex" : 7, - "label" : "location", - "properties" : { - "startTime" : 2006 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "vertex" : 10, - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "vertex" : 11, - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 8, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 2, - "value" : "matthias", - "vertex" : 8, - "label" : "name" - } ], - "location" : [ { - "id" : 13, - "value" : "bremen", - "vertex" : 8, - "label" : "location", - "properties" : { - "startTime" : 2004, - "endTime" : 2007 - } - }, { - "id" : 14, - "value" : "baltimore", - "vertex" : 8, - "label" : "location", - "properties" : { - "startTime" : 2007, - "endTime" : 2011 - } - }, { - "id" : 15, - "value" : "oakland", - "vertex" : 8, - "label" : "location", - "properties" : { - "startTime" : 2011, - "endTime" : 2014 - } - }, { - "id" : 16, - "value" : "seattle", - "vertex" : 8, - "label" : "location", - "properties" : { - "startTime" : 2014 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "vertex" : 10, - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "vertex" : 11, - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] -}, { - "key" : { - "id" : 9, - "label" : "person", - "properties" : { - "name" : [ { - "id" : 3, - "value" : "daniel", - "vertex" : 9, - "label" : "name" - } ], - "location" : [ { - "id" : 17, - "value" : "spremberg", - "vertex" : 9, - "label" : "location", - "properties" : { - "startTime" : 1982, - "endTime" : 2005 - } - }, { - "id" : 18, - "value" : "kaiserslautern", - "vertex" : 9, - "label" : "location", - "properties" : { - "startTime" : 2005, - "endTime" : 2009 - } - }, { - "id" : 19, - "value" : "aachen", - "vertex" : 9, - "label" : "location", - "properties" : { - "startTime" : 2009 - } - } ] - } - }, - "value" : [ { - "key" : { - "id" : 10, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 4, - "value" : "gremlin", - "vertex" : 10, - "label" : "name" - } ] - } - }, - "value" : [ { - "key" : { - "id" : 11, - "label" : "software", - "properties" : { - "name" : [ { - "id" : 5, - "value" : "tinkergraph", - "vertex" : 11, - "label" : "name" - } ] - } - }, - "value" : [ ] - } ] - } ] } ] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json index 70a4a65..2b6c597 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v2d0-partial.json @@ -189,524 +189,5 @@ } } ] } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 1 - }, - "value" : "stephen", - "vertex" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 10 - }, - "value" : "centreville", - "vertex" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1990 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2000 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 11 - }, - "value" : "dulles", - "vertex" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2000 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 12 - }, - "value" : "purcellville", - "vertex" : { - "@type" : "g:Int32", - "@value" : 7 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2006 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "vertex" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "vertex" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 2 - }, - "value" : "matthias", - "vertex" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 13 - }, - "value" : "bremen", - "vertex" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2004 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2007 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 14 - }, - "value" : "baltimore", - "vertex" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2007 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2011 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 15 - }, - "value" : "oakland", - "vertex" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2011 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 16 - }, - "value" : "seattle", - "vertex" : { - "@type" : "g:Int32", - "@value" : 8 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2014 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "vertex" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "vertex" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } - }, { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "person", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 3 - }, - "value" : "daniel", - "vertex" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "name" - } - } ], - "location" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 17 - }, - "value" : "spremberg", - "vertex" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 1982 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2005 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 18 - }, - "value" : "kaiserslautern", - "vertex" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2005 - }, - "endTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - }, { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 19 - }, - "value" : "aachen", - "vertex" : { - "@type" : "g:Int32", - "@value" : 9 - }, - "label" : "location", - "properties" : { - "startTime" : { - "@type" : "g:Int32", - "@value" : 2009 - } - } - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 4 - }, - "value" : "gremlin", - "vertex" : { - "@type" : "g:Int32", - "@value" : 10 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ { - "key" : { - "@type" : "g:Vertex", - "@value" : { - "id" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "software", - "properties" : { - "name" : [ { - "@type" : "g:VertexProperty", - "@value" : { - "id" : { - "@type" : "g:Int64", - "@value" : 5 - }, - "value" : "tinkergraph", - "vertex" : { - "@type" : "g:Int32", - "@value" : 11 - }, - "label" : "name" - } - } ] - } - } - }, - "value" : { - "@type" : "g:Tree", - "@value" : [ ] - } - } ] - } - } ] - } } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy index 9a14e20..9eadc19 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/manual-gryo-generator.groovy @@ -104,7 +104,7 @@ writeSupportedObjects = { mapper, toGryoFunction -> toGryoFunction(graph.edges().next().properties().next(), "Property", mapper) toGryoFunction(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), "StarGraph", mapper) toGryoFunction(graph, "TinkerGraph", mapper) - toGryoFunction(g.V().out().out().tree().next(), "Tree", mapper) + toGryoFunction(g.V(1).out().out().tree().next(), "Tree", mapper) toGryoFunction(graph.vertices().next(), "Vertex", mapper) toGryoFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo index 997b6e9..682529f 100644 Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/tree-v1d0.kryo differ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy index d5576c8..36b23c3 100644 --- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy +++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/manual-gryo-generator.groovy @@ -104,7 +104,7 @@ writeSupportedObjects = { mapper, toGryoFunction -> toGryoFunction(graph.edges().next().properties().next(), "Property", mapper) toGryoFunction(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()), "StarGraph", mapper) toGryoFunction(graph, "TinkerGraph", mapper) - toGryoFunction(g.V().out().out().tree().next(), "Tree", mapper) + toGryoFunction(g.V(1).out().out().tree().next(), "Tree", mapper) toGryoFunction(graph.vertices().next(), "Vertex", mapper) toGryoFunction(graph.vertices().next().properties().next(), "VertexProperty", mapper) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/tree-v1d0.kryo ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/tree-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/tree-v1d0.kryo index 997b6e9..682529f 100644 Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/tree-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/tree-v1d0.kryo differ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo index 997b6e9..682529f 100644 Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v1d0.kryo differ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70c5920e/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v3d0.kryo ---------------------------------------------------------------------- diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v3d0.kryo index 997b6e9..682529f 100644 Binary files a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v3d0.kryo and b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/tree-v3d0.kryo differ
