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/13 18:52:52 UTC
[12/14] tinkerpop git commit: TINKERPOP-1565 Enabled more GraphSON IO
tests
TINKERPOP-1565 Enabled more GraphSON IO tests
It was now possible to enable more tests as certain changes that were made to master on the GraphSON 2.0 format could be reverted and then migrated to GraphSON 3.0.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c21ad3c8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c21ad3c8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c21ad3c8
Branch: refs/heads/TINKERPOP-1565
Commit: c21ad3c8ac46e8ea56a5f700151808e86866951d
Parents: 555cf34
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 15:11:19 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jan 12 15:38:09 2017 -0500
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/io/Model.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c21ad3c8/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 aa31756..6f3e29a 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
@@ -98,8 +98,6 @@ public class Model {
final GraphTraversalSource g = graph.traversal();
final Compatibility[] noTypeGraphSONPlusGryo3_2_3 = Compatibilities.with(GryoCompatibility.class).beforeRelease("3.2.4").join(Compatibilities.UNTYPED_GRAPHSON).matchToArray();
- final Compatibility[] graphsonV2NoType = Compatibilities.with(GraphSONCompatibility.class)
- .configuredAs(".*no-types").matchToArray();
// IMPORTANT - the "title" or name of the Entry needs to be unique
@@ -114,19 +112,16 @@ public class Model {
addCoreEntry(new java.sql.Timestamp(1481750076295L), "Timestamp", "", noTypeGraphSONPlusGryo3_2_3);
addCoreEntry(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), "UUID");
- // TODO: remove incompatibilities in Element on GraphSON 2.0
- // temporary incompatibility in v2 graphson starting at 3.3.0 with Element properties - need to revert some
- // changes on master (which is what helped start this mess) once this work is merged
- addGraphStructureEntry(graph.edges().next(), "Edge", "", graphsonV2NoType);
- addGraphStructureEntry(g.V().out().out().path().next(), "Path", "", graphsonV2NoType);
- addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "", graphsonV2NoType);
+ addGraphStructureEntry(graph.edges().next(), "Edge", "");
+ addGraphStructureEntry(g.V().out().out().path().next(), "Path", "");
+ addGraphStructureEntry(graph.edges().next().properties().next(), "Property", "");
// TODO: missing a stargraph deserializer in graphson v1/v2
addEntry("Graph Structure", StarGraph.of(graph.vertices().next()), "StarGraph", "", Compatibilities.GRYO_ONLY.match());
addGraphStructureEntry(graph, "TinkerGraph", "`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.");
// TODO: tree has bugs for graphson
addEntry("Graph Structure", g.V(1).out().out().tree().next(), "Tree", "", Compatibilities.GRYO_ONLY.match());
- addGraphStructureEntry(graph.vertices().next(), "Vertex", "", graphsonV2NoType);
- addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "", graphsonV2NoType);
+ addGraphStructureEntry(graph.vertices().next(), "Vertex", "");
+ addGraphStructureEntry(graph.vertices().next().properties().next(), "VertexProperty", "");
addGraphProcessEntry(SackFunctions.Barrier.normSack, "Barrier", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" refers to a `Bytecode.Binding`.", Compatibilities.UNTYPED_GRAPHSON.matchToArray());