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/18 17:16:00 UTC
[01/50] [abbrv] tinkerpop git commit: Added `skip()` in the reference
docs. [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1565 bbbfce160 -> 9aebbe63c (forced update)
Added `skip()` in the reference docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71de237d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71de237d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71de237d
Branch: refs/heads/TINKERPOP-1565
Commit: 71de237d32b687d2ee70ccecd2e7bf8d86a64b24
Parents: 3d0aa6e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 10 11:26:53 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 10 11:26:53 2017 +0100
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 29 ++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71de237d/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index b468e48..0dafd22 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -1916,6 +1916,35 @@ g.V(1).both().both().simplePath()
g.V(1).both().both().simplePath().path()
----
+[[skip-step]]
+Skip Step
+~~~~~~~~~
+
+The `skip()`-step is analogous to <<range-step,`range()`-step>> save that the higher end range is set to -1.
+
+[gremlin-groovy,modern]
+----
+g.V().skip(2)
+g.V().range(2, -1)
+g.V().skip(2).toString()
+----
+
+The `skip()`-step can also be applied with `Scope.local`, in which case it operates on the incoming collection.
+
+[gremlin-groovy,modern]
+----
+g.V().hasLabel('person').filter(outE('created')).as('p'). <1>
+ map(out('created').values('name').fold()).
+ project('person','primary','other').
+ by(select('p').by('name')).
+ by(limit(local, 1)). <2>
+ by(skip(local, 1)) <3>
+----
+
+<1> For each person who created something...
+<2> ...select the first project (random order) as `primary` and...
+<3> ...select all other projects as `other`.
+
[[store-step]]
Store Step
~~~~~~~~~~
[35/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/77a48f39
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/77a48f39
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/77a48f39
Branch: refs/heads/TINKERPOP-1565
Commit: 77a48f39aaa96e8d562e685d8136c117fad8b318
Parents: 16830e8 802ff9f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 19:05:26 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 19:05:26 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-console/conf/remote-objects.yaml | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 2 +-
.../tinkergraph/structure/TinkerIoRegistry.java | 2 +
.../structure/TinkerIoRegistryV1d0.java | 263 +++++++++++++++++++
.../structure/TinkerIoRegistryV2d0.java | 5 +-
.../TinkerGraphGryoSerializerTest.java | 1 -
.../TinkerGraphGryoSerializerV1d0Test.java | 83 ++++++
.../TinkerGraphGryoSerializerV2d0Test.java | 80 ++++++
.../tinkergraph/structure/TinkerGraphTest.java | 30 ++-
10 files changed, 463 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77a48f39/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77a48f39/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
[06/50] [abbrv] tinkerpop git commit: Added duplicate vertex recipe
Posted by sp...@apache.org.
Added duplicate vertex recipe
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7ecfc05
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7ecfc05
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7ecfc05
Branch: refs/heads/TINKERPOP-1565
Commit: d7ecfc05f9c476fed2ebf987e6b26bee14f5db54
Parents: 3e54d89
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 10:19:59 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 10:19:59 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/duplicate-vertex.asciidoc | 52 +++++++++++++++++++++++++
docs/src/recipes/index.asciidoc | 2 +
2 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7ecfc05/docs/src/recipes/duplicate-vertex.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/duplicate-vertex.asciidoc b/docs/src/recipes/duplicate-vertex.asciidoc
new file mode 100644
index 0000000..e0327f4
--- /dev/null
+++ b/docs/src/recipes/duplicate-vertex.asciidoc
@@ -0,0 +1,52 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+[[duplicate-vertex]]
+Duplicate Vertex Detection
+--------------------------
+
+The pattern for finding duplicate vertices is quite similar to the pattern defined in the <<duplicate-edge,Duplicate Edge>>
+section. The idea is to extract the relevant features of the vertex into a comparable list that can then be used to
+group for duplicates.
+
+Consider the following example with some duplicate vertices added to the "modern" graph:
+
+[gremlin-groovy,modern]
+----
+g.addV(label, 'person', 'name', 'vadas', 'age', 27)
+g.addV(label, 'person', 'name', 'vadas', 'age', 22) // not a duplicate because "age" value
+g.addV(label, 'person', 'name', 'marko', 'age', 29)
+g.V().hasLabel("person").
+ group().
+ by(values("name", "age").fold()).
+ unfold()
+----
+
+In the above case, the "name" and "age" properties are the relevant features for identifying duplication. The key in
+the `Map` provided by the `group` is the list of features for comparison and the value is the list of vertices that
+match the feature. To extract just those vertices that contain duplicates an additional filter can be added:
+
+[gremlin-groovy,existing]
+----
+g.V().hasLabel("person").
+ group().
+ by(values("name", "age").fold()).
+ unfold().
+ filter(select(values).count(local).is(gt(1)))
+----
+
+That filter, extracts the values of the `Map` and counts the vertices within each list. If that list contains more than
+one vertex then it is a duplicate.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7ecfc05/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index f77b929..31095c0 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -46,6 +46,8 @@ include::cycle-detection.asciidoc[]
include::duplicate-edge.asciidoc[]
+include::duplicate-vertex.asciidoc[]
+
include::if-then-based-grouping.asciidoc[]
include::pagination.asciidoc[]
[47/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Stub out
GraphSON 3.0
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
new file mode 100644
index 0000000..c1e43b5
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
@@ -0,0 +1,342 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+/**
+ * Serializer tests that cover non-lossy serialization/deserialization methods.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONMessageSerializerV3d0Test {
+
+ private final UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+ private final ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+ private final static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+ public final MessageSerializer serializer = new GraphSONMessageSerializerV3d0();
+
+ @Test
+ public void shouldSerializeIterable() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(2, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertEquals(new Integer(100), deserializedFunList.get(1));
+ }
+
+ @Test
+ public void shouldSerializeIterableWithNull() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(null);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(3, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertNull(deserializedFunList.get(1));
+ assertEquals(new Integer(100), deserializedFunList.get(2));
+ }
+
+ @Test
+ public void shouldSerializeMap() throws Exception {
+ final Map<String, Object> map = new HashMap<>();
+ final Map<String, String> innerMap = new HashMap<>();
+ innerMap.put("a", "b");
+
+ map.put("x", 1);
+ map.put("y", "some");
+ map.put("z", innerMap);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+ assertEquals(3, deserializedMap.size());
+ assertEquals(1, deserializedMap.get("x"));
+ assertEquals("some", deserializedMap.get("y"));
+
+ final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+ assertEquals(1, deserializedInnerMap.size());
+ assertEquals("b", deserializedInnerMap.get("a"));
+ }
+
+ @Test
+ public void shouldSerializeMapEntries() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Date d = new Date();
+
+ final Map<Object, Object> map = new HashMap<>();
+ map.put("x", 1);
+ map.put(v1, 100);
+ map.put(d, "test");
+
+ final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
+ assertCommon(response);
+
+ final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(3, deserializedEntries.size());
+ deserializedEntries.forEach(e -> {
+ if (e.containsKey("x"))
+ assertEquals(1, e.get("x"));
+ else if (e.containsKey(v1.id().toString()))
+ assertEquals(100, e.get(v1.id().toString()));
+ else if (e.containsKey(StdDateFormat.instance.format(d)))
+ assertEquals("test", e.get(StdDateFormat.instance.format(d)));
+ else
+ fail("Map entries contains a key that is not part of what was serialized");
+ });
+ }
+
+ @Test
+ public void shouldSerializeEdge() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
+
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Edge> edgeList = (List<Edge>) response.getResult().getData();
+ assertEquals(1, edgeList.size());
+
+ final Edge deserializedEdge = edgeList.get(0);
+ assertEquals(e.id(), deserializedEdge.id());
+ assertEquals(v1.id(), deserializedEdge.outVertex().id());
+ assertEquals(v2.id(), deserializedEdge.inVertex().id());
+ assertEquals(v1.label(), deserializedEdge.outVertex().label());
+ assertEquals(v2.label(), deserializedEdge.inVertex().label());
+ assertEquals(e.label(), deserializedEdge.label());
+
+ final List<Property> properties = new ArrayList<>();
+ deserializedEdge.properties().forEachRemaining(properties::add);
+ assertEquals(1, properties.size());
+
+ assertNotNull(properties);
+ assertEquals("abc", properties.get(0).key());
+ assertEquals(123, properties.get(0).value());
+
+ }
+
+ @Test
+ public void shouldSerializeEdgeProperty() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Property> propertyList = (List<Property>) response.getResult().getData();
+ assertEquals(1, propertyList.size());
+ assertEquals(123, propertyList.get(0).value());
+ }
+
+ @Test
+ public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v = graph.addVertex();
+ final Map<String, Object> map = new HashMap<>();
+ map.put("x", 500);
+ map.put("y", "some");
+
+ final ArrayList<Object> friends = new ArrayList<>();
+ friends.add("x");
+ friends.add(5);
+ friends.add(map);
+
+ v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+ final List list = IteratorUtils.list(graph.vertices());
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Vertex> vertexList = (List<Vertex>) response.getResult().getData();
+ assertEquals(1, vertexList.size());
+
+ final Vertex deserializedVertex = vertexList.get(0);
+ assertEquals(v.id(), deserializedVertex.id());
+ assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.label());
+
+ final List<VertexProperty> properties = new ArrayList<>();
+ deserializedVertex.properties().forEachRemaining(properties::add);
+ assertEquals(1, properties.size());
+
+ final VertexProperty friendsProperty = properties.get(0);
+ final List<Object> deserializedInnerList = (List<Object>) friendsProperty.value();
+
+ assertEquals(3, deserializedInnerList.size());
+ assertEquals("x", deserializedInnerList.get(0));
+ assertEquals(5, deserializedInnerList.get(1));
+
+ final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+ assertEquals(2, deserializedInnerInnerMap.size());
+ assertEquals(500, deserializedInnerInnerMap.get("x"));
+ assertEquals("some", deserializedInnerInnerMap.get("y"));
+ }
+
+ @Test
+ public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map<Vertex, Integer> map = new HashMap<>();
+ map.put(g.V().has("name", "marko").next(), 1000);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
+ assertEquals(1, deserializedMap.size());
+
+ // with no embedded types the key (which is a vertex) simply serializes out to an id
+ // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+ assertEquals(new Integer(1000), deserializedMap.get("1"));
+ }
+
+ @Test
+ @org.junit.Ignore
+ public void shouldSerializeToTreeJson() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map t = g.V(1).out().properties("name").tree().next();
+
+ final ResponseMessage response = convert(t);
+ assertCommon(response);
+
+ final Tree deserializedTree = (Tree)response.getResult().getData();
+
+ //check the first object and its key's properties
+ assertEquals(1, deserializedTree.size());
+ final Vertex v = ((Vertex) deserializedTree.keySet().iterator().next());
+ assertEquals(1, v.id());
+ assertEquals("marko", v.property("name").value());
+
+ final Tree firstTree = (Tree)deserializedTree.get(v);
+ assertEquals(3, firstTree.size());
+ Iterator<Vertex> vertexKeys = firstTree.keySet().iterator();
+
+ Tree t2 = (Tree)firstTree.get(vertexKeys.next());
+ VertexProperty vp = (VertexProperty)t2.keySet().iterator().next();
+ assertEquals(3, vp.id());
+ assertEquals("vadas", vp.value());
+
+ t2 = (Tree) firstTree.get(vertexKeys.next());
+ vp = (VertexProperty) t2.keySet().iterator().next();
+ assertEquals(5, vp.id());
+ assertEquals("lop", vp.value());
+
+ t2 = (Tree) firstTree.get(vertexKeys.next());
+ vp = (VertexProperty) t2.keySet().iterator().next();
+ assertEquals(7, vp.id());
+ assertEquals("josh", vp.value());
+ }
+
+ @Test
+ public void shouldSerializeFullResponseMessage() throws Exception {
+ final UUID id = UUID.randomUUID();
+
+ final Map<String, Object> metaData = new HashMap<>();
+ metaData.put("test", "this");
+ metaData.put("one", 1);
+
+ final Map<String, Object> attributes = new HashMap<>();
+ attributes.put("test", "that");
+ attributes.put("two", 2);
+
+ final ResponseMessage response = ResponseMessage.build(id)
+ .responseMetaData(metaData)
+ .code(ResponseStatusCode.SUCCESS)
+ .result("some-result")
+ .statusAttributes(attributes)
+ .statusMessage("worked")
+ .create();
+
+ final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeResponse(bb);
+
+ assertEquals(id, deserialized.getRequestId());
+ assertEquals("this", deserialized.getResult().getMeta().get("test"));
+ assertEquals(1, deserialized.getResult().getMeta().get("one"));
+ assertEquals("some-result", deserialized.getResult().getData());
+ assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+ assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+ assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+ assertEquals("worked", deserialized.getStatus().getMessage());
+ }
+
+ private void assertCommon(final ResponseMessage response) {
+ assertEquals(requestId, response.getRequestId());
+ assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+ }
+
+ private ResponseMessage convert(final Object toSerialize) throws SerializationException {
+ final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+ return serializer.deserializeResponse(bb);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
index a5b3480..fe32c6e 100644
--- a/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
+++ b/gremlin-python/src/test/resources/org/apache/tinkerpop/gremlin/python/driver/gremlin-server-modern-secure-py.yaml
@@ -46,7 +46,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }} # application/json,application/vnd.gremlin-v3.0+json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-server/conf/gremlin-server-classic.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index d1cbbf3..da9068f 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -33,7 +33,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }} # application/json,application/vnd.gremlin-v3.0+json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-server/conf/gremlin-server-modern-py.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern-py.yaml b/gremlin-server/conf/gremlin-server-modern-py.yaml
index ff8228f..d8583ee 100644
--- a/gremlin-server/conf/gremlin-server-modern-py.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-py.yaml
@@ -48,7 +48,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }} # application/json,application/vnd.gremlin-v3.0+json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index b063868..c67f20f 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -33,7 +33,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }} # application/json,application/vnd.gremlin-v3.0+json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index d4e2849..3f3fc00 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -34,7 +34,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }} # application/json,application/vnd.gremlin-v3.0+json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index 691f637..2a3c6ed 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -180,7 +180,11 @@ toJsonV2d0NoTypes = { o, type, mapper, comment = "" ->
toJson(o, type, mapper, comment, "v2d0-no-types")
}
-writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
+toJsonV3d0 = { o, type, mapper, comment = "" ->
+ toJson(o, type, mapper, comment, "v3d0")
+}
+
+writeSupportedV2V3Objects = { writer, mapper, toJsonFunction ->
writer.write("Core\n")
writer.write("~~~~\n\n")
model.entries("Core").each {
@@ -241,7 +245,7 @@ mapper = GraphSONMapper.build().
file = new File("${project.build.directory}/dev-docs/out-graphson-2d0-partial.txt")
if (file.exists()) file.delete()
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0PartialTypes) }
+file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV2d0PartialTypes) }
mapper = GraphSONMapper.build().
addRegistry(TinkerIoRegistryV2d0.instance()).
@@ -252,7 +256,17 @@ mapper = GraphSONMapper.build().
file = new File("${project.build.directory}/dev-docs/out-graphson-2d0-no-type.txt")
if (file.exists()) file.delete()
-file.withWriter { writeSupportedV2Objects(it, mapper, toJsonV2d0NoTypes) }
+file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV2d0NoTypes) }
+
+mapper = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V3_0).create().createMapper()
+
+file = new File("${project.build.directory}/dev-docs/out-graphson-3d0.txt")
+if (file.exists()) file.delete()
+file.withWriter { writeSupportedV2V3Objects(it, mapper, toJsonV3d0) }
def ver = "_" + "${project.version}".replace(".","_").replace("-SNAPSHOT","")
def target = "${project.basedir}/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/" + ver
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
index 522988a..69a12e7 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONCompatibility.java
@@ -36,7 +36,8 @@ public enum GraphSONCompatibility implements Compatibility {
V2D0_NO_TYPE_3_2_4("3.2.4", "2.0", "v2d0-no-types"),
V1D0_3_3_0("3.3.0", "2.0", "v1d0"),
V2D0_PARTIAL_3_3_0("3.3.0", "2.0", "v2d0-partial"),
- V2D0_NO_TYPE_3_3_0("3.3.0", "2.0", "v2d0-no-types");
+ V2D0_NO_TYPE_3_3_0("3.3.0", "2.0", "v2d0-no-types"),
+ V3D0_PARTIAL_3_3_0("3.3.0", "3.0", "v3d0");
private static final String SEP = File.separator;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
index a3d2844..da200db 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypedCompatibilityTest.java
@@ -40,12 +40,19 @@ public class GraphSONTypedCompatibilityTest extends AbstractTypedCompatibilityTe
addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
version(GraphSONVersion.V2_0).create().createMapper();
+ private static ObjectMapper mapperV3 = GraphSONMapper.build().
+ addRegistry(TinkerIoRegistryV2d0.instance()).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ addCustomModule(new org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
+ version(GraphSONVersion.V3_0).create().createMapper();
+
@Parameterized.Parameters(name = "expect({0})")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
{GraphSONCompatibility.V2D0_PARTIAL_3_2_3, mapperV2 },
{GraphSONCompatibility.V2D0_PARTIAL_3_2_4, mapperV2 },
- {GraphSONCompatibility.V2D0_PARTIAL_3_3_0, mapperV2 }});
+ {GraphSONCompatibility.V2D0_PARTIAL_3_3_0, mapperV2 },
+ {GraphSONCompatibility.V3D0_PARTIAL_3_3_0, mapperV3 }});
}
@Parameterized.Parameter(value = 0)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json
new file mode 100644
index 0000000..8c5b82c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationchallenge-v3d0.json
@@ -0,0 +1,12 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
index b893667..838e1fd 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "authentication",
"processor" : "",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json
new file mode 100644
index 0000000..838e1fd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/authenticationresponse-v3d0.json
@@ -0,0 +1,9 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json
new file mode 100644
index 0000000..7ddccdd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/barrier-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Barrier",
+ "@value" : "normSack"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json
new file mode 100644
index 0000000..475337c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bigdecimal-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigDecimal",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json
new file mode 100644
index 0000000..58e6114
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/biginteger-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:BigInteger",
+ "@value" : 123456789987654321123456789987654321
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json
new file mode 100644
index 0000000..579b8c7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/binding-v3d0.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:Binding",
+ "@value" : {
+ "key" : "x",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json
new file mode 100644
index 0000000..979625b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/byte-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Byte",
+ "@value" : 1
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json
new file mode 100644
index 0000000..5724115
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytebuffer-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ByteBuffer",
+ "@value" : "c29tZSBieXRlcyBmb3IgeW91"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json
new file mode 100644
index 0000000..269d277
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/bytecode-v3d0.json
@@ -0,0 +1,6 @@
+{
+ "@type" : "g:Bytecode",
+ "@value" : {
+ "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json
new file mode 100644
index 0000000..834e64e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/cardinality-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Cardinality",
+ "@value" : "list"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json
new file mode 100644
index 0000000..8f27e9d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/char-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Char",
+ "@value" : "x"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json
new file mode 100644
index 0000000..80f15a2
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/class-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Class",
+ "@value" : "java.io.File"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json
new file mode 100644
index 0000000..0b3a56e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/column-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Column",
+ "@value" : "keys"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json
new file mode 100644
index 0000000..cf4007a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/date-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Date",
+ "@value" : 1481750076295
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json
new file mode 100644
index 0000000..78cb7e4
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/direction-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Direction",
+ "@value" : "OUT"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json
new file mode 100644
index 0000000..9ae4964
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/double-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Double",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json
new file mode 100644
index 0000000..05c0ce9
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/duration-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Duration",
+ "@value" : "PT120H"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-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/edge-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
index 8f0ecab..a8e73db 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-no-types.json
@@ -6,6 +6,9 @@
"inV" : 10,
"outV" : 1,
"properties" : {
- "since" : 2009
+ "since" : {
+ "key" : "since",
+ "value" : 2009
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
index 4c396f8..ba1c52e 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v2d0-partial.json
@@ -18,8 +18,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2009
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json
new file mode 100644
index 0000000..4c396f8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/edge-v3d0.json
@@ -0,0 +1,26 @@
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json
new file mode 100644
index 0000000..7179aaf
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/float-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Float",
+ "@value" : 100.0
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json
new file mode 100644
index 0000000..fba98c0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/inetaddress-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:InetAddress",
+ "@value" : "localhost"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json
new file mode 100644
index 0000000..3749741
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/instant-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Instant",
+ "@value" : "2016-12-14T16:39:19.349Z"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json
new file mode 100644
index 0000000..750ce7a
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/integer-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int32",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json
new file mode 100644
index 0000000..5be179b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/lambda-v3d0.json
@@ -0,0 +1,8 @@
+{
+ "@type" : "g:Lambda",
+ "@value" : {
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json
new file mode 100644
index 0000000..36fb81d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdate-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDate",
+ "@value" : "2016-01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json
new file mode 100644
index 0000000..2d83668
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localdatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalDateTime",
+ "@value" : "2016-01-01T12:30"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json
new file mode 100644
index 0000000..eff65a7
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/localtime-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:LocalTime",
+ "@value" : "12:30:45"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json
new file mode 100644
index 0000000..84b9a23
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/long-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Int64",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json
new file mode 100644
index 0000000..7b1e964
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/metrics-v3d0.json
@@ -0,0 +1,54 @@
+{
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json
new file mode 100644
index 0000000..5da5914
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/monthday-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:MonthDay",
+ "@value" : "--01-01"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json
new file mode 100644
index 0000000..03f45cd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsetdatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetDateTime",
+ "@value" : "2007-12-03T10:15:30+01:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json
new file mode 100644
index 0000000..b124953
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/offsettime-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:OffsetTime",
+ "@value" : "10:15:30+01:00"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json
new file mode 100644
index 0000000..14c1400
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/operator-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Operator",
+ "@value" : "sum"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
new file mode 100644
index 0000000..6ad66d8
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Order",
+ "@value" : "incr"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json
new file mode 100644
index 0000000..5bdfb3b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/p-v3d0.json
@@ -0,0 +1,10 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json
new file mode 100644
index 0000000..c271958
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pand-v3d0.json
@@ -0,0 +1,25 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "and",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "lt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-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/path-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
index f271288..06a9522 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-no-types.json
@@ -7,13 +7,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -22,7 +20,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -31,7 +28,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -40,7 +36,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
@@ -54,7 +49,6 @@
"name" : [ {
"id" : 4,
"value" : "gremlin",
- "vertex" : 10,
"label" : "name"
} ]
}
@@ -65,7 +59,6 @@
"name" : [ {
"id" : 5,
"value" : "tinkergraph",
- "vertex" : 11,
"label" : "name"
} ]
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
index 1acc3ea..54ff76d 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v2d0-partial.json
@@ -19,10 +19,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -34,10 +30,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -58,10 +50,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -82,10 +70,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -106,10 +90,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -138,10 +118,6 @@
"@value" : 4
},
"value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
"label" : "name"
}
} ]
@@ -164,10 +140,6 @@
"@value" : 5
},
"value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
"label" : "name"
}
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json
new file mode 100644
index 0000000..8a41507
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/path-v3d0.json
@@ -0,0 +1,122 @@
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json
new file mode 100644
index 0000000..20438a1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/period-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Period",
+ "@value" : "P1Y6M15D"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json
new file mode 100644
index 0000000..3ca2f2e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pick-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Pick",
+ "@value" : "any"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json
new file mode 100644
index 0000000..271515f
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/pop-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Pop",
+ "@value" : "all"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json
new file mode 100644
index 0000000..71fcb7d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/por-v3d0.json
@@ -0,0 +1,31 @@
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "or",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "within",
+ "value" : [ {
+ "@type" : "g:Int32",
+ "@value" : -1
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -10
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -100
+ } ]
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-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/property-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
index 187d0ab..c051c0a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-no-types.json
@@ -1,13 +1,4 @@
{
"key" : "since",
- "value" : 2009,
- "element" : {
- "@type" : "g:Edge",
- "@value" : {
- "id" : 13,
- "label" : "develops",
- "outV" : 1,
- "inV" : 10
- }
- }
+ "value" : 2009
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
index 1c6afa0..296fe32 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v2d0-partial.json
@@ -5,24 +5,6 @@
"value" : {
"@type" : "g:Int32",
"@value" : 2009
- },
- "element" : {
- "@type" : "g:Edge",
- "@value" : {
- "id" : {
- "@type" : "g:Int32",
- "@value" : 13
- },
- "label" : "develops",
- "outV" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
- "inV" : {
- "@type" : "g:Int32",
- "@value" : 10
- }
- }
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json
new file mode 100644
index 0000000..db2e8db
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/property-v3d0.json
@@ -0,0 +1,25 @@
+{
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ },
+ "edge" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json
new file mode 100644
index 0000000..4a74af0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/scope-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Scope",
+ "@value" : "local"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
index ee860ea..cc4386b 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "close",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json
new file mode 100644
index 0000000..cc4386b
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionclose-v3d0.json
@@ -0,0 +1,11 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "close",
+ "processor" : "session",
+ "args" : {
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
index 8d1d535..900e1ab 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json
new file mode 100644
index 0000000..900e1ab
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessioneval-v3d0.json
@@ -0,0 +1,19 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "g.V(x)",
+ "language" : "gremlin-groovy",
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
index f1f2dc2..924bf77 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "session",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json
new file mode 100644
index 0000000..924bf77
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionevalaliased-v3d0.json
@@ -0,0 +1,22 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
index b01e98f..81e2f6c 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json
new file mode 100644
index 0000000..81e2f6c
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlesseval-v3d0.json
@@ -0,0 +1,15 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "g.V(x)",
+ "language" : "gremlin-groovy",
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
[30/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c328dac3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c328dac3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c328dac3
Branch: refs/heads/TINKERPOP-1565
Commit: c328dac3af7860477f812f1a2e853d7122929d4d
Parents: b2866d4 e06ce0c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 12:23:25 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 12:23:25 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 262 +++++++++++++++++++
docs/src/recipes/connected-components.asciidoc | 82 ++++++
docs/src/recipes/cycle-detection.asciidoc | 55 ++++
docs/src/recipes/duplicate-edge.asciidoc | 160 +++++++++++
docs/src/recipes/duplicate-vertex.asciidoc | 52 ++++
docs/src/recipes/index.asciidoc | 8 +-
.../recipes/traversal-induced-values.asciidoc | 109 ++++++++
docs/src/reference/the-traversal.asciidoc | 4 +
docs/static/images/connected-components.png | Bin 0 -> 17946 bytes
docs/static/images/eulerian-circuit.png | Bin 0 -> 25270 bytes
.../images/traversal-induced-values-1.png | Bin 0 -> 12607 bytes
.../images/traversal-induced-values-2.png | Bin 0 -> 40440 bytes
.../images/traversal-induced-values-3.png | Bin 0 -> 49652 bytes
13 files changed, 731 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c328dac3/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[07/50] [abbrv] tinkerpop git commit: Added a recipe appendix entry
Posted by sp...@apache.org.
Added a recipe appendix entry
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0938ebdc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0938ebdc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0938ebdc
Branch: refs/heads/TINKERPOP-1565
Commit: 0938ebdce4b6d8512674503680c660eea9870e9e
Parents: d7ecfc0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 10:45:56 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 10:45:56 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0938ebdc/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 63ec447..15d7340 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -109,4 +109,19 @@ g.V().as("a").
unfold().
filter(select(values).is(gt(1))).
select(keys)
-----
\ No newline at end of file
+----
+
+[[appendix-e]]
+_In the "crew" graph, find vertices that match on a complete set of multi-properties._
+
+[gremlin-groovy,theCrew]
+----
+places = ["centreville","dulles"];[] // will not match as "purcellville" is missing
+g.V().not(has("location", without(places))).
+ where(values("location").is(within(places)).count().is(places.size())).
+ valueMap()
+places = ["centreville","dulles","purcellville"];[]
+g.V().not(has("location", without(places))).
+ where(values("location").is(within(places)).count().is(places.size())).
+ valueMap()
+----
[14/50] [abbrv] tinkerpop git commit: Fixed array handling in
`.hasId()` and `.hasValue()`.
Posted by sp...@apache.org.
Fixed array handling in `.hasId()` and `.hasValue()`.
This fix was originally implemented by @BrynCooke in a TP fork.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c66424d2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c66424d2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c66424d2
Branch: refs/heads/TINKERPOP-1565
Commit: c66424d2ebb29508095eee1ad516d2d6fb7475dd
Parents: 72aca97
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jan 13 12:30:49 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jan 13 12:30:49 2017 +0100
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c66424d2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index fae2d67..abcb870 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -989,7 +989,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.hasId((P) id);
else {
final List<Object> ids = new ArrayList<>();
- if (id.getClass().isArray()) {
+ if (id instanceof Object[]) {
for (final Object i : (Object[]) id) {
ids.add(i);
}
@@ -1031,14 +1031,14 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.hasValue((P) value);
else {
final List<Object> values = new ArrayList<>();
- if (value.getClass().isArray()) {
+ if (value instanceof Object[]) {
for (final Object v : (Object[]) value) {
values.add(v);
}
} else
values.add(value);
for (final Object v : otherValues) {
- if (v.getClass().isArray()) {
+ if (v instanceof Object[]) {
for (final Object vv : (Object[]) v) {
values.add(vv);
}
[21/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fcb5af38
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fcb5af38
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fcb5af38
Branch: refs/heads/TINKERPOP-1565
Commit: fcb5af3876c3aa6c52b79c150dad5a6cb34c9135
Parents: cce5fac 9d1c3e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 09:55:25 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 09:55:25 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcb5af38/CHANGELOG.asciidoc
----------------------------------------------------------------------
[17/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/671bdbe4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/671bdbe4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/671bdbe4
Branch: refs/heads/TINKERPOP-1565
Commit: 671bdbe49c86926745546f580e4afe43b8c7ed2c
Parents: b0d2a27 ed63426
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jan 14 11:09:22 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jan 14 11:09:22 2017 -0500
----------------------------------------------------------------------
.../process/traversal/util/ImmutableMetrics.java | 2 +-
.../process/traversal/util/MutableMetrics.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[08/50] [abbrv] tinkerpop git commit: Fixed a bug in
`OrderGlobalStep` and added the previously removed `RangeTest` test back.
Posted by sp...@apache.org.
Fixed a bug in `OrderGlobalStep` and added the previously removed `RangeTest` test back.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/41f12880
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/41f12880
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/41f12880
Branch: refs/heads/TINKERPOP-1565
Commit: 41f1288072bb06837c1c663143c33fbcbbfa9a91
Parents: ba6186a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 10 16:48:09 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 10 16:48:09 2017 +0100
----------------------------------------------------------------------
.../process/traversal/step/map/OrderGlobalStep.java | 2 +-
.../traversal/step/filter/GroovyRangeTest.groovy | 5 +++++
.../process/traversal/step/filter/RangeTest.java | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index a7d21b2..806dbf0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@ -172,7 +172,7 @@ public final class OrderGlobalStep<S, C extends Comparable> extends CollectingBa
@Override
public TraverserSet<S> apply(final TraverserSet<S> setA, final TraverserSet<S> setB) {
setA.addAll(setB);
- if (Long.MAX_VALUE != this.limit && setA.bulkSize() > this.limit) {
+ if (this.limit != -1 && setA.bulkSize() > this.limit) {
if (this.chainedComparator.isShuffle())
setA.shuffle();
else
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
index 4f7b0d4..14d7282 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
@@ -115,6 +115,11 @@ public abstract class GroovyRangeTest {
}
@Override
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').skip(1).values('name')")
+ }
+
+ @Override
public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.outE.values('weight').fold.order(local).skip(local, 2)")
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/41f12880/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
index 0abaf70..3a565be 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
@@ -83,6 +83,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX();
+
public abstract Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
@Test
@@ -330,6 +332,15 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX();
+ printTraversalForm(traversal);
+ assertTrue(traversal.hasNext());
+ assertEquals(Arrays.asList("marko", "josh", "peter"), traversal.toList());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
final Traversal<Vertex, List<Double>> traversal = get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
printTraversalForm(traversal);
@@ -425,6 +436,11 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_skipX1X_valuesXnameX() {
+ return g.V().hasLabel("person").order().by("age").skip(1).values("name");
+ }
+
+ @Override
public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
return g.V().outE().values("weight").fold().order(local).skip(local, 2);
}
[45/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Added tests for
GraphSON 3.0
Posted by sp...@apache.org.
TINKERPOP-1565 Added tests for GraphSON 3.0
And fixed some broken tests preventing a proper build.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e6512e90
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e6512e90
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e6512e90
Branch: refs/heads/TINKERPOP-1565
Commit: e6512e9054e8fc3ac5054d693e7ed0e72882da32
Parents: 374d080
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 13 08:20:22 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:11:33 2017 -0500
----------------------------------------------------------------------
.../ser/GraphSONMessageSerializerV2d0Test.java | 13 +-
.../gremlin/structure/io/IoCustomTest.java | 3 +
.../gremlin/structure/io/IoEdgeTest.java | 3 +
.../gremlin/structure/io/IoGraphTest.java | 1 +
.../gremlin/structure/io/IoPropertyTest.java | 12 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 123 +++++++++++++++++++
.../gremlin/structure/io/IoVertexTest.java | 3 +
.../tinkerpop-classic-normalized-v3d0.json | 6 +
8 files changed, 151 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
index 4125946..0bdc08d 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
@@ -251,7 +251,7 @@ public class GraphSONMessageSerializerV2d0Test {
final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
assertNotNull(properties);
- assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUEPROP).asInt());
+ assertEquals(123, properties.get("abc").get(GraphSONTokens.VALUEPROP).get("value").get(GraphSONTokens.VALUEPROP).asInt());
}
@Test
@@ -315,7 +315,7 @@ public class GraphSONMessageSerializerV2d0Test {
final JsonNode friendProperties = properties.get("friends");
assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUE);
+ final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE);
assertNotNull(friendsProperty);
assertEquals(3, friendsProperty.size());
@@ -416,7 +416,6 @@ public class GraphSONMessageSerializerV2d0Test {
final GraphTraversalSource g = graph.traversal();
final Tree t = g.V(1).out().properties("name").tree().next();
-
final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create());
final JsonNode json = mapper.readTree(results);
@@ -440,7 +439,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.PROPERTIES)
.get("name")
.get(0)
- .get(GraphSONTokens.VALUE).asText());
+ .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
//check the leafs
assertEquals("vadas", converted.get(GraphSONTokens.VALUEPROP)
@@ -451,7 +450,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.PROPERTIES)
.get("name")
.get(0)
- .get(GraphSONTokens.VALUE).asText());
+ .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
assertEquals("lop", converted.get(GraphSONTokens.VALUEPROP)
.get(0)
@@ -461,7 +460,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.PROPERTIES)
.get("name")
.get(0)
- .get(GraphSONTokens.VALUE).asText());
+ .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
assertEquals("josh", converted.get(GraphSONTokens.VALUEPROP)
.get(0)
@@ -471,7 +470,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.PROPERTIES)
.get("name")
.get(0)
- .get(GraphSONTokens.VALUE).asText());
+ .get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
}
@Test
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
index d89f97e..f7340f8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
@@ -67,6 +67,9 @@ public class IoCustomTest extends AbstractGremlinTest {
{"graphson-v2-embedded", true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+ {"graphson-v3", true,
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(moduleV2d0).create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().addCustomModule(moduleV2d0).create()).create()},
{"gryo", true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.gryo()).reader().mapper(g.io(IoCore.gryo()).mapper().addCustom(CustomId.class).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.gryo()).writer().mapper(g.io(IoCore.gryo()).mapper().addCustom(CustomId.class).create()).create()}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
index 8d2a58a..fa656a5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
@@ -66,6 +66,9 @@ public class IoEdgeTest extends AbstractGremlinTest {
{"graphson-v2-embedded", true, true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+ {"graphson-v3", true, true,
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create()},
{"gryo", true, true,
(Function<Graph,GraphReader>) g -> g.io(IoCore.gryo()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.gryo()).writer().create()}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
index 040849e..6e54377 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoGraphTest.java
@@ -53,6 +53,7 @@ public class IoGraphTest extends AbstractGremlinTest {
{"graphml", IoCore.graphml(), false, true, ".xml"},
{"graphsonv1d0", IoCore.graphson(), true, true, ".json"},
{"graphsonv2d0", GraphSONIo.build(GraphSONVersion.V2_0), true, true, ".json"},
+ {"graphsonv3d0", GraphSONIo.build(GraphSONVersion.V3_0), true, true, ".json"},
{"gryo", IoCore.gryo(), false, false, ".kryo"}
});
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
index dec7230..ecde126 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
@@ -63,6 +63,9 @@ public class IoPropertyTest extends AbstractGremlinTest {
{"graphson-v2-embedded", true, true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+ {"graphson-v3", true, true,
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create()},
{"gryo", true, true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.gryo()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.gryo()).writer().create()}
@@ -92,7 +95,6 @@ public class IoPropertyTest extends AbstractGremlinTest {
// select any vertexproperty that has both start/end time
final VertexProperty p = (VertexProperty) g.V(convertToVertexId("marko")).properties("location").as("p").has("endTime").select("p").next();
- final Vertex v = p.element();
writer.writeVertexProperty(os, p);
final AtomicBoolean called = new AtomicBoolean(false);
@@ -104,7 +106,7 @@ public class IoPropertyTest extends AbstractGremlinTest {
assertEquals(IteratorUtils.count(p.properties()), IteratorUtils.count(propertyAttachable.get().properties()));
assertEquals(p.property("startTime").value(), ((Property) propertyAttachable.get().properties("startTime").next()).value());
assertEquals(p.property("endTime").value(), ((Property) propertyAttachable.get().properties("endTime").next()).value());
- if (ioType.equals("graphson-v2-embedded")) { // TODO: make this work with Gryo
+ if (ioType.equals("graphson-v3")) { // TODO: make this work with Gryo
assertEquals(p, propertyAttachable.get());
assertEquals(p.element(), propertyAttachable.get().element());
}
@@ -123,7 +125,6 @@ public class IoPropertyTest extends AbstractGremlinTest {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
final GraphWriter writer = writerMaker.apply(graph);
final VertexProperty p = g.V(convertToVertexId("marko")).next().property("name");
- final Vertex v = p.element();
writer.writeVertexProperty(os, p);
final AtomicBoolean called = new AtomicBoolean(false);
@@ -133,7 +134,7 @@ public class IoPropertyTest extends AbstractGremlinTest {
assertEquals(p.value(), propertyAttachable.get().value());
assertEquals(p.key(), propertyAttachable.get().key());
assertEquals(0, IteratorUtils.count(propertyAttachable.get().properties()));
- if (ioType.equals("graphson-v2-embedded")) { // TODO: make this work with Gryo
+ if (ioType.equals("graphson-v3")) { // TODO: make this work with Gryo
assertEquals(p, propertyAttachable.get());
assertEquals(p.element(), propertyAttachable.get().element());
}
@@ -152,7 +153,6 @@ public class IoPropertyTest extends AbstractGremlinTest {
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
final GraphWriter writer = writerMaker.apply(graph);
final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
- final Edge e = (Edge) p.element();
writer.writeProperty(os, p);
final AtomicBoolean called = new AtomicBoolean(false);
@@ -161,7 +161,7 @@ public class IoPropertyTest extends AbstractGremlinTest {
reader.readProperty(bais, propertyAttachable -> {
assertEquals(p.value(), propertyAttachable.get().value());
assertEquals(p.key(), propertyAttachable.get().key());
- if (ioType.equals("graphson-v2-embedded")) { // TODO: make this work with Gryo
+ if (ioType.equals("graphson-v3")) { // TODO: make this work with Gryo
assertEquals(p, propertyAttachable.get());
assertEquals(p.element(), propertyAttachable.get().element());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index e16bbcc..6c188bd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -607,6 +607,129 @@ public class IoTest {
}
}
+ public static final class GraphSONV3D0Test extends AbstractGremlinTest {
+ private Io.Builder<GraphSONIo> graphson;
+
+ @Before
+ public void setupBeforeEachTest() {
+ graphson = graphson();
+ }
+
+ /**
+ * Only need to execute this test with TinkerGraph or other graphs that support user supplied identifiers.
+ */
+ @Test
+ @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
+ @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
+ @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VariableFeatures.class, feature = FEATURE_VARIABLES)
+ @LoadGraphWith(LoadGraphWith.GraphData.CLASSIC)
+ public void shouldWriteNormalizedGraphSON() throws Exception {
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V3_0).normalize(true).create();
+ final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
+ w.writeGraph(bos, graph);
+
+ final String expected = streamToString(IoTest.class.getResourceAsStream(TestHelper.convertPackageToResourcePath(GraphSONResourceAccess.class) + "tinkerpop-classic-normalized-v3d0.json"));
+ assertEquals(expected.replace("\n", "").replace("\r", ""), bos.toString().replace("\n", "").replace("\r", ""));
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ public void shouldReadWriteModernWrappedInJsonObject() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V3_0).create();
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GraphWriter writer = graph.io(graphson()).writer().wrapAdjacencyList(true).mapper(mapper).create();
+ writer.writeGraph(os, graph);
+
+ final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName(), LoadGraphWith.GraphData.MODERN);
+ graphProvider.clear(configuration);
+ final Graph g1 = graphProvider.openTestGraph(configuration);
+ final GraphReader reader = graph.io(graphson()).reader().mapper(mapper).unwrapAdjacencyList(true).create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readGraph(bais, g1);
+ }
+
+ // modern uses double natively so always assert as such
+ IoTest.assertModernGraph(g1, true, true);
+
+ graphProvider.clear(g1, configuration);
+ }
+ }
+
+ /**
+ * This is just a serialization check for JSON.
+ */
+ @Test
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ANY_IDS)
+ public void shouldProperlySerializeCustomIdWithGraphSON() throws Exception {
+ final UUID id = UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305");
+ graph.addVertex(T.id, new CustomId("vertex", id));
+
+ final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModule();
+ final GraphWriter writer = graph.io(graphson).writer().mapper(
+ graph.io(graphson).mapper().version(GraphSONVersion.V3_0).addCustomModule(module).create()).create();
+
+ try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ writer.writeGraph(baos, graph);
+
+ // reusing the same config used for creation of "g".
+ final Configuration configuration = graphProvider.newGraphConfiguration("g2", this.getClass(), name.getMethodName(), null);
+ graphProvider.clear(configuration);
+ final Graph g2 = graphProvider.openTestGraph(configuration);
+
+ try (final InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ final GraphReader reader = graph.io(graphson).reader()
+ .mapper(graph.io(graphson).mapper().version(GraphSONVersion.V3_0).addCustomModule(module).create()).create();
+ reader.readGraph(is, g2);
+ }
+
+ final Vertex v2 = g2.vertices().next();
+ final CustomId customId = (CustomId) v2.id();
+ assertEquals(id, customId.getElementId());
+ assertEquals("vertex", customId.getCluster());
+
+ // need to manually close the "g2" instance
+ graphProvider.clear(g2, configuration);
+ }
+ }
+
+ @Test
+ @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = FEATURE_STRING_VALUES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ public void shouldReadWriteSelfLoopingEdges() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V3_0).create();
+ final Graph source = graph;
+ final Vertex v1 = source.addVertex();
+ final Vertex v2 = source.addVertex();
+ v1.addEdge("CONTROL", v2);
+ v1.addEdge("SELFLOOP", v1);
+
+ final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null);
+ final Graph target = graphProvider.openTestGraph(targetConf);
+ try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ source.io(IoCore.graphson()).writer().mapper(mapper).create().writeGraph(os, source);
+ try (ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray())) {
+ target.io(IoCore.graphson()).reader().mapper(mapper).create().readGraph(is, target);
+ }
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+
+ assertEquals(IteratorUtils.count(source.vertices()), IteratorUtils.count(target.vertices()));
+ assertEquals(IteratorUtils.count(source.edges()), IteratorUtils.count(target.edges()));
+ }
+ }
+
public static void assertCrewGraph(final Graph g1, final boolean lossyForId) {
assertEquals(new Long(6), g1.traversal().V().count().next());
assertEquals(new Long(14), g1.traversal().E().count().next());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
index 6e692c4..d3aaa81 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
@@ -83,6 +83,9 @@ public class IoVertexTest extends AbstractGremlinTest {
{"graphson-v2-embedded", true, false,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
+ {"graphson-v3", true, false,
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V3_0)).mapper().create()).create()},
{"gryo", true, true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.gryo()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.gryo()).writer().create()}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e6512e90/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
new file mode 100644
index 0000000..57d1777
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}],"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}],"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}},{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}],"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}],"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}],"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}],"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}]}}
\ No newline at end of file
[11/50] [abbrv] tinkerpop git commit: Improved the section
description for the recipes appendix
Posted by sp...@apache.org.
Improved the section description for the recipes appendix
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0fbfd75a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0fbfd75a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0fbfd75a
Branch: refs/heads/TINKERPOP-1565
Commit: 0fbfd75afbb5654b079111e928020250905327a7
Parents: 79a2468
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 07:38:48 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jan 12 07:38:48 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0fbfd75a/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 6f9fb2c..9038cea 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -17,9 +17,11 @@ limitations under the License.
Appendix
========
-Many of the recipes are based on questions and answers provided on the gremlin-users mailing list. This section
-contains a number of traversals from the mailing list that do not easily fit any particular pattern (i.e. a recipe),
-but are nonetheless interesting and thus remain good tools for learning Gremlin.
+Many of the recipes are based on questions and answers provided on the
+link:https://groups.google.com/forum/#!forum/gremlin-users[gremlin-users mailing list] or on
+link:http://stackoverflow.com/questions/tagged/gremlin[StackOverflow]. This section contains those traversals from
+those sources that do not easily fit any particular pattern (i.e. a recipe), but are nonetheless interesting and thus
+remain good tools for learning Gremlin.
[[appendix-a]]
_For each person in a "follows" graph, determine the number of followers and list their names._
[46/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Stub out
GraphSON 3.0
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
index 761b71a..0f6a54e 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v2d0-partial.json
@@ -1,8 +1,5 @@
{
- "requestId" : {
- "@type" : "g:UUID",
- "@value" : "cb682578-9d92-4499-9ebc-5c6aa73c5397"
- },
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
"op" : "eval",
"processor" : "",
"args" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json
new file mode 100644
index 0000000..0f6a54e
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/sessionlessevalaliased-v3d0.json
@@ -0,0 +1,18 @@
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json
new file mode 100644
index 0000000..c68f5cd
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/short-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Int16",
+ "@value" : 100
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-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/standardresult-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
index 6f65698..4fd2fd3 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-no-types.json
@@ -13,13 +13,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -28,7 +26,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -37,7 +34,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -46,7 +42,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
index e4d6ce0..857c6db 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v2d0-partial.json
@@ -23,10 +23,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -38,10 +34,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -62,10 +54,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -86,10 +74,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -110,10 +94,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json
new file mode 100644
index 0000000..2b48871
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/standardresult-v3d0.json
@@ -0,0 +1,91 @@
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ } ],
+ "meta" : { }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-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/stargraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
index eb87f72..c8f8fdb 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-no-types.json
@@ -6,13 +6,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -21,7 +19,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -30,7 +27,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -39,7 +35,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
index d7bb548..59ff13a 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v2d0-partial.json
@@ -16,10 +16,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -31,10 +27,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -55,10 +47,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -79,10 +67,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -103,10 +87,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json
new file mode 100644
index 0000000..0d82b27
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/stargraph-v3d0.json
@@ -0,0 +1,82 @@
+{
+ "starVertex" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json
new file mode 100644
index 0000000..9693983
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/t-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:T",
+ "@value" : "label"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json
new file mode 100644
index 0000000..1ca0e17
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/timestamp-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:Timestamp",
+ "@value" : 1481750076295
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-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/tinkergraph-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
index 8b9376a..94ad061 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-no-types.json
@@ -6,13 +6,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -21,7 +19,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -30,7 +27,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -39,7 +35,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
@@ -53,13 +48,11 @@
"name" : [ {
"id" : 1,
"value" : "stephen",
- "vertex" : 7,
"label" : "name"
} ],
"location" : [ {
"id" : 10,
"value" : "centreville",
- "vertex" : 7,
"label" : "location",
"properties" : {
"startTime" : 1990,
@@ -68,7 +61,6 @@
}, {
"id" : 11,
"value" : "dulles",
- "vertex" : 7,
"label" : "location",
"properties" : {
"startTime" : 2000,
@@ -77,7 +69,6 @@
}, {
"id" : 12,
"value" : "purcellville",
- "vertex" : 7,
"label" : "location",
"properties" : {
"startTime" : 2006
@@ -91,13 +82,11 @@
"name" : [ {
"id" : 2,
"value" : "matthias",
- "vertex" : 8,
"label" : "name"
} ],
"location" : [ {
"id" : 13,
"value" : "bremen",
- "vertex" : 8,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -106,7 +95,6 @@
}, {
"id" : 14,
"value" : "baltimore",
- "vertex" : 8,
"label" : "location",
"properties" : {
"startTime" : 2007,
@@ -115,7 +103,6 @@
}, {
"id" : 15,
"value" : "oakland",
- "vertex" : 8,
"label" : "location",
"properties" : {
"startTime" : 2011,
@@ -124,7 +111,6 @@
}, {
"id" : 16,
"value" : "seattle",
- "vertex" : 8,
"label" : "location",
"properties" : {
"startTime" : 2014
@@ -138,13 +124,11 @@
"name" : [ {
"id" : 3,
"value" : "daniel",
- "vertex" : 9,
"label" : "name"
} ],
"location" : [ {
"id" : 17,
"value" : "spremberg",
- "vertex" : 9,
"label" : "location",
"properties" : {
"startTime" : 1982,
@@ -153,7 +137,6 @@
}, {
"id" : 18,
"value" : "kaiserslautern",
- "vertex" : 9,
"label" : "location",
"properties" : {
"startTime" : 2005,
@@ -162,7 +145,6 @@
}, {
"id" : 19,
"value" : "aachen",
- "vertex" : 9,
"label" : "location",
"properties" : {
"startTime" : 2009
@@ -176,7 +158,6 @@
"name" : [ {
"id" : 4,
"value" : "gremlin",
- "vertex" : 10,
"label" : "name"
} ]
}
@@ -187,7 +168,6 @@
"name" : [ {
"id" : 5,
"value" : "tinkergraph",
- "vertex" : 11,
"label" : "name"
} ]
}
@@ -200,7 +180,10 @@
"inV" : 10,
"outV" : 1,
"properties" : {
- "since" : 2009
+ "since" : {
+ "key" : "since",
+ "value" : 2009
+ }
}
}, {
"id" : 14,
@@ -210,7 +193,10 @@
"inV" : 11,
"outV" : 1,
"properties" : {
- "since" : 2010
+ "since" : {
+ "key" : "since",
+ "value" : 2010
+ }
}
}, {
"id" : 15,
@@ -220,7 +206,10 @@
"inV" : 10,
"outV" : 1,
"properties" : {
- "skill" : 4
+ "skill" : {
+ "key" : "skill",
+ "value" : 4
+ }
}
}, {
"id" : 16,
@@ -230,7 +219,10 @@
"inV" : 11,
"outV" : 1,
"properties" : {
- "skill" : 5
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
}
}, {
"id" : 17,
@@ -240,7 +232,10 @@
"inV" : 10,
"outV" : 7,
"properties" : {
- "since" : 2010
+ "since" : {
+ "key" : "since",
+ "value" : 2010
+ }
}
}, {
"id" : 18,
@@ -250,7 +245,10 @@
"inV" : 11,
"outV" : 7,
"properties" : {
- "since" : 2011
+ "since" : {
+ "key" : "since",
+ "value" : 2011
+ }
}
}, {
"id" : 19,
@@ -260,7 +258,10 @@
"inV" : 10,
"outV" : 7,
"properties" : {
- "skill" : 5
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
}
}, {
"id" : 20,
@@ -270,7 +271,10 @@
"inV" : 11,
"outV" : 7,
"properties" : {
- "skill" : 4
+ "skill" : {
+ "key" : "skill",
+ "value" : 4
+ }
}
}, {
"id" : 21,
@@ -280,7 +284,10 @@
"inV" : 10,
"outV" : 8,
"properties" : {
- "since" : 2012
+ "since" : {
+ "key" : "since",
+ "value" : 2012
+ }
}
}, {
"id" : 22,
@@ -290,7 +297,10 @@
"inV" : 10,
"outV" : 8,
"properties" : {
- "skill" : 3
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
}
}, {
"id" : 23,
@@ -300,7 +310,10 @@
"inV" : 11,
"outV" : 8,
"properties" : {
- "skill" : 3
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
}
}, {
"id" : 24,
@@ -310,7 +323,10 @@
"inV" : 10,
"outV" : 9,
"properties" : {
- "skill" : 5
+ "skill" : {
+ "key" : "skill",
+ "value" : 5
+ }
}
}, {
"id" : 25,
@@ -320,7 +336,10 @@
"inV" : 11,
"outV" : 9,
"properties" : {
- "skill" : 3
+ "skill" : {
+ "key" : "skill",
+ "value" : 3
+ }
}
}, {
"id" : 26,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
index f2df53e..24e95ed 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v2d0-partial.json
@@ -18,10 +18,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -33,10 +29,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -57,10 +49,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -81,10 +69,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -105,10 +89,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -137,10 +117,6 @@
"@value" : 1
},
"value" : "stephen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
"label" : "name"
}
} ],
@@ -152,10 +128,6 @@
"@value" : 10
},
"value" : "centreville",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -176,10 +148,6 @@
"@value" : 11
},
"value" : "dulles",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -200,10 +168,6 @@
"@value" : 12
},
"value" : "purcellville",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 7
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -232,10 +196,6 @@
"@value" : 2
},
"value" : "matthias",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
"label" : "name"
}
} ],
@@ -247,10 +207,6 @@
"@value" : 13
},
"value" : "bremen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -271,10 +227,6 @@
"@value" : 14
},
"value" : "baltimore",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -295,10 +247,6 @@
"@value" : 15
},
"value" : "oakland",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -319,10 +267,6 @@
"@value" : 16
},
"value" : "seattle",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 8
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -351,10 +295,6 @@
"@value" : 3
},
"value" : "daniel",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
"label" : "name"
}
} ],
@@ -366,10 +306,6 @@
"@value" : 17
},
"value" : "spremberg",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -390,10 +326,6 @@
"@value" : 18
},
"value" : "kaiserslautern",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -414,10 +346,6 @@
"@value" : 19
},
"value" : "aachen",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 9
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -446,10 +374,6 @@
"@value" : 4
},
"value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
"label" : "name"
}
} ]
@@ -472,10 +396,6 @@
"@value" : 5
},
"value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
"label" : "name"
}
} ]
@@ -502,8 +422,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2009
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
}
}
}
@@ -527,8 +453,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2010
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
}
}
}
@@ -552,8 +484,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 4
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
}
}
}
@@ -577,8 +515,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 5
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
}
}
}
@@ -602,8 +546,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2010
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
}
}
}
@@ -627,8 +577,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2011
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
}
}
}
@@ -652,8 +608,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 5
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
}
}
}
@@ -677,8 +639,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 4
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
}
}
}
@@ -702,8 +670,14 @@
},
"properties" : {
"since" : {
- "@type" : "g:Int32",
- "@value" : 2012
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
}
}
}
@@ -727,8 +701,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 3
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
}
}
}
@@ -752,8 +732,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 3
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
}
}
}
@@ -777,8 +763,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 5
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
}
}
}
@@ -802,8 +794,14 @@
},
"properties" : {
"skill" : {
- "@type" : "g:Int32",
- "@value" : 3
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "skill",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json
new file mode 100644
index 0000000..a97c8c1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tinkergraph-v3d0.json
@@ -0,0 +1,671 @@
+{
+ "@type" : "tinker:graph",
+ "@value" : {
+ "vertices" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : "stephen"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 10
+ },
+ "value" : "centreville",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1990
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 11
+ },
+ "value" : "dulles",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ } ],
+ "edges" : [ {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 17
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 18
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 19
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 20
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 21
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 22
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 23
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 24
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 25
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 26
+ },
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json
new file mode 100644
index 0000000..fdd18a4
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traversalmetrics-v3d0.json
@@ -0,0 +1,114 @@
+{
+ "@type" : "g:TraversalMetrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.004
+ },
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "7.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ }
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "4.0.0()"
+ }
+ } ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-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/traverser-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
index f254df0..6d1f029 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-no-types.json
@@ -7,13 +7,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -22,7 +20,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -31,7 +28,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -40,7 +36,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
index d7bbfeb..a59a29e 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v2d0-partial.json
@@ -22,10 +22,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -37,10 +33,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -61,10 +53,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -85,10 +73,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -109,10 +93,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json
new file mode 100644
index 0000000..1e6a2ce
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/traverser-v3d0.json
@@ -0,0 +1,89 @@
+{
+ "@type" : "g:Traverser",
+ "@value" : {
+ "bulk" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/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 c23fc2f..79231e8 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
@@ -6,13 +6,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -21,7 +19,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -30,7 +27,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -39,7 +35,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
@@ -55,7 +50,6 @@
"name" : [ {
"id" : 4,
"value" : "gremlin",
- "vertex" : 10,
"label" : "name"
} ]
}
@@ -68,7 +62,6 @@
"name" : [ {
"id" : 5,
"value" : "tinkergraph",
- "vertex" : 11,
"label" : "name"
} ]
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/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 2b6c597..74dcffc 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
@@ -18,10 +18,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -33,10 +29,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -57,10 +49,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -81,10 +69,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -105,10 +89,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -141,10 +121,6 @@
"@value" : 4
},
"value" : "gremlin",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 10
- },
"label" : "name"
}
} ]
@@ -171,10 +147,6 @@
"@value" : 5
},
"value" : "tinkergraph",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 11
- },
"label" : "name"
}
} ]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json
new file mode 100644
index 0000000..8868929
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/tree-v3d0.json
@@ -0,0 +1,137 @@
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ } ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json
new file mode 100644
index 0000000..1cf09f0
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/uuid-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-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/vertex-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
index 5e819ba..8e6155f 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-no-types.json
@@ -5,13 +5,11 @@
"name" : [ {
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
} ],
"location" : [ {
"id" : 6,
"value" : "san diego",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 1997,
@@ -20,7 +18,6 @@
}, {
"id" : 7,
"value" : "santa cruz",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2001,
@@ -29,7 +26,6 @@
}, {
"id" : 8,
"value" : "brussels",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2004,
@@ -38,7 +34,6 @@
}, {
"id" : 9,
"value" : "santa fe",
- "vertex" : 1,
"label" : "location",
"properties" : {
"startTime" : 2005
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
index 8358d9c..f102230 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v2d0-partial.json
@@ -15,10 +15,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
} ],
@@ -30,10 +26,6 @@
"@value" : 6
},
"value" : "san diego",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -54,10 +46,6 @@
"@value" : 7
},
"value" : "santa cruz",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -78,10 +66,6 @@
"@value" : 8
},
"value" : "brussels",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
@@ -102,10 +86,6 @@
"@value" : 9
},
"value" : "santa fe",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "location",
"properties" : {
"startTime" : {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json
new file mode 100644
index 0000000..86f305d
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertex-v3d0.json
@@ -0,0 +1,80 @@
+{
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-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/vertexproperty-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
index 7ab4f4d..74025a8 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-no-types.json
@@ -1,6 +1,5 @@
{
"id" : 0,
"value" : "marko",
- "vertex" : 1,
"label" : "name"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
index 0319bd1..af184b1 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v2d0-partial.json
@@ -6,10 +6,6 @@
"@value" : 0
},
"value" : "marko",
- "vertex" : {
- "@type" : "g:Int32",
- "@value" : 1
- },
"label" : "name"
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json
new file mode 100644
index 0000000..0319bd1
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/vertexproperty-v3d0.json
@@ -0,0 +1,15 @@
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json
new file mode 100644
index 0000000..ff420bc
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/year-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:Year",
+ "@value" : "2016"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json
new file mode 100644
index 0000000..98a5e27
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/yearmonth-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:YearMonth",
+ "@value" : "2016-06"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json
new file mode 100644
index 0000000..367fc47
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneddatetime-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZonedDateTime",
+ "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json
new file mode 100644
index 0000000..8591794
--- /dev/null
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/zoneoffset-v3d0.json
@@ -0,0 +1,4 @@
+{
+ "@type" : "gx:ZoneOffset",
+ "@value" : "+03:06:09"
+}
\ No newline at end of file
[18/50] [abbrv] tinkerpop git commit: More consistent error messaging
on result iteration timeouts. CTR
Posted by sp...@apache.org.
More consistent error messaging on result iteration timeouts. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c8e124b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c8e124b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c8e124b
Branch: refs/heads/TINKERPOP-1565
Commit: 5c8e124bd0415d836e70fa16e5695ce76ab237b2
Parents: ed63426
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 09:48:28 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 09:48:28 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/server/op/AbstractEvalOpProcessor.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c8e124b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4ca45c6..c5e4471 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Make error messaging more consistent during result iteration timeouts in Gremlin Server.
* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
* Fixed a bug in `AddVertexStartStep` where if a side-effect was being used in the parametrization, an NPE occurred.
* Fixed a bug in `LazyBarrierStrategy` where `profile()` was deactivating it accidentally.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c8e124b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index d5fe62a..48de830 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -247,15 +247,18 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
try {
handleIterator(context, itty);
} catch (TimeoutException ex) {
+ // a timeout occurs if serializedResponseTimeout is exceeded, but that setting is deprecated
+ // and by default disabled. we can remove this handling once we drop that setting all together
final String errorMessage = String.format("Response iteration exceeded the configured threshold for request [%s] - %s", msg, ex.getMessage());
logger.warn(errorMessage);
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT).statusMessage(errorMessage).create());
if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
} catch (InterruptedException ex) {
- logger.warn(String.format("Interruption during result iteration on request [%s].", msg), ex);
- final String exceptionMsg = ex.getMessage();
- final String err = "Interruption of result iteration" + (null == exceptionMsg || exceptionMsg.isEmpty() ? "" : " - " + exceptionMsg);
- ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR).statusMessage(err).create());
+ // interruption occurs if there is a forced timeout during result iteration. this timeout
+ // is driven by the script evaluation timeout so for consistency the message should be the same
+ final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s] - %s", msg, ex.getMessage());
+ logger.warn(errorMessage, ex);
+ ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT).statusMessage(ex.getMessage()).create());
if (managedTransactionsForRequest) attemptRollback(msg, context.getGraphManager(), settings.strictTransactionManagement);
} catch (Exception ex) {
logger.warn(String.format("Exception processing a script on request [%s].", msg), ex);
@@ -285,7 +288,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
logger.warn(errorMessage);
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT).statusMessage("Timeout during script evaluation triggered by TimedInterruptCustomizerProvider").create());
} else if (t instanceof TimeoutException) {
- final String errorMessage = String.format("Response evaluation exceeded the configured threshold for request [%s] - %s", msg, t.getMessage());
+ final String errorMessage = String.format("Script evaluation exceeded the configured threshold for request [%s] - %s", msg, t.getMessage());
logger.warn(errorMessage, t);
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_TIMEOUT).statusMessage(t.getMessage()).create());
} else {
[09/50] [abbrv] tinkerpop git commit: Added recipe to appendix for
some basic math ops
Posted by sp...@apache.org.
Added recipe to appendix for some basic math ops
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6971e644
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6971e644
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6971e644
Branch: refs/heads/TINKERPOP-1565
Commit: 6971e644ffc0306a968c43f055a7849761108f60
Parents: 0938ebd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 11:06:48 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 11:06:48 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6971e644/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 15d7340..369d049 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -125,3 +125,15 @@ g.V().not(has("location", without(places))).
where(values("location").is(within(places)).count().is(places.size())).
valueMap()
----
+
+[[appendix-f]]
+_Methods for performing some basic mathematical operations in the "modern" graph._
+
+[gremlin-groovy,modern]
+----
+g.V().values("age").sum() // sum all ages
+g.V().values("age").fold(1, mult) // multiply all ages
+g.V().values("age").map(union(identity(), constant(-1)).sum()) // subtract 1
+g.V().values("age").map(union(identity(), identity()).sum()) // multiply by 2 (simple)
+g.V().values("age").map(union(identity(), constant(2)).fold(1, mult)) // multiply by 2 (generally useful for multiplications by n):
+----
\ No newline at end of file
[32/50] [abbrv] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by sp...@apache.org.
Merge branch 'tp31' into tp32
Conflicts:
CHANGELOG.asciidoc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategyTest.java
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bb177fe
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bb177fe
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bb177fe
Branch: refs/heads/TINKERPOP-1565
Commit: 3bb177fef12727184575477d28ef163a956c01bf
Parents: e06ce0c 6e2128c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 13:55:24 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 13:55:24 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bb177fe/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bb177fe/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3c5f8ed,d8311ca..0845ef8
--- a/pom.xml
+++ b/pom.xml
@@@ -134,7 -127,8 +134,7 @@@ limitations under the License
</scm>
<properties>
<commons.configuration.version>1.10</commons.configuration.version>
- <groovy.version>2.4.7</groovy.version>
+ <groovy.version>2.4.8</groovy.version>
- <junit.version>4.12</junit.version>
<metrics.version>3.0.2</metrics.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
[31/50] [abbrv] tinkerpop git commit: Bump to groovy 2.4.8
Posted by sp...@apache.org.
Bump to groovy 2.4.8
https://lists.apache.org/thread.html/50dd28c50a15c422b3e7277d0aa4c59a8831523d4ae7d5afe73e8573@%3Cdev.tinkerpop.apache.org%3E CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6e2128cb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6e2128cb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6e2128cb
Branch: refs/heads/TINKERPOP-1565
Commit: 6e2128cbac8fb7bd7e42ba262cb0b1f559e4a385
Parents: 4b8ea27
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 13:01:49 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 13:01:49 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e2128cb/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f82fa23..d498599 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Bumped to Groovy 2.4.8.
* Fixed bug in `IncidentToAdjacentStrategy`, it was missing some invalidating steps.
* Returned a confirmation on session close from Gremlin Server.
* Use non-default port for running tests on Gremlin Server.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6e2128cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee4b965..d8311ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@ limitations under the License.
</scm>
<properties>
<commons.configuration.version>1.10</commons.configuration.version>
- <groovy.version>2.4.6</groovy.version>
+ <groovy.version>2.4.8</groovy.version>
<junit.version>4.12</junit.version>
<metrics.version>3.0.2</metrics.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
[12/50] [abbrv] tinkerpop git commit: Added some additional examples
to appendix recipes.
Posted by sp...@apache.org.
Added some additional examples to appendix recipes.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4be8a1b2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4be8a1b2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4be8a1b2
Branch: refs/heads/TINKERPOP-1565
Commit: 4be8a1b2ec8c15aee1c84199e560687a1e3fdf39
Parents: 0fbfd75
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 08:06:07 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jan 12 08:06:07 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 23 +++++++++++++++++++++++
docs/src/recipes/duplicate-edge.asciidoc | 18 ++++++++++++++++++
2 files changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4be8a1b2/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 9038cea..9d0ea7b 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -43,6 +43,29 @@ g.V().as('p').
by(count(local)).by()).next()
----
+It might also be alternatively written as:
+
+[gremlin-groovy,existing]
+----
+g.V().group().
+ by('name').
+ by(project('numFollowers','followers').
+ by(__.in('follows').count()).
+ by(__.in('follows').values('name').fold())).next()
+----
+
+or even:
+
+[gremlin-groovy,existing]
+----
+g.V().group().
+ by('name').
+ by(__.in('follows').values('name').fold().
+ project('numFollowers','followers').
+ by(count(local)).
+ by()).next()
+----
+
[[appendix-b]]
_In the "modern" graph, show each person, the software they worked on and the co-worker count for the software and
the names of those co-workers._
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4be8a1b2/docs/src/recipes/duplicate-edge.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/duplicate-edge.asciidoc b/docs/src/recipes/duplicate-edge.asciidoc
index ed56106..a62716e 100644
--- a/docs/src/recipes/duplicate-edge.asciidoc
+++ b/docs/src/recipes/duplicate-edge.asciidoc
@@ -86,6 +86,24 @@ the outgoing vertex, the edge label, and the incoming vertex as the key, with th
value.
<4> The rest of the traversal is the same as the previous one.
+Note that the above traversal could also be written using `match` step:
+
+[gremlin-groovy,existing]
+----
+g.V().match(
+ __.as("ov").outE().as("e"),
+ __.as("e").inV().as("iv"),
+ __.as("iv").inE().as("ie"),
+ __.as("ie").outV().as("ov")).
+ where("ie",neq("e")).
+ where("ie",eq("e")).by(label).
+ select("ie").
+ group().
+ by(select("ov","e","iv").by().by(label)).
+ unfold().select(values).
+ where(count(local).is(gt(1)))
+----
+
A third way to approach this problem would be to force a link:https://en.wikipedia.org/wiki/Depth-first_search[depth-first search].
The previous examples invoke traversal strategies that force a link:https://en.wikipedia.org/wiki/Breadth-first_search[breadth first search]
as a performance optimization.
[36/50] [abbrv] tinkerpop git commit: TINKERPOP-1600 Added base64
encoded string to sasl challenge
Posted by sp...@apache.org.
TINKERPOP-1600 Added base64 encoded string to sasl challenge
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e80a4cd1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e80a4cd1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e80a4cd1
Branch: refs/heads/TINKERPOP-1565
Commit: e80a4cd172746dc393711cc095e229a4d5e78629
Parents: 802ff9f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 15:22:07 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 06:56:11 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/dev/io/graphson.asciidoc | 5 ++---
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 16 ++++++++++++++++
.../apache/tinkerpop/gremlin/driver/Handler.java | 15 +++++++++++++--
.../server/handler/SaslAuthenticationHandler.java | 14 ++++++++++++--
5 files changed, 44 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e80a4cd1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9471b9f..4f3f9ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* SASL negotiation supports both a byte array and Base64 encoded bytes as a string for authentication to Gremlin Server.
* Deprecated `TinkerIoRegistry` replacing it with the more consistently named `TinkerIoRegistryV1d0`.
* Made error messaging more consistent during result iteration timeouts in Gremlin Server.
* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
@@ -580,7 +581,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Bumped to Groovy 2.4.8.
* Fixed bug in `IncidentToAdjacentStrategy`, it was missing some invalidating steps.
* Returned a confirmation on session close from Gremlin Server.
* Use non-default port for running tests on Gremlin Server.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e80a4cd1/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index cdc9880..fe56c27 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -1299,7 +1299,7 @@ ResponseMessage
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).
+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).
[source,json]
----
@@ -4262,14 +4262,13 @@ The following `RequestMessage` is an example of a sessionless request for a scri
}
----
-
ResponseMessage
~~~~~~~~~~~~~~~
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).
+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).
[source,json]
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e80a4cd1/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 8d73baed..b478b96 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -240,6 +240,22 @@ and defaults to `false`.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-932[TINKERPOP-932],
link:http://tinkerpop.apache.org/docs/current/dev/provider/#_session_opprocessor[Provider Documentation - Session OpProcessor]
+SASL Authentication
++++++++++++++++++++
+
+Gremlin Supports SASL based authentication. The server accepts either a byte array or Base64 encoded String as the in
+the `sasl` argument on the `RequestMessage`, however it sends back a byte array only. Some serializers or serializer
+configurations don't work well with that approach (specifically the "toString" configuration on the Gryo serializer) as
+the byte array is returned in the `ResponseMessage` result. In the case of the "toString" serializer the byte array
+gets "toString'd" and the can't be read by the client.
+
+In 3.2.4, the byte array is still returned in the `ResponseMessage` result, but is also returned in the status
+attributes under a `sasl` key as a Base64 encoded string. In this way, the client has options on how it chooses to
+process the authentication response and the change remains backward compatible. Drivers should upgrade to using the
+Base64 encoded string however as the old approach will likely be removed in the future.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1600[TINKERPOP-1600]
+
TinkerPop 3.2.3
---------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e80a4cd1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index 681354c..650bc2f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
+import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -70,6 +71,9 @@ final class Handler {
private static final Map<String, String> SASL_PROPERTIES = new HashMap<String, String>() {{ put(Sasl.SERVER_AUTH, "true"); }};
private static final byte[] NULL_CHALLENGE = new byte[0];
+ private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
+ private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
+
private final AuthProperties authProps;
public GremlinSaslAuthenticationHandler(final AuthProperties authProps) {
@@ -103,9 +107,16 @@ final class Handler {
messageBuilder.addArg(Tokens.ARGS_SASL_MECHANISM, getMechanism());
messageBuilder.addArg(Tokens.ARGS_SASL, saslClient.get().hasInitialResponse() ?
- evaluateChallenge(subject, saslClient, NULL_CHALLENGE) : null);
+ BASE64_ENCODER.encodeToString(evaluateChallenge(subject, saslClient, NULL_CHALLENGE)) : null);
} else {
- messageBuilder.addArg(Tokens.ARGS_SASL, evaluateChallenge(subject, saslClient, (byte[])response.getResult().getData()));
+ // the server sends base64 encoded sasl as well as the byte array. the byte array will eventually be
+ // phased out, but is present now for backward compatibility in 3.2.x
+ final String base64sasl = response.getStatus().getAttributes().containsKey(Tokens.ARGS_SASL) ?
+ response.getStatus().getAttributes().get(Tokens.ARGS_SASL).toString() :
+ BASE64_ENCODER.encodeToString((byte[]) response.getResult().getData());
+
+ messageBuilder.addArg(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(
+ evaluateChallenge(subject, saslClient, BASE64_DECODER.decode(base64sasl))));
}
channelHandlerContext.writeAndFlush(messageBuilder.create());
} else {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e80a4cd1/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index 4bb7879..6cb0ddb 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -28,6 +28,9 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
@@ -50,6 +53,8 @@ import org.slf4j.LoggerFactory;
@ChannelHandler.Sharable
public class SaslAuthenticationHandler extends ChannelInboundHandlerAdapter {
private static final Logger logger = LoggerFactory.getLogger(SaslAuthenticationHandler.class);
+ private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
+ private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder();
private final Authenticator authenticator;
@@ -80,7 +85,7 @@ public class SaslAuthenticationHandler extends ChannelInboundHandlerAdapter {
if (saslObject instanceof byte[]) {
saslResponse = (byte[]) saslObject;
} else if(saslObject instanceof String) {
- saslResponse = Base64.getDecoder().decode((String) saslObject);
+ saslResponse = BASE64_DECODER.decode((String) saslObject);
} else {
final ResponseMessage error = ResponseMessage.build(request.get())
.statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - byte[] or base64 encoded String is expected")
@@ -101,8 +106,13 @@ public class SaslAuthenticationHandler extends ChannelInboundHandlerAdapter {
final RequestMessage original = request.get();
ctx.fireChannelRead(original);
} else {
- // not done here - send back the sasl message for next challenge
+ // not done here - send back the sasl message for next challenge. note that we send back
+ // the base64 encoded sasl as well as the byte array. the byte array will eventually be
+ // phased out, but is present now for backward compatibility in 3.2.x
+ final Map<String,Object> metadata = new HashMap<>();
+ metadata.put(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(saslMessage));
final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
+ .statusAttributes(metadata)
.code(ResponseStatusCode.AUTHENTICATE).result(saslMessage).create();
ctx.writeAndFlush(authenticate);
}
[23/50] [abbrv] tinkerpop git commit: Minor typo fix CTR
Posted by sp...@apache.org.
Minor typo fix CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/20478d75
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/20478d75
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/20478d75
Branch: refs/heads/TINKERPOP-1565
Commit: 20478d75d6ba26ec7a62c199582ecea3bf665b4a
Parents: fcb5af3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 16:32:54 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 16:32:54 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/structure/io/Model.java | 2 +-
.../io/graphson/_3_2_3/manual-graphson-generator.groovy | 4 ++--
.../io/graphson/_3_2_4/manual-graphson-generator.groovy | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20478d75/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..605414e 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
@@ -191,7 +191,7 @@ public class Model {
// (MessageSerializer) that doesn't fit the test model
ResponseMessage responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create();
- addResponseMessageEntry(responseMessage, "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 depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).");
+ addResponseMessageEntry(responseMessage, "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 depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but not in the default provided by Gremlin Server).");
responseMessage = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
result(Collections.singletonList(graph.vertices().next())).create();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20478d75/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 e3a745a..ecf61f0 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
@@ -108,7 +108,7 @@ writeSupportedV1Objects = { writer, mapper ->
writer.write("~~~~~~~~~~~~~~~\n\n")
msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
- writer.write(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "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(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "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()
@@ -249,7 +249,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
writer.write("~~~~~~~~~~~~~~~\n\n")
msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
- writer.write(toJsonFunction(msg, "Authentication Challenge", mapper, "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(toJsonFunction(msg, "Authentication Challenge", mapper, "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()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20478d75/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 da9254e..7a0b1f4 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
@@ -108,7 +108,7 @@ writeSupportedV1Objects = { writer, mapper ->
writer.write("~~~~~~~~~~~~~~~\n\n")
msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
- writer.write(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "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(toJsonV1d0NoTypes(msg, "Authentication Challenge", mapper, "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()
@@ -249,7 +249,7 @@ writeSupportedV2Objects = { writer, mapper, toJsonFunction ->
writer.write("~~~~~~~~~~~~~~~\n\n")
msg = ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
- writer.write(toJsonFunction(msg, "Authentication Challenge", mapper, "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(toJsonFunction(msg, "Authentication Challenge", mapper, "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()
[27/50] [abbrv] tinkerpop git commit: Fixed up an appendix entry
given pull request feedback.
Posted by sp...@apache.org.
Fixed up an appendix entry given pull request feedback.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f992cdfe
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f992cdfe
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f992cdfe
Branch: refs/heads/TINKERPOP-1565
Commit: f992cdfe89b00e91df98e83907c65968d16dcb17
Parents: 1c14dde
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 11:38:18 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 11:38:18 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f992cdfe/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 15fda50..e9d13aa 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -38,9 +38,10 @@ g.addV('name','marko').as('marko').
addE('follows').from('daniel').to('marko').iterate()
g.V().as('p').
map(__.in('follows').values('name').fold()).
- group().by(select('p').by('name')).
- by(project('numFollowers','followers').
- by(count(local)).by()).next()
+ project('person','followers','numFollowers').
+ by(select('p').by('name')).
+ by().
+ by(count(local))
----
It might also be alternatively written as:
[25/50] [abbrv] tinkerpop git commit: Allow some extra time to be
sure the future completes
Posted by sp...@apache.org.
Allow some extra time to be sure the future completes
This test never fails on my system but on rare occassions it seems to fail for others. I can only guess it is a timing issue of sorts, but I'm not sure I see how to better test this. The point of the test is not related to timing, so adding this extra wait doesn't seem wrong. It's not as though the functionality is not being tested properly. We just need to validate that the future completes when all the items arrive to the ResultSet, so in that sense the addition of the wait also validates that. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e856b34
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e856b34
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e856b34
Branch: refs/heads/TINKERPOP-1565
Commit: 1e856b344849fe7db4ba2ce8e4ccdd9e0de53cb8
Parents: 9d1c3e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 09:25:23 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 09:25:23 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e856b34/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
index 4a57ebb..0cf4fb5 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
@@ -76,6 +77,9 @@ public class ResultSetTest extends AbstractResultQueueTest {
}
assertThat(atLeastOnce.get(), is(true));
+
+ // ensure there is enough time for the readComplete to complete the "all" future
+ all.get(30000, TimeUnit.MILLISECONDS);
assertThat(all.isDone(), is(true));
}
[10/50] [abbrv] tinkerpop git commit: Added some more appendix items
to recipes
Posted by sp...@apache.org.
Added some more appendix items to recipes
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79a24685
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79a24685
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/79a24685
Branch: refs/heads/TINKERPOP-1565
Commit: 79a246851493e4f5a39644a9e86d828b39db0b2c
Parents: 6971e64
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 12:13:59 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 12:13:59 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 87 +++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79a24685/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 369d049..6f9fb2c 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -136,4 +136,91 @@ g.V().values("age").fold(1, mult) // multiply all ages
g.V().values("age").map(union(identity(), constant(-1)).sum()) // subtract 1
g.V().values("age").map(union(identity(), identity()).sum()) // multiply by 2 (simple)
g.V().values("age").map(union(identity(), constant(2)).fold(1, mult)) // multiply by 2 (generally useful for multiplications by n):
+----
+
+[[appendix-g]]
+_Dropping a vertex, as well as the vertices related to that dropped vertex that are connected by a "knows" edge in the
+"modern" graph_
+
+[gremlin-groovy,modern]
+----
+g.V().has('name','marko').outE()
+g.V().has('name','marko').sideEffect(out('knows').drop()).drop()
+g.V().has('name','marko')
+g.V(2,4,3)
+----
+
+[[appendix-h]]
+_For the specified graph, find all neighbor vertices connected to "A" as filtered by datetime, those neighbor vertices
+that don't have datetime vertices, and those neighbor vertices that have the label "dimon"._
+
+[gremlin-groovy]
+----
+g.addV().property("name", "A").as("a").
+ addV().property("name", "B").as("b").
+ addV().property("name", "C").as("c").
+ addV().property("name", "D").as("d").
+ addV().property("name", "E").as("e").
+ addV("dimon").property("name", "F").as("f").
+ addV().property("name", "G").as("g").property("date", 20160818).
+ addV().property("name", "H").as("h").property("date", 20160817).
+ addE("rel").from("a").to("b").
+ addE("rel").from("a").to("c").
+ addE("rel").from("a").to("d").
+ addE("rel").from("a").to("e").
+ addE("rel").from("c").to("f").
+ addE("occured_at").from("d").to("g").
+ addE("occured_at").from("e").to("h").iterate()
+// D and E have a valid datetime
+g.V().has("name", "A").out("rel").
+ union(where(out("occured_at").has("date", gte(20160817))),
+ __.not(outE("occured_at")).coalesce(out().hasLabel("dimon"), identity())).
+ valueMap()
+// only E has a valid date
+g.V().has("name", "A").out("rel").
+ union(where(out("occured_at").has("date", lte(20160817))),
+ __.not(outE("occured_at")).coalesce(out().hasLabel("dimon"), identity())).
+ valueMap()
+// only D has a valid date
+g.V().has("name", "A").out("rel").
+ union(where(out("occured_at").has("date", gt(20160817))),
+ __.not(outE("occured_at")).coalesce(out().hasLabel("dimon"), identity())).
+ valueMap()
+// neither D nor E have a valid date
+g.V().has("name", "A").out("rel").
+ union(where(out("occured_at").has("date", lt(20160817))),
+ __.not(outE("occured_at")).coalesce(out().hasLabel("dimon"), identity())).
+ valueMap()
+----
+
+[[appendix-i]]
+_Use element labels in a `select`._
+
+[gremlin-groovy,modern]
+----
+g.V(1).as("a").
+ both().
+ map(group().by(label).by(unfold())).as("b").
+ select("a","b").
+ map(union(project("a").by(select("a")), select("b")).
+ unfold().
+ group().
+ by(select(keys)).
+ by(select(values)))
+g.V().as("a").
+ both().
+ map(group().by(label).by(unfold())).as("b").
+ select("a","b").
+ group().
+ by(select("a")).
+ by(select("b").
+ group().
+ by(select(keys)).
+ by(select(values).fold())).
+ unfold().
+ map(union(select(keys).project("a").by(), select(values)).
+ unfold().
+ group().
+ by(select(keys).unfold()).
+ by(select(values).unfold().unfold().fold()))
----
\ No newline at end of file
[04/50] [abbrv] tinkerpop git commit: Implemented changes suggested
by @okram.
Posted by sp...@apache.org.
Implemented changes suggested by @okram.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bfbd7d54
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bfbd7d54
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bfbd7d54
Branch: refs/heads/TINKERPOP-1565
Commit: bfbd7d549a19e9b4b2beeff723b0cd821d3ea457
Parents: 71de237
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 10 15:00:57 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 10 15:00:57 2017 +0100
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 7 +++--
.../traversal/dsl/graph/GraphTraversal.java | 14 +++++-----
.../gremlin/process/traversal/dsl/graph/__.java | 8 +++---
.../step/filter/GroovyRangeTest.groovy | 8 +++---
.../traversal/step/filter/RangeTest.java | 27 +++++++++-----------
5 files changed, 30 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 0dafd22..0bdff70 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -865,7 +865,6 @@ The `limit()`-step is analogous to <<range-step,`range()`-step>> save that the l
----
g.V().limit(2)
g.V().range(0, 2)
-g.V().limit(2).toString()
----
The `limit()`-step can also be applied with `Scope.local`, in which case it operates on the incoming collection.
@@ -1924,9 +1923,9 @@ The `skip()`-step is analogous to <<range-step,`range()`-step>> save that the hi
[gremlin-groovy,modern]
----
-g.V().skip(2)
-g.V().range(2, -1)
-g.V().skip(2).toString()
+g.V().values('age').order()
+g.V().values('age').order().skip(2)
+g.V().values('age').order().range(2, -1)
----
The `skip()`-step can also be applied with `Scope.local`, in which case it operates on the incoming collection.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index ecd3cea..9eb2872 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1135,16 +1135,16 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
: new RangeLocalStep<>(this.asAdmin(), 0, limit));
}
- public default GraphTraversal<S, E> skip(final long n) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, n);
- return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), n, -1));
+ public default GraphTraversal<S, E> skip(final long skip) {
+ this.asAdmin().getBytecode().addStep(Symbols.skip, skip);
+ return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), skip, -1));
}
- public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final long n) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, scope, n);
+ public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final long skip) {
+ this.asAdmin().getBytecode().addStep(Symbols.skip, scope, skip);
return this.asAdmin().addStep(scope.equals(Scope.global)
- ? new RangeGlobalStep<>(this.asAdmin(), n, -1)
- : new RangeLocalStep<>(this.asAdmin(), n, -1));
+ ? new RangeGlobalStep<>(this.asAdmin(), skip, -1)
+ : new RangeLocalStep<>(this.asAdmin(), skip, -1));
}
public default GraphTraversal<S, E> tail() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 33fe2de..d01f49a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -812,15 +812,15 @@ public class __ {
/**
* @see GraphTraversal#skip(long)
*/
- public static <A> GraphTraversal<A, A> skip(final long n) {
- return __.<A>start().skip(n);
+ public static <A> GraphTraversal<A, A> skip(final long skip) {
+ return __.<A>start().skip(skip);
}
/**
* @see GraphTraversal#skip(Scope, long)
*/
- public static <A> GraphTraversal<A, A> skip(final Scope scope, final long n) {
- return __.<A>start().skip(scope, n);
+ public static <A> GraphTraversal<A, A> skip(final Scope scope, final long skip) {
+ return __.<A>start().skip(scope, skip);
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
index 53f475c..56cb19d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
@@ -110,13 +110,13 @@ public abstract class GroovyRangeTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_skipX2X_count() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.skip(2).count()")
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').skip(1).values('name')")
}
@Override
- public Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.fold.skip(local, 2)")
+ public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.outE.values('weight').fold.order(local).skip(local, 2)")
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
index 3307e4c..b04c3fa 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
@@ -81,9 +81,9 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_selectXa_b_cX_byXnameX_rangeXlocal_1_2X();
- public abstract Traversal<Vertex, Long> get_g_V_skipX2X_count();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
- public abstract Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X();
+ public abstract Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
@Test
@LoadGraphWith(MODERN)
@@ -321,24 +321,21 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_skipX2X_count() {
- final Traversal<Vertex, Long> traversal = get_g_V_skipX2X_count();
+ public void g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final Long count = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals(4, count.longValue());
+ assertEquals(Arrays.asList("marko", "josh", "peter"), traversal.toList());
}
@Test
@LoadGraphWith(MODERN)
- public void g_V_fold_skipXlocal_2X() {
- final Traversal<Vertex, List<Vertex>> traversal = get_g_V_fold_skipXlocal_2X();
+ public void g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ final Traversal<Vertex, List<Double>> traversal = get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final List<Vertex> list = traversal.next();
+ assertEquals(Arrays.asList(0.4, 0.5, 1.0, 1.0), traversal.next());
assertFalse(traversal.hasNext());
- assertEquals(4, list.size());
}
public static class Traversals extends RangeTest {
@@ -423,13 +420,13 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_skipX2X_count() {
- return g.V().skip(2).count();
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ return g.V().hasLabel("person").order().by("age").skip(1).values("name");
}
@Override
- public Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X() {
- return g.V().fold().skip(local, 2);
+ public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ return g.V().outE().values("weight").fold().order(local).skip(local, 2);
}
}
}
[48/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Stub out
GraphSON 3.0
Posted by sp...@apache.org.
TINKERPOP-1565 Stub out GraphSON 3.0
Set up the new testing model and generated test files. Reverted changes on property serialization that went in as breaking changes on GraphSON 2.0 and moved them forward 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/11fd6b88
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11fd6b88
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11fd6b88
Branch: refs/heads/TINKERPOP-1565
Commit: 11fd6b887cd7646ad361052b2dca2e47ea57209b
Parents: fc9ce59
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 14:58:50 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:11:33 2017 -0500
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONMapper.java | 71 +-
.../structure/io/graphson/GraphSONModule.java | 206 ++++++
.../io/graphson/GraphSONSerializersV2d0.java | 162 ++---
.../io/graphson/GraphSONSerializersV3d0.java | 632 +++++++++++++++++
.../structure/io/graphson/GraphSONTokens.java | 1 +
.../structure/io/graphson/GraphSONUtil.java | 7 +
.../structure/io/graphson/GraphSONVersion.java | 3 +-
.../ser/GraphSONMessageSerializerV3d0.java | 124 ++++
.../ser/GraphSONMessageSerializerV3d0Test.java | 342 ++++++++++
.../driver/gremlin-server-modern-secure-py.yaml | 2 +-
gremlin-server/conf/gremlin-server-classic.yaml | 2 +-
.../conf/gremlin-server-modern-py.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 2 +-
gremlin-tools/gremlin-io-test/pom.xml | 20 +-
.../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 | 26 +
.../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 | 122 ++++
.../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 | 671 +++++++++++++++++++
.../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 | 89 +++
.../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 | 137 ++++
.../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 | 80 +++
.../_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 | 15 +
.../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 +
106 files changed, 3465 insertions(+), 523 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index f82ebb7..d442dbc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -87,13 +87,44 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
om.registerModule(graphSONModule);
customModules.forEach(om::registerModule);
-
// plugin external serialization modules
if (loadCustomSerializers)
om.findAndRegisterModules();
-
- if (version == GraphSONVersion.V1_0) {
+ // graphson 3.0 only allows type - there is no option to remove embedded types
+ if (version == GraphSONVersion.V3_0 || (version == GraphSONVersion.V2_0 && typeInfo != TypeInfo.NO_TYPES)) {
+ final GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
+ final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder()
+ .typesEmbedding(getTypeInfo())
+ .valuePropertyName(GraphSONTokens.VALUEPROP)
+ .init(JsonTypeInfo.Id.CUSTOM, graphSONTypeIdResolver)
+ .typeProperty(GraphSONTokens.VALUETYPE);
+
+ // Registers native Java types that are supported by Jackson
+ registerJavaBaseTypes(graphSONTypeIdResolver);
+
+ // Registers the GraphSON Module's types
+ graphSONModule.getTypeDefinitions().forEach(
+ (targetClass, typeId) -> graphSONTypeIdResolver.addCustomType(
+ String.format("%s:%s", graphSONModule.getTypeNamespace(), typeId), targetClass));
+
+ // Register types to typeResolver for the Custom modules
+ customModules.forEach(e -> {
+ if (e instanceof TinkerPopJacksonModule) {
+ final TinkerPopJacksonModule mod = (TinkerPopJacksonModule) e;
+ final Map<Class, String> moduleTypeDefinitions = mod.getTypeDefinitions();
+ if (moduleTypeDefinitions != null) {
+ if (mod.getTypeNamespace() == null || mod.getTypeNamespace().isEmpty())
+ throw new IllegalStateException("Cannot specify a module for GraphSON 2.0 with type definitions but without a type Domain. " +
+ "If no specific type domain is required, use Gremlin's default domain, \"gremlin\" but there may be collisions.");
+
+ moduleTypeDefinitions.forEach((targetClass, typeId) -> graphSONTypeIdResolver.addCustomType(
+ String.format("%s:%s", mod.getTypeNamespace(), typeId), targetClass));
+ }
+ }
+ });
+ om.setDefaultTyping(typer);
+ } else if (version == GraphSONVersion.V1_0 || version == GraphSONVersion.V2_0) {
if (embedTypes) {
final TypeResolverBuilder<?> typer = new StdTypeResolverBuilder()
.init(JsonTypeInfo.Id.CLASS, null)
@@ -101,40 +132,6 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
.typeProperty(GraphSONTokens.CLASS);
om.setDefaultTyping(typer);
}
- } else if (version == GraphSONVersion.V2_0) {
- if (typeInfo != TypeInfo.NO_TYPES) {
- final GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
- final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder()
- .typesEmbedding(getTypeInfo())
- .valuePropertyName(GraphSONTokens.VALUEPROP)
- .init(JsonTypeInfo.Id.CUSTOM, graphSONTypeIdResolver)
- .typeProperty(GraphSONTokens.VALUETYPE);
-
- // Registers native Java types that are supported by Jackson
- registerJavaBaseTypes(graphSONTypeIdResolver);
-
- // Registers the GraphSON Module's types
- graphSONModule.getTypeDefinitions().forEach(
- (targetClass, typeId) -> graphSONTypeIdResolver.addCustomType(
- String.format("%s:%s", graphSONModule.getTypeNamespace(), typeId), targetClass));
-
- // Register types to typeResolver for the Custom modules
- customModules.forEach(e -> {
- if (e instanceof TinkerPopJacksonModule) {
- final TinkerPopJacksonModule mod = (TinkerPopJacksonModule) e;
- final Map<Class, String> moduleTypeDefinitions = mod.getTypeDefinitions();
- if (moduleTypeDefinitions != null) {
- if (mod.getTypeNamespace() == null || mod.getTypeNamespace().isEmpty())
- throw new IllegalStateException("Cannot specify a module for GraphSON 2.0 with type definitions but without a type Domain. " +
- "If no specific type domain is required, use Gremlin's default domain, \"gremlin\" but there may be collisions.");
-
- moduleTypeDefinitions.forEach((targetClass, typeId) -> graphSONTypeIdResolver.addCustomType(
- String.format("%s:%s", mod.getTypeNamespace(), typeId), targetClass));
- }
- }
- });
- om.setDefaultTyping(typer);
- }
} else {
throw new IllegalStateException("Unknown GraphSONVersion : " + version);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 7d65f9c..cfe8e59 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -109,6 +109,212 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
}
/**
+ * Version 3.0 of GraphSON.
+ */
+ static final class GraphSONModuleV3d0 extends GraphSONModule {
+
+ private static final Map<Class, String> TYPE_DEFINITIONS = Collections.unmodifiableMap(
+ new LinkedHashMap<Class, String>() {{
+ // Those don't have deserializers because handled by Jackson,
+ // but we still want to rename them in GraphSON
+ put(Integer.class, "Int32");
+ put(Long.class, "Int64");
+ put(Double.class, "Double");
+ put(Float.class, "Float");
+
+ // Tinkerpop Graph objects
+ put(Lambda.class, "Lambda");
+ put(Vertex.class, "Vertex");
+ put(Edge.class, "Edge");
+ put(Property.class, "Property");
+ put(Path.class, "Path");
+ put(VertexProperty.class, "VertexProperty");
+ put(Metrics.class, "Metrics");
+ put(TraversalMetrics.class, "TraversalMetrics");
+ put(Traverser.class, "Traverser");
+ put(Tree.class, "Tree");
+ put(Bytecode.class, "Bytecode");
+ put(Bytecode.Binding.class, "Binding");
+ put(AndP.class, "P");
+ put(OrP.class, "P");
+ put(P.class, "P");
+ Stream.of(
+ VertexProperty.Cardinality.class,
+ Column.class,
+ Direction.class,
+ Operator.class,
+ Order.class,
+ Pop.class,
+ SackFunctions.Barrier.class,
+ TraversalOptionParent.Pick.class,
+ Scope.class,
+ T.class).forEach(e -> put(e, e.getSimpleName()));
+ Arrays.asList(
+ ConnectiveStrategy.class,
+ ElementIdStrategy.class,
+ EventStrategy.class,
+ HaltedTraverserStrategy.class,
+ PartitionStrategy.class,
+ SubgraphStrategy.class,
+ LazyBarrierStrategy.class,
+ MatchAlgorithmStrategy.class,
+ AdjacentToIncidentStrategy.class,
+ FilterRankingStrategy.class,
+ IdentityRemovalStrategy.class,
+ IncidentToAdjacentStrategy.class,
+ InlineFilterStrategy.class,
+ MatchPredicateStrategy.class,
+ OrderLimitStrategy.class,
+ PathProcessorStrategy.class,
+ PathRetractionStrategy.class,
+ RangeByIsCountStrategy.class,
+ RepeatUnrollStrategy.class,
+ ComputerVerificationStrategy.class,
+ LambdaRestrictionStrategy.class,
+ ReadOnlyStrategy.class,
+ StandardVerificationStrategy.class,
+ //
+ GraphFilterStrategy.class,
+ VertexProgramStrategy.class
+ ).forEach(strategy -> put(strategy, strategy.getSimpleName()));
+ }});
+
+ /**
+ * Constructs a new object.
+ */
+ protected GraphSONModuleV3d0(final boolean normalize) {
+ super("graphson-3.0");
+
+ /////////////////////// SERIALIZERS ////////////////////////////
+
+ // graph
+ addSerializer(Edge.class, new GraphSONSerializersV3d0.EdgeJacksonSerializer(normalize));
+ addSerializer(Vertex.class, new GraphSONSerializersV3d0.VertexJacksonSerializer(normalize));
+ addSerializer(VertexProperty.class, new GraphSONSerializersV3d0.VertexPropertyJacksonSerializer(normalize, true));
+ addSerializer(Property.class, new GraphSONSerializersV3d0.PropertyJacksonSerializer());
+ addSerializer(Metrics.class, new GraphSONSerializersV3d0.MetricsJacksonSerializer());
+ addSerializer(TraversalMetrics.class, new GraphSONSerializersV3d0.TraversalMetricsJacksonSerializer());
+ addSerializer(TraversalExplanation.class, new GraphSONSerializersV3d0.TraversalExplanationJacksonSerializer());
+ addSerializer(Path.class, new GraphSONSerializersV3d0.PathJacksonSerializer());
+ addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV2d0(normalize));
+ addSerializer(Tree.class, new GraphSONSerializersV3d0.TreeJacksonSerializer());
+
+ // java.util
+ addSerializer(Map.Entry.class, new JavaUtilSerializersV2d0.MapEntryJacksonSerializer());
+
+ // need to explicitly add serializers for those types because Jackson doesn't do it at all.
+ addSerializer(Integer.class, new GraphSONSerializersV3d0.IntegerGraphSONSerializer());
+ addSerializer(Double.class, new GraphSONSerializersV3d0.DoubleGraphSONSerializer());
+
+ // traversal
+ addSerializer(Traversal.class, new GraphSONTraversalSerializersV2d0.TraversalJacksonSerializer());
+ addSerializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonSerializer());
+ Stream.of(VertexProperty.Cardinality.class,
+ Column.class,
+ Direction.class,
+ Operator.class,
+ Order.class,
+ Pop.class,
+ SackFunctions.Barrier.class,
+ Scope.class,
+ TraversalOptionParent.Pick.class,
+ T.class).forEach(e -> addSerializer(e, new GraphSONTraversalSerializersV2d0.EnumJacksonSerializer()));
+ addSerializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonSerializer());
+ addSerializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonSerializer());
+ addSerializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonSerializer());
+ addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserJacksonSerializer());
+ addSerializer(TraversalStrategy.class, new GraphSONTraversalSerializersV2d0.TraversalStrategyJacksonSerializer());
+
+ /////////////////////// DESERIALIZERS ////////////////////////////
+
+ // Tinkerpop Graph
+ addDeserializer(Vertex.class, new GraphSONSerializersV3d0.VertexJacksonDeserializer());
+ addDeserializer(Edge.class, new GraphSONSerializersV3d0.EdgeJacksonDeserializer());
+ addDeserializer(Property.class, new GraphSONSerializersV3d0.PropertyJacksonDeserializer());
+ addDeserializer(Path.class, new GraphSONSerializersV3d0.PathJacksonDeserializer());
+ addDeserializer(VertexProperty.class, new GraphSONSerializersV3d0.VertexPropertyJacksonDeserializer());
+ addDeserializer(Metrics.class, new GraphSONSerializersV3d0.MetricsJacksonDeserializer());
+ addDeserializer(TraversalMetrics.class, new GraphSONSerializersV3d0.TraversalMetricsJacksonDeserializer());
+ addDeserializer(Tree.class, new GraphSONSerializersV3d0.TreeJacksonDeserializer());
+
+ // numbers
+ addDeserializer(Integer.class, new GraphSONSerializersV2d0.IntegerJackonsDeserializer());
+ addDeserializer(Double.class, new GraphSONSerializersV2d0.DoubleJackonsDeserializer());
+
+ // traversal
+ addDeserializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonDeserializer());
+ addDeserializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonDeserializer());
+ Stream.of(VertexProperty.Cardinality.values(),
+ Column.values(),
+ Direction.values(),
+ Operator.values(),
+ Order.values(),
+ Pop.values(),
+ SackFunctions.Barrier.values(),
+ Scope.values(),
+ TraversalOptionParent.Pick.values(),
+ T.values()).flatMap(Stream::of).forEach(e -> addDeserializer(e.getClass(), new GraphSONTraversalSerializersV2d0.EnumJacksonDeserializer(e.getDeclaringClass())));
+ addDeserializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonDeserializer());
+ addDeserializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonDeserializer());
+ addDeserializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserJacksonDeserializer());
+ Arrays.asList(
+ ConnectiveStrategy.class,
+ ElementIdStrategy.class,
+ EventStrategy.class,
+ HaltedTraverserStrategy.class,
+ PartitionStrategy.class,
+ SubgraphStrategy.class,
+ LazyBarrierStrategy.class,
+ MatchAlgorithmStrategy.class,
+ AdjacentToIncidentStrategy.class,
+ FilterRankingStrategy.class,
+ IdentityRemovalStrategy.class,
+ IncidentToAdjacentStrategy.class,
+ InlineFilterStrategy.class,
+ MatchPredicateStrategy.class,
+ OrderLimitStrategy.class,
+ PathProcessorStrategy.class,
+ PathRetractionStrategy.class,
+ RangeByIsCountStrategy.class,
+ RepeatUnrollStrategy.class,
+ ComputerVerificationStrategy.class,
+ LambdaRestrictionStrategy.class,
+ ReadOnlyStrategy.class,
+ StandardVerificationStrategy.class,
+ //
+ GraphFilterStrategy.class,
+ VertexProgramStrategy.class
+ ).forEach(strategy -> addDeserializer(strategy, new GraphSONTraversalSerializersV2d0.TraversalStrategyProxyJacksonDeserializer(strategy)));
+ }
+
+ public static Builder build() {
+ return new Builder();
+ }
+
+ @Override
+ public Map<Class, String> getTypeDefinitions() {
+ return TYPE_DEFINITIONS;
+ }
+
+ @Override
+ public String getTypeNamespace() {
+ return GraphSONTokens.GREMLIN_TYPE_NAMESPACE;
+ }
+
+ static final class Builder implements GraphSONModuleBuilder {
+
+ private Builder() {
+ }
+
+ @Override
+ public GraphSONModule create(final boolean normalize) {
+ return new GraphSONModuleV3d0(normalize);
+ }
+
+ }
+ }
+
+ /**
* Version 2.0 of GraphSON.
*/
static final class GraphSONModuleV2d0 extends GraphSONModule {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 824fc7f..f8f4cd1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -54,7 +54,6 @@ import org.javatuples.Pair;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@@ -64,6 +63,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.safeWriteObjectField;
+
/**
* GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
* present a generalized way to serialize the implementations of core interfaces.
@@ -100,34 +101,22 @@ class GraphSONSerializersV2d0 {
}
private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
- if (vertex.keys().isEmpty())
+ if (vertex.keys().size() == 0)
return;
jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
jsonGenerator.writeStartObject();
final List<String> keys = normalize ?
IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
- for (final String key : keys) {
+ for (String key : keys) {
final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
if (vertexProperties.hasNext()) {
jsonGenerator.writeFieldName(key);
+
jsonGenerator.writeStartArray();
while (vertexProperties.hasNext()) {
- final VertexProperty<?> vertexProperty = vertexProperties.next();
- jsonGenerator.writeStartObject();
- jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
- if (!vertexProperty.keys().isEmpty()) {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- final Iterator<Property<?>> properties = (Iterator) vertexProperty.properties();
- while (properties.hasNext()) {
- final Property<?> property = properties.next();
- jsonGenerator.writeObjectField(property.key(), property.value());
- }
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndObject();
+ jsonGenerator.writeObject(vertexProperties.next());
}
jsonGenerator.writeEndArray();
}
@@ -164,15 +153,13 @@ class GraphSONSerializersV2d0 {
}
private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
- final Iterator<Property<Object>> edgeProperties = normalize ?
+ final Iterator<Property<Object>> elementProperties = normalize ?
IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
- if (edgeProperties.hasNext()) {
+ if (elementProperties.hasNext()) {
jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+
jsonGenerator.writeStartObject();
- while (edgeProperties.hasNext()) {
- final Property<?> property = edgeProperties.next();
- jsonGenerator.writeObjectField(property.key(), property.value());
- }
+ elementProperties.forEachRemaining(prop -> safeWriteObjectField(jsonGenerator, prop.key(), prop));
jsonGenerator.writeEndObject();
}
}
@@ -188,25 +175,8 @@ class GraphSONSerializersV2d0 {
public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
throws IOException {
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(GraphSONTokens.KEY, property.key());
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, property.key());
jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
- if (property.element() instanceof VertexProperty) {
- VertexProperty vertexProperty = (VertexProperty) property.element();
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.VERTEX_PROPERTY);
- jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertexProperty.label());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
- jsonGenerator.writeObjectField(GraphSONTokens.VERTEX, vertexProperty.element().id());
- jsonGenerator.writeEndObject();
- } else if (property.element() instanceof Edge) {
- Edge edge = (Edge) property.element();
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.EDGE);
- jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
- jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
- jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
- jsonGenerator.writeEndObject();
- }
jsonGenerator.writeEndObject();
}
}
@@ -223,46 +193,44 @@ class GraphSONSerializersV2d0 {
}
@Override
- public void serialize(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
throws IOException {
jsonGenerator.writeStartObject();
- jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
- if (null != vertexProperty.element())
- jsonGenerator.writeObjectField(GraphSONTokens.VERTEX, vertexProperty.element().id());
- if (this.includeLabel)
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertexProperty.label());
- tryWriteMetaProperties(vertexProperty, jsonGenerator, normalize);
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, property.id());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+ if (includeLabel)
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+ tryWriteMetaProperties(property, jsonGenerator, normalize);
jsonGenerator.writeEndObject();
}
- private static void tryWriteMetaProperties(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator,
+ private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
final boolean normalize) throws IOException {
// when "detached" you can't check features of the graph it detached from so it has to be
// treated differently from a regular VertexProperty implementation.
- if (vertexProperty instanceof DetachedVertexProperty) {
+ if (property instanceof DetachedVertexProperty) {
// only write meta properties key if they exist
- if (vertexProperty.properties().hasNext()) {
- writeMetaProperties(vertexProperty, jsonGenerator, normalize);
+ if (property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, normalize);
}
} else {
// still attached - so we can check the features to see if it's worth even trying to write the
// meta properties key
- if (vertexProperty.graph().features().vertex().supportsMetaProperties() && vertexProperty.properties().hasNext()) {
- writeMetaProperties(vertexProperty, jsonGenerator, normalize);
+ if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, normalize);
}
}
}
- private static void writeMetaProperties(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator,
+ private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
final boolean normalize) throws IOException {
jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
jsonGenerator.writeStartObject();
final Iterator<Property<Object>> metaProperties = normalize ?
- IteratorUtils.list((Iterator<Property<Object>>) vertexProperty.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : vertexProperty.properties();
+ IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
while (metaProperties.hasNext()) {
final Property<Object> metaProperty = metaProperties.next();
jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
@@ -358,7 +326,7 @@ class GraphSONSerializersV2d0 {
@Override
public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider) throws IOException {
- jsonGenerator.writeNumber(integer.intValue());
+ jsonGenerator.writeNumber(((Integer) integer).intValue());
}
}
@@ -459,7 +427,7 @@ class GraphSONSerializersV2d0 {
public Vertex createObject(final Map<String, Object> vertexData) {
return new DetachedVertex(
vertexData.get(GraphSONTokens.ID),
- (String) vertexData.getOrDefault(GraphSONTokens.LABEL, Vertex.DEFAULT_LABEL),
+ vertexData.get(GraphSONTokens.LABEL).toString(),
(Map<String, Object>) vertexData.get(GraphSONTokens.PROPERTIES)
);
}
@@ -475,10 +443,10 @@ class GraphSONSerializersV2d0 {
public Edge createObject(final Map<String, Object> edgeData) {
return new DetachedEdge(
edgeData.get(GraphSONTokens.ID),
- (String) edgeData.getOrDefault(GraphSONTokens.LABEL, Edge.DEFAULT_LABEL),
- (Map<String, Object>) edgeData.get(GraphSONTokens.PROPERTIES),
- Pair.with(edgeData.get(GraphSONTokens.OUT), (String) edgeData.getOrDefault(GraphSONTokens.OUT_LABEL, Vertex.DEFAULT_LABEL)),
- Pair.with(edgeData.get(GraphSONTokens.IN), (String) edgeData.getOrDefault(GraphSONTokens.IN_LABEL, Vertex.DEFAULT_LABEL))
+ edgeData.get(GraphSONTokens.LABEL).toString(),
+ (Map) edgeData.get(GraphSONTokens.PROPERTIES),
+ Pair.with(edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString()),
+ Pair.with(edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString())
);
}
}
@@ -491,41 +459,9 @@ class GraphSONSerializersV2d0 {
@Override
public Property createObject(final Map<String, Object> propData) {
- Element element = null;
- if (propData.containsKey(GraphSONTokens.VERTEX_PROPERTY)) {
- final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.VERTEX_PROPERTY);
- element = new VertexPropertyJacksonDeserializer().createObject(elementData);
- } else if (propData.containsKey(GraphSONTokens.EDGE)) {
- final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.EDGE);
- element = new EdgeJacksonDeserializer().createObject(elementData);
- }
- return null != element ? // graphson-non-embedded is treated differently, but since this is a hard coded embedding...
- new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE), element) :
- new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE));
- }
- }
-
- static class VertexPropertyJacksonDeserializer extends AbstractObjectDeserializer<VertexProperty> {
-
- protected VertexPropertyJacksonDeserializer() {
- super(VertexProperty.class);
- }
-
- @Override
- public VertexProperty createObject(final Map<String, Object> propData) {
- return propData.containsKey(GraphSONTokens.VERTEX) ?
- new DetachedVertexProperty<>(
- propData.get(GraphSONTokens.ID),
- (String) propData.get(GraphSONTokens.LABEL),
- propData.get(GraphSONTokens.VALUE),
- (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES),
- new DetachedVertex(propData.get(GraphSONTokens.VERTEX), Vertex.DEFAULT_LABEL, null)) :
- new DetachedVertexProperty<>(
- propData.get(GraphSONTokens.ID),
- (String) propData.get(GraphSONTokens.LABEL),
- propData.get(GraphSONTokens.VALUE),
- (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES));
-
+ return new DetachedProperty(
+ (String) propData.get(GraphSONTokens.KEY),
+ propData.get(GraphSONTokens.VALUE));
}
}
@@ -549,6 +485,23 @@ class GraphSONSerializersV2d0 {
}
}
+ static class VertexPropertyJacksonDeserializer extends AbstractObjectDeserializer<VertexProperty> {
+
+ protected VertexPropertyJacksonDeserializer() {
+ super(VertexProperty.class);
+ }
+
+ @Override
+ public VertexProperty createObject(final Map<String, Object> propData) {
+ return new DetachedVertexProperty(
+ propData.get(GraphSONTokens.ID),
+ (String) propData.get(GraphSONTokens.LABEL),
+ propData.get(GraphSONTokens.VALUE),
+ (Map) propData.get(GraphSONTokens.PROPERTIES)
+ );
+ }
+ }
+
static class MetricsJacksonDeserializer extends AbstractObjectDeserializer<Metrics> {
public MetricsJacksonDeserializer() {
super(Metrics.class);
@@ -556,16 +509,16 @@ class GraphSONSerializersV2d0 {
@Override
public Metrics createObject(final Map<String, Object> metricsData) {
- final MutableMetrics m = new MutableMetrics((String) metricsData.get(GraphSONTokens.ID), (String) metricsData.get(GraphSONTokens.NAME));
+ final MutableMetrics m = new MutableMetrics((String)metricsData.get(GraphSONTokens.ID), (String)metricsData.get(GraphSONTokens.NAME));
m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
- for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.COUNTS, Collections.emptyMap())).entrySet()) {
+ for (Map.Entry<String, Long> count : ((Map<String, Long>)metricsData.getOrDefault(GraphSONTokens.COUNTS, new HashMap<>(0))).entrySet()) {
m.setCount(count.getKey(), count.getValue());
}
- for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, Collections.emptyMap())).entrySet()) {
+ for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, new HashMap<>(0))).entrySet()) {
m.setAnnotation(count.getKey(), count.getValue());
}
- for (MutableMetrics nested : (List<MutableMetrics>) metricsData.getOrDefault(GraphSONTokens.METRICS, Collections.emptyList())) {
+ for (MutableMetrics nested : (List<MutableMetrics>)metricsData.getOrDefault(GraphSONTokens.METRICS, new ArrayList<>(0))) {
m.addNested(nested);
}
return m;
@@ -627,7 +580,4 @@ class GraphSONSerializersV2d0 {
return jsonParser.getDoubleValue();
}
}
-}
-
-
-
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
new file mode 100644
index 0000000..165e7e1
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
@@ -0,0 +1,632 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.MutablePath;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.javatuples.Pair;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+class GraphSONSerializersV3d0 {
+
+ private GraphSONSerializersV3d0() {
+ }
+
+ ////////////////////////////// SERIALIZERS /////////////////////////////////
+
+ final static class VertexJacksonSerializer extends StdScalarSerializer<Vertex> {
+
+ private final boolean normalize;
+
+ public VertexJacksonSerializer(final boolean normalize) {
+ super(Vertex.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertex.id());
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+ writeProperties(vertex, jsonGenerator);
+
+ jsonGenerator.writeEndObject();
+
+ }
+
+ private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
+ if (vertex.keys().isEmpty())
+ return;
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+
+ final List<String> keys = normalize ?
+ IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+ for (final String key : keys) {
+ final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+ IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+ if (vertexProperties.hasNext()) {
+ jsonGenerator.writeFieldName(key);
+ jsonGenerator.writeStartArray();
+ while (vertexProperties.hasNext()) {
+ final VertexProperty<?> vertexProperty = vertexProperties.next();
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
+ if (!vertexProperty.keys().isEmpty()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ final Iterator<Property<?>> properties = (Iterator) vertexProperty.properties();
+ while (properties.hasNext()) {
+ final Property<?> property = properties.next();
+ jsonGenerator.writeObjectField(property.key(), property.value());
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndArray();
+ }
+ }
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class EdgeJacksonSerializer extends StdScalarSerializer<Edge> {
+
+ private final boolean normalize;
+
+ public EdgeJacksonSerializer(final boolean normalize) {
+ super(Edge.class);
+ this.normalize = normalize;
+ }
+
+
+ @Override
+ public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+ jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+ jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+ jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
+ jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
+ writeProperties(edge, jsonGenerator);
+
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator) throws IOException {
+ final Iterator<Property<Object>> edgeProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (edgeProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+ while (edgeProperties.hasNext()) {
+ final Property<?> property = edgeProperties.next();
+ jsonGenerator.writeObjectField(property.key(), property.value());
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+ }
+
+ final static class PropertyJacksonSerializer extends StdScalarSerializer<Property> {
+
+ public PropertyJacksonSerializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeStringField(GraphSONTokens.KEY, property.key());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
+ if (property.element() instanceof VertexProperty) {
+ VertexProperty vertexProperty = (VertexProperty) property.element();
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.VERTEX_PROPERTY);
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertexProperty.label());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
+ jsonGenerator.writeObjectField(GraphSONTokens.VERTEX, vertexProperty.element().id());
+ jsonGenerator.writeEndObject();
+ } else if (property.element() instanceof Edge) {
+ Edge edge = (Edge) property.element();
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.EDGE);
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+ jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
+ jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class VertexPropertyJacksonSerializer extends StdScalarSerializer<VertexProperty> {
+
+ private final boolean normalize;
+ private final boolean includeLabel;
+
+ public VertexPropertyJacksonSerializer(final boolean normalize, final boolean includeLabel) {
+ super(VertexProperty.class);
+ this.normalize = normalize;
+ this.includeLabel = includeLabel;
+ }
+
+ @Override
+ public void serialize(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
+ if (null != vertexProperty.element())
+ jsonGenerator.writeObjectField(GraphSONTokens.VERTEX, vertexProperty.element().id());
+ if (this.includeLabel)
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertexProperty.label());
+ tryWriteMetaProperties(vertexProperty, jsonGenerator, normalize);
+
+ jsonGenerator.writeEndObject();
+ }
+
+ private static void tryWriteMetaProperties(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator,
+ final boolean normalize) throws IOException {
+ // when "detached" you can't check features of the graph it detached from so it has to be
+ // treated differently from a regular VertexProperty implementation.
+ if (vertexProperty instanceof DetachedVertexProperty) {
+ // only write meta properties key if they exist
+ if (vertexProperty.properties().hasNext()) {
+ writeMetaProperties(vertexProperty, jsonGenerator, normalize);
+ }
+ } else {
+ // still attached - so we can check the features to see if it's worth even trying to write the
+ // meta properties key
+ if (vertexProperty.graph().features().vertex().supportsMetaProperties() && vertexProperty.properties().hasNext()) {
+ writeMetaProperties(vertexProperty, jsonGenerator, normalize);
+ }
+ }
+ }
+
+ private static void writeMetaProperties(final VertexProperty vertexProperty, final JsonGenerator jsonGenerator,
+ final boolean normalize) throws IOException {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ jsonGenerator.writeStartObject();
+
+ final Iterator<Property<Object>> metaProperties = normalize ?
+ IteratorUtils.list((Iterator<Property<Object>>) vertexProperty.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : vertexProperty.properties();
+ while (metaProperties.hasNext()) {
+ final Property<Object> metaProperty = metaProperties.next();
+ jsonGenerator.writeObjectField(metaProperty.key(), metaProperty.value());
+ }
+
+ jsonGenerator.writeEndObject();
+ }
+
+
+ }
+
+ final static class PathJacksonSerializer extends StdScalarSerializer<Path> {
+
+ public PathJacksonSerializer() {
+ super(Path.class);
+ }
+
+ @Override
+ public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException, JsonGenerationException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
+ jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class TreeJacksonSerializer extends StdScalarSerializer<Tree> {
+
+ public TreeJacksonSerializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ jsonGenerator.writeStartArray();
+ final Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+ for (Map.Entry<Element, Tree> entry : set) {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndArray();
+ }
+ }
+
+ final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+ public TraversalExplanationJacksonSerializer() {
+ super(TraversalExplanation.class);
+ }
+
+ @Override
+ public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ORIGINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+
+ final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = traversalExplanation.getStrategyTraversals();
+
+ final List<Map<String, Object>> intermediates = new ArrayList<>();
+ for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+ final Map<String, Object> intermediate = new HashMap<>();
+ intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+ intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+ intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+ intermediates.add(intermediate);
+ }
+ m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+ if (strategyTraversals.isEmpty())
+ m.put(GraphSONTokens.FINAL, getStepsAsList(traversalExplanation.getOriginalTraversal()));
+ else
+ m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+ jsonGenerator.writeObject(m);
+ }
+
+ private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
+ final List<String> steps = new ArrayList<>();
+ t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+ return steps;
+ }
+ }
+
+ final static class IntegerGraphSONSerializer extends StdScalarSerializer<Integer> {
+ public IntegerGraphSONSerializer() {
+ super(Integer.class);
+ }
+
+ @Override
+ public void serialize(final Integer integer, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ jsonGenerator.writeNumber(integer.intValue());
+ }
+ }
+
+ final static class DoubleGraphSONSerializer extends StdScalarSerializer<Double> {
+ public DoubleGraphSONSerializer() {
+ super(Double.class);
+ }
+
+ @Override
+ public void serialize(final Double doubleValue, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ jsonGenerator.writeNumber(doubleValue);
+ }
+ }
+
+ final static class TraversalMetricsJacksonSerializer extends StdScalarSerializer<TraversalMetrics> {
+ public TraversalMetricsJacksonSerializer() {
+ super(TraversalMetrics.class);
+ }
+
+ @Override
+ public void serialize(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ // creation of the map enables all the fields to be properly written with their type if required
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+ final List<Metrics> metrics = new ArrayList<>();
+ metrics.addAll(traversalMetrics.getMetrics());
+ m.put(GraphSONTokens.METRICS, metrics);
+
+ jsonGenerator.writeObject(m);
+ }
+ }
+
+ final static class MetricsJacksonSerializer extends StdScalarSerializer<Metrics> {
+ public MetricsJacksonSerializer() {
+ super(Metrics.class);
+ }
+
+ @Override
+ public void serialize(final Metrics metrics, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ID, metrics.getId());
+ m.put(GraphSONTokens.NAME, metrics.getName());
+ m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+ m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+ if (!metrics.getAnnotations().isEmpty()) {
+ m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+ }
+ if (!metrics.getNested().isEmpty()) {
+ final List<Metrics> nested = new ArrayList<>();
+ metrics.getNested().forEach(it -> nested.add(it));
+ m.put(GraphSONTokens.METRICS, nested);
+ }
+ jsonGenerator.writeObject(m);
+ }
+ }
+
+
+ /**
+ * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+ */
+ final static class GraphSONKeySerializer extends StdKeySerializer {
+
+ @Override
+ public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ @Override
+ public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ private void ser(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ if (Element.class.isAssignableFrom(o.getClass()))
+ jsonGenerator.writeFieldName((((Element) o).id()).toString());
+ else
+ super.serialize(o, jsonGenerator, serializerProvider);
+ }
+ }
+
+
+ //////////////////////////// DESERIALIZERS ///////////////////////////
+
+
+ static class VertexJacksonDeserializer extends AbstractObjectDeserializer<Vertex> {
+
+ public VertexJacksonDeserializer() {
+ super(Vertex.class);
+ }
+
+ @Override
+ public Vertex createObject(final Map<String, Object> vertexData) {
+ return new DetachedVertex(
+ vertexData.get(GraphSONTokens.ID),
+ (String) vertexData.getOrDefault(GraphSONTokens.LABEL, Vertex.DEFAULT_LABEL),
+ (Map<String, Object>) vertexData.get(GraphSONTokens.PROPERTIES)
+ );
+ }
+ }
+
+ static class EdgeJacksonDeserializer extends AbstractObjectDeserializer<Edge> {
+
+ public EdgeJacksonDeserializer() {
+ super(Edge.class);
+ }
+
+ @Override
+ public Edge createObject(final Map<String, Object> edgeData) {
+ return new DetachedEdge(
+ edgeData.get(GraphSONTokens.ID),
+ (String) edgeData.getOrDefault(GraphSONTokens.LABEL, Edge.DEFAULT_LABEL),
+ (Map<String, Object>) edgeData.get(GraphSONTokens.PROPERTIES),
+ Pair.with(edgeData.get(GraphSONTokens.OUT), (String) edgeData.getOrDefault(GraphSONTokens.OUT_LABEL, Vertex.DEFAULT_LABEL)),
+ Pair.with(edgeData.get(GraphSONTokens.IN), (String) edgeData.getOrDefault(GraphSONTokens.IN_LABEL, Vertex.DEFAULT_LABEL))
+ );
+ }
+ }
+
+ static class PropertyJacksonDeserializer extends AbstractObjectDeserializer<Property> {
+
+ public PropertyJacksonDeserializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public Property createObject(final Map<String, Object> propData) {
+ Element element = null;
+ if (propData.containsKey(GraphSONTokens.VERTEX_PROPERTY)) {
+ final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.VERTEX_PROPERTY);
+ element = new VertexPropertyJacksonDeserializer().createObject(elementData);
+ } else if (propData.containsKey(GraphSONTokens.EDGE)) {
+ final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.EDGE);
+ element = new EdgeJacksonDeserializer().createObject(elementData);
+ }
+ return null != element ? // graphson-non-embedded is treated differently, but since this is a hard coded embedding...
+ new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE), element) :
+ new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE));
+ }
+ }
+
+ static class VertexPropertyJacksonDeserializer extends AbstractObjectDeserializer<VertexProperty> {
+
+ protected VertexPropertyJacksonDeserializer() {
+ super(VertexProperty.class);
+ }
+
+ @Override
+ public VertexProperty createObject(final Map<String, Object> propData) {
+ return propData.containsKey(GraphSONTokens.VERTEX) ?
+ new DetachedVertexProperty<>(
+ propData.get(GraphSONTokens.ID),
+ (String) propData.get(GraphSONTokens.LABEL),
+ propData.get(GraphSONTokens.VALUE),
+ (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES),
+ new DetachedVertex(propData.get(GraphSONTokens.VERTEX), Vertex.DEFAULT_LABEL, null)) :
+ new DetachedVertexProperty<>(
+ propData.get(GraphSONTokens.ID),
+ (String) propData.get(GraphSONTokens.LABEL),
+ propData.get(GraphSONTokens.VALUE),
+ (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES));
+
+ }
+ }
+
+ static class PathJacksonDeserializer extends AbstractObjectDeserializer<Path> {
+
+ public PathJacksonDeserializer() {
+ super(Path.class);
+ }
+
+ @Override
+ public Path createObject(final Map<String, Object> pathData) {
+ final Path p = MutablePath.make();
+
+ final List labels = (List) pathData.get(GraphSONTokens.LABELS);
+ final List objects = (List) pathData.get(GraphSONTokens.OBJECTS);
+
+ for (int i = 0; i < objects.size(); i++) {
+ p.extend(objects.get(i), new HashSet((List) labels.get(i)));
+ }
+ return p;
+ }
+ }
+
+ static class MetricsJacksonDeserializer extends AbstractObjectDeserializer<Metrics> {
+ public MetricsJacksonDeserializer() {
+ super(Metrics.class);
+ }
+
+ @Override
+ public Metrics createObject(final Map<String, Object> metricsData) {
+ final MutableMetrics m = new MutableMetrics((String) metricsData.get(GraphSONTokens.ID), (String) metricsData.get(GraphSONTokens.NAME));
+
+ m.setDuration(Math.round((Double) metricsData.get(GraphSONTokens.DURATION) * 1000000), TimeUnit.NANOSECONDS);
+ for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.COUNTS, Collections.emptyMap())).entrySet()) {
+ m.setCount(count.getKey(), count.getValue());
+ }
+ for (Map.Entry<String, Long> count : ((Map<String, Long>) metricsData.getOrDefault(GraphSONTokens.ANNOTATIONS, Collections.emptyMap())).entrySet()) {
+ m.setAnnotation(count.getKey(), count.getValue());
+ }
+ for (MutableMetrics nested : (List<MutableMetrics>) metricsData.getOrDefault(GraphSONTokens.METRICS, Collections.emptyList())) {
+ m.addNested(nested);
+ }
+ return m;
+ }
+ }
+
+ static class TraversalMetricsJacksonDeserializer extends AbstractObjectDeserializer<TraversalMetrics> {
+
+ public TraversalMetricsJacksonDeserializer() {
+ super(TraversalMetrics.class);
+ }
+
+ @Override
+ public TraversalMetrics createObject(final Map<String, Object> traversalMetricsData) {
+ return new DefaultTraversalMetrics(
+ Math.round((Double) traversalMetricsData.get(GraphSONTokens.DURATION) * 1000000),
+ (List<MutableMetrics>) traversalMetricsData.get(GraphSONTokens.METRICS)
+ );
+ }
+ }
+
+ static class TreeJacksonDeserializer extends StdDeserializer<Tree> {
+
+ public TreeJacksonDeserializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public Tree deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final List<Map> data = deserializationContext.readValue(jsonParser, List.class);
+ final Tree t = new Tree();
+ for (Map<String, Object> entry : data) {
+ t.put(entry.get(GraphSONTokens.KEY), entry.get(GraphSONTokens.VALUE));
+ }
+ return t;
+ }
+ }
+
+ static class IntegerJackonsDeserializer extends StdDeserializer<Integer> {
+
+ protected IntegerJackonsDeserializer() {
+ super(Integer.class);
+ }
+
+ @Override
+ public Integer deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ return jsonParser.getIntValue();
+ }
+ }
+
+ static class DoubleJackonsDeserializer extends StdDeserializer<Double> {
+
+ protected DoubleJackonsDeserializer() {
+ super(Double.class);
+ }
+
+ @Override
+ public Double deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ return jsonParser.getDoubleValue();
+ }
+ }
+}
+
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
index d804f0b..10e36e0 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
@@ -36,6 +36,7 @@ public final class GraphSONTokens {
public static final String KEY = "key";
public static final String EDGE = "edge";
public static final String EDGES = "edges";
+ public static final String ELEMENT = "ELEMENT";
public static final String VERTEX = "vertex";
public static final String VERTEX_PROPERTY = "vertexProperty";
public static final String VERTICES = "vertices";
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
index 97292af..710c2bc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
@@ -86,4 +86,11 @@ public final class GraphSONUtil {
jsonGenerator.writeEndArray();
}
+ static void safeWriteObjectField(final JsonGenerator jsonGenerator, final String key, final Object value) {
+ try {
+ jsonGenerator.writeObjectField(key, value);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
index 7740b06..cb163e7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
@@ -25,7 +25,8 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
*/
public enum GraphSONVersion {
V1_0(GraphSONModule.GraphSONModuleV1d0.build(), "1.0"),
- V2_0(GraphSONModule.GraphSONModuleV2d0.build(), "2.0");
+ V2_0(GraphSONModule.GraphSONModuleV2d0.build(), "2.0"),
+ V3_0(GraphSONModule.GraphSONModuleV3d0.build(), "3.0");
private final GraphSONModule.GraphSONModuleBuilder builder;
private final String versionNumber;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd6b88/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
new file mode 100644
index 0000000..f6f2fc8
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Serialize results to JSON with version 3.0.x schema and the extended module.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerV3d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer {
+ private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV3d0.class);
+ private static final String MIME_TYPE = SerTokens.MIME_JSON;
+
+ private static byte[] header;
+
+ static {
+ final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+ buffer.put((byte) MIME_TYPE.length());
+ buffer.put(MIME_TYPE.getBytes());
+ header = buffer.array();
+ }
+
+ public GraphSONMessageSerializerV3d0() {
+ super();
+ }
+
+ public GraphSONMessageSerializerV3d0(final GraphSONMapper mapper) {
+ super(mapper);
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[]{MIME_TYPE, "application/json"};
+ }
+
+ @Override
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ // override the 2.0 in AbstractGraphSONMessageSerializerV2d0
+ return builder.typeInfo(TypeInfo.PARTIAL_TYPES).version(GraphSONVersion.V3_0);
+ }
+
+ @Override
+ byte[] obtainHeader() {
+ return header;
+ }
+
+ @Override
+ public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+ try {
+ final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
+ final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+ final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+ return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+ .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+ .statusMessage(status.get(SerTokens.TOKEN_MESSAGE).toString())
+ .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+ .result(result.get(SerTokens.TOKEN_DATA))
+ .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+ .create();
+ } catch (Exception ex) {
+ logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public String serializeResponseAsString(final ResponseMessage responseMessage) throws SerializationException {
+ try {
+ return mapper.writeValueAsString(responseMessage);
+ } catch (Exception ex) {
+ logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+ try {
+ return mapper.readValue(msg, RequestMessage.class);
+ } catch (Exception ex) {
+ logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public String serializeRequestAsString(final RequestMessage requestMessage) throws SerializationException {
+ try {
+ return mapper.writeValueAsString(requestMessage);
+ } catch (Exception ex) {
+ logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+}
[39/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dc31f2da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dc31f2da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dc31f2da
Branch: refs/heads/TINKERPOP-1565
Commit: dc31f2daaa441bfe69cdfdba7ef8e671b9b376a8
Parents: 02f24b9 28e1d93
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 18 11:32:25 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 11:32:25 2017 -0500
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 90 +++++++++++++++-----------
1 file changed, 53 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dc31f2da/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[29/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/more-recipes' into tp32
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/more-recipes' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e06ce0c1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e06ce0c1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e06ce0c1
Branch: refs/heads/TINKERPOP-1565
Commit: e06ce0c19bb7d1752db8bd578e97f4b11e6e6ea8
Parents: 1e856b3 9cdc47c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 12:22:45 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 12:22:45 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 262 +++++++++++++++++++
docs/src/recipes/connected-components.asciidoc | 82 ++++++
docs/src/recipes/cycle-detection.asciidoc | 55 ++++
docs/src/recipes/duplicate-edge.asciidoc | 160 +++++++++++
docs/src/recipes/duplicate-vertex.asciidoc | 52 ++++
docs/src/recipes/index.asciidoc | 8 +-
.../recipes/traversal-induced-values.asciidoc | 109 ++++++++
docs/src/reference/the-traversal.asciidoc | 4 +
docs/static/images/connected-components.png | Bin 0 -> 17946 bytes
docs/static/images/eulerian-circuit.png | Bin 0 -> 25270 bytes
.../images/traversal-induced-values-1.png | Bin 0 -> 12607 bytes
.../images/traversal-induced-values-2.png | Bin 0 -> 40440 bytes
.../images/traversal-induced-values-3.png | Bin 0 -> 49652 bytes
13 files changed, 731 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[40/50] [abbrv] tinkerpop git commit: first draft of new updates to
GraphSON 2.0. The object models are concise,
all the elements/properties are attachable. Really wasn't that much of a
headache to change -- a few test cases in Gremlin-Python needed upda
Posted by sp...@apache.org.
first draft of new updates to GraphSON 2.0. The object models are concise, all the elements/properties are attachable. Really wasn't that much of a headache to change -- a few test cases in Gremlin-Python needed updating and in GraphSONMessageSerializerV2d0Test. The corresponding ticket in JIRA has a comment with the pretty print JSON of the various elements/properties.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f046ea64
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f046ea64
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f046ea64
Branch: refs/heads/TINKERPOP-1565
Commit: f046ea64e5fb197be4ea4944794e60ff142bd410
Parents: dc31f2d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Nov 29 11:32:21 2016 -0700
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:10:32 2017 -0500
----------------------------------------------------------------------
.../io/graphson/GraphSONSerializersV2d0.java | 50 ++++++++++++-------
.../structure/io/graphson/GraphSONTokens.java | 2 +-
.../ser/GraphSONMessageSerializerV2d0Test.java | 18 +++----
.../gremlin_python/structure/io/graphson.py | 52 ++++++++++++++------
.../jython/tests/structure/io/test_graphson.py | 12 ++---
5 files changed, 84 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f046ea64/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index e4cc755..824fc7f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -100,22 +100,34 @@ class GraphSONSerializersV2d0 {
}
private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
- if (vertex.keys().size() == 0)
+ if (vertex.keys().isEmpty())
return;
jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
jsonGenerator.writeStartObject();
final List<String> keys = normalize ?
IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
- for (String key : keys) {
+ for (final String key : keys) {
final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
if (vertexProperties.hasNext()) {
jsonGenerator.writeFieldName(key);
-
jsonGenerator.writeStartArray();
while (vertexProperties.hasNext()) {
- jsonGenerator.writeObject(vertexProperties.next());
+ final VertexProperty<?> vertexProperty = vertexProperties.next();
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
+ if (!vertexProperty.keys().isEmpty()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ final Iterator<Property<?>> properties = (Iterator) vertexProperty.properties();
+ while (properties.hasNext()) {
+ final Property<?> property = properties.next();
+ jsonGenerator.writeObjectField(property.key(), property.value());
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
}
jsonGenerator.writeEndArray();
}
@@ -156,7 +168,6 @@ class GraphSONSerializersV2d0 {
IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
if (edgeProperties.hasNext()) {
jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
-
jsonGenerator.writeStartObject();
while (edgeProperties.hasNext()) {
final Property<?> property = edgeProperties.next();
@@ -181,24 +192,19 @@ class GraphSONSerializersV2d0 {
jsonGenerator.writeObjectField(GraphSONTokens.VALUE, property.value());
if (property.element() instanceof VertexProperty) {
VertexProperty vertexProperty = (VertexProperty) property.element();
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.ELEMENT);
- jsonGenerator.writeStringField(GraphSONTokens.VALUETYPE, "g:VertexProperty");
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.VALUEPROP);
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.VERTEX_PROPERTY);
jsonGenerator.writeObjectField(GraphSONTokens.ID, vertexProperty.id());
jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertexProperty.label());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, vertexProperty.value());
jsonGenerator.writeObjectField(GraphSONTokens.VERTEX, vertexProperty.element().id());
jsonGenerator.writeEndObject();
- jsonGenerator.writeEndObject();
} else if (property.element() instanceof Edge) {
Edge edge = (Edge) property.element();
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.ELEMENT);
- jsonGenerator.writeStringField(GraphSONTokens.VALUETYPE, "g:Edge");
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.VALUEPROP);
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.EDGE);
jsonGenerator.writeObjectField(GraphSONTokens.ID, edge.id());
jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
- jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
jsonGenerator.writeObjectField(GraphSONTokens.IN, edge.inVertex().id());
- jsonGenerator.writeEndObject();
+ jsonGenerator.writeObjectField(GraphSONTokens.OUT, edge.outVertex().id());
jsonGenerator.writeEndObject();
}
jsonGenerator.writeEndObject();
@@ -485,9 +491,16 @@ class GraphSONSerializersV2d0 {
@Override
public Property createObject(final Map<String, Object> propData) {
- final Object element = propData.get(GraphSONTokens.ELEMENT);
- return element instanceof Element ? // graphson-non-embedded is treated differently, but since this is a hard coded embedding...
- new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE), (Element) element) :
+ Element element = null;
+ if (propData.containsKey(GraphSONTokens.VERTEX_PROPERTY)) {
+ final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.VERTEX_PROPERTY);
+ element = new VertexPropertyJacksonDeserializer().createObject(elementData);
+ } else if (propData.containsKey(GraphSONTokens.EDGE)) {
+ final Map<String, Object> elementData = (Map<String, Object>) propData.get(GraphSONTokens.EDGE);
+ element = new EdgeJacksonDeserializer().createObject(elementData);
+ }
+ return null != element ? // graphson-non-embedded is treated differently, but since this is a hard coded embedding...
+ new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE), element) :
new DetachedProperty<>((String) propData.get(GraphSONTokens.KEY), propData.get(GraphSONTokens.VALUE));
}
}
@@ -504,7 +517,8 @@ class GraphSONSerializersV2d0 {
new DetachedVertexProperty<>(
propData.get(GraphSONTokens.ID),
(String) propData.get(GraphSONTokens.LABEL),
- propData.get(GraphSONTokens.VALUE), (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES),
+ propData.get(GraphSONTokens.VALUE),
+ (Map<String, Object>) propData.get(GraphSONTokens.PROPERTIES),
new DetachedVertex(propData.get(GraphSONTokens.VERTEX), Vertex.DEFAULT_LABEL, null)) :
new DetachedVertexProperty<>(
propData.get(GraphSONTokens.ID),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f046ea64/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
index 4f804ad..d804f0b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
@@ -37,8 +37,8 @@ public final class GraphSONTokens {
public static final String EDGE = "edge";
public static final String EDGES = "edges";
public static final String VERTEX = "vertex";
+ public static final String VERTEX_PROPERTY = "vertexProperty";
public static final String VERTICES = "vertices";
- public static final String ELEMENT = "element";
public static final String IN = "inV";
public static final String OUT = "outV";
public static final String IN_E = "inE";
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f046ea64/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
index 13e2e69..4125946 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
@@ -315,17 +315,17 @@ public class GraphSONMessageSerializerV2d0Test {
final JsonNode friendProperties = properties.get("friends");
assertEquals(1, friendProperties.size());
- final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUEPROP);
+ final JsonNode friendsProperty = friendProperties.get(0).get(GraphSONTokens.VALUE);
assertNotNull(friendsProperty);
- assertEquals(4, friendsProperty.size());
+ assertEquals(3, friendsProperty.size());
- final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
+ final String object1 = friendsProperty.get(0).asText();
assertEquals("x", object1);
- final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).get(GraphSONTokens.VALUEPROP).asInt();
+ final int object2 = friendsProperty.get(1).get(GraphSONTokens.VALUEPROP).asInt();
assertEquals(5, object2);
- final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
+ final JsonNode object3 = friendsProperty.get(2);
assertEquals(500, object3.get("x").get(GraphSONTokens.VALUEPROP).asInt());
assertEquals("some", object3.get("y").asText());
}
@@ -439,7 +439,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
.get(GraphSONTokens.PROPERTIES)
.get("name")
- .get(0).get(GraphSONTokens.VALUEPROP)
+ .get(0)
.get(GraphSONTokens.VALUE).asText());
//check the leafs
@@ -450,7 +450,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
.get(GraphSONTokens.PROPERTIES)
.get("name")
- .get(0).get(GraphSONTokens.VALUEPROP)
+ .get(0)
.get(GraphSONTokens.VALUE).asText());
assertEquals("lop", converted.get(GraphSONTokens.VALUEPROP)
@@ -460,7 +460,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
.get(GraphSONTokens.PROPERTIES)
.get("name")
- .get(0).get(GraphSONTokens.VALUEPROP)
+ .get(0)
.get(GraphSONTokens.VALUE).asText());
assertEquals("josh", converted.get(GraphSONTokens.VALUEPROP)
@@ -470,7 +470,7 @@ public class GraphSONMessageSerializerV2d0Test {
.get(GraphSONTokens.KEY).get(GraphSONTokens.VALUEPROP)
.get(GraphSONTokens.PROPERTIES)
.get("name")
- .get(0).get(GraphSONTokens.VALUEPROP)
+ .get(0)
.get(GraphSONTokens.VALUE).asText());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f046ea64/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
index a3276e2..8795ff1 100644
--- a/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
+++ b/gremlin-python/src/main/jython/gremlin_python/structure/io/graphson.py
@@ -208,20 +208,26 @@ class PropertySerializer(_GraphSONTypeIO):
@classmethod
def dictify(cls, property, writer):
- elementDict = writer.toDict(property.element)
- if elementDict is not None:
- valueDict = elementDict["@value"]
- if "outVLabel" in valueDict:
- del valueDict["outVLabel"]
- if "inVLabel" in valueDict:
- del valueDict["inVLabel"]
- if "properties" in valueDict:
- del valueDict["properties"]
- if "value" in valueDict:
- del valueDict["value"]
- return GraphSONUtil.typedValue("Property", {"key": writer.toDict(property.key),
- "value": writer.toDict(property.value),
- "element": writer.toDict(elementDict)})
+ element = property.element
+ elementDict = {}
+ if element is not None:
+ elementDict["id"] = element.id
+ elementDict["label"] = element.label
+ if isinstance(element, VertexProperty):
+ elementDict["value"] = element.value
+ elementDict["vertex"] = element.vertex.id
+ return GraphSONUtil.typedValue("Property", {"key": writer.toDict(property.key),
+ "value": writer.toDict(property.value),
+ "vertexProperty": writer.toDict(elementDict)})
+ elif isinstance(element, Edge):
+ elementDict["outV"] = element.outV.id
+ elementDict["inV"] = element.inV.id
+ return GraphSONUtil.typedValue("Property", {"key": writer.toDict(property.key),
+ "value": writer.toDict(property.value),
+ "edge": writer.toDict(elementDict)})
+ else:
+ return GraphSONUtil.typedValue("Property", {"key": writer.toDict(property.key),
+ "value": writer.toDict(property.value)})
class TraversalStrategySerializer(_GraphSONTypeIO):
@@ -386,8 +392,22 @@ class PropertyDeserializer(_GraphSONTypeIO):
@classmethod
def objectify(cls, d, reader):
- element = reader.toObject(d["element"]) if "element" in d else None
- return Property(d["key"], reader.toObject(d["value"]), element)
+ if "edge" in d:
+ edge = reader.toObject(d["edge"])
+ return Property(d["key"], reader.toObject(d["value"]),
+ Edge(edge["id"],
+ Vertex(edge["outV"]),
+ edge["label"],
+ Vertex(edge["inV"])))
+ elif "vertexProperty" in d:
+ vertex_property = reader.toObject(d["vertexProperty"])
+ return Property(d["key"], reader.toObject(d["value"]),
+ VertexProperty(vertex_property["id"],
+ vertex_property["label"],
+ vertex_property["value"],
+ Vertex(vertex_property["vertex"])))
+ else:
+ return Property(d["key"], reader.toObject(d["value"]), None)
class PathDeserializer(_GraphSONTypeIO):
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f046ea64/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py b/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
index f01100d..7e034c9 100644
--- a/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
+++ b/gremlin-python/src/main/jython/tests/structure/io/test_graphson.py
@@ -111,7 +111,7 @@ class TestGraphSONReader(TestCase):
assert edge.outV == Vertex("y", "vertex")
##
property = self.graphson_reader.readObject("""
- {"@type":"g:Property", "@value":{"key":"aKey","value":{"@type":"g:Int64","@value":17},"element":{"@type":"g:Edge","@value":{"id":{"@type":"g:Int64","@value":122},"label":"knows","inV":"x","outV":"y","inVLabel":"xLab"}}}}""")
+ {"@type":"g:Property", "@value":{"key":"aKey","value":{"@type":"g:Int64","@value":17},"edge":{"id":{"@type":"g:Int64","@value":122},"label":"knows","inV":"x","outV":"y"}}}""")
# print property
assert isinstance(property, Property)
assert "aKey" == property.key
@@ -208,11 +208,11 @@ class TestGraphSONWriter(TestCase):
self.graphson_writer.writeObject(VertexProperty("blah", "keyA", True, Vertex("stephen"))))
assert {"@type": "g:Property",
- "@value": {"key": "name", "value": "marko", "element": {"@type": "g:VertexProperty",
- "@value": {
- "vertex": "vertexId",
- "id": "anId",
- "label": "aKey"}}}} == json.loads(
+ "@value": {"key": "name", "value": "marko", "vertexProperty": {
+ "vertex": "vertexId",
+ "id": "anId",
+ "label": "aKey",
+ "value": {"@type": "g:Int32", "@value": 21345}}}} == json.loads(
self.graphson_writer.writeObject(
Property("name", "marko", VertexProperty("anId", "aKey", 21345, Vertex("vertexId")))))
[28/50] [abbrv] tinkerpop git commit: optimized math examples
Posted by sp...@apache.org.
optimized math examples
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9cdc47c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9cdc47c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9cdc47c3
Branch: refs/heads/TINKERPOP-1565
Commit: 9cdc47c3876ab3326de096a66228ccd43d8a42ca
Parents: f992cdf
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 17 17:52:45 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 17 17:52:45 2017 +0100
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9cdc47c3/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index e9d13aa..55fa45d 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -169,9 +169,9 @@ _Methods for performing some basic mathematical operations in the "modern" graph
----
g.V().values("age").sum() // sum all ages
g.V().values("age").fold(1, mult) // multiply all ages
-g.V().values("age").map(union(identity(), constant(-1)).sum()) // subtract 1
-g.V().values("age").map(union(identity(), identity()).sum()) // multiply by 2 (simple)
-g.V().values("age").map(union(identity(), constant(2)).fold(1, mult)) // multiply by 2 (generally useful for multiplications by n):
+g.withSack(0).V().values("age").sack(sum).sack(sum).by(constant(-1)).sack() // subtract 1
+g.withSack(0).V().values("age").sack(sum).sack(sum).sack() // multiply by 2 (simple)
+g.withSack(0).V().values("age").sack(sum).sack(mult).by(constant(2)).sack() // multiply by 2 (generally useful for multiplications by n)
----
[[appendix-g]]
@@ -259,4 +259,4 @@ g.V().as("a").
group().
by(select(keys).unfold()).
by(select(values).unfold().unfold().fold()))
-----
\ No newline at end of file
+----
[43/50] [abbrv] tinkerpop git commit: TINKERPOP-1414 Changed Gremlin
Server and TinkerGraph to default GraphSON 2.0
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index 17ffed2..e16bbcc 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -39,8 +39,10 @@ import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONResourceAccess;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.LegacyGraphSONReader;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import org.apache.tinkerpop.gremlin.structure.io.util.CustomId;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
@@ -355,7 +357,7 @@ public class IoTest {
@LoadGraphWith(LoadGraphWith.GraphData.CLASSIC)
public void shouldWriteNormalizedGraphSON() throws Exception {
try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
- final GraphSONMapper mapper = graph.io(graphson).mapper().normalize(true).create();
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V1_0).normalize(true).create();
final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
w.writeGraph(bos, graph);
@@ -369,14 +371,15 @@ public class IoTest {
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldReadWriteModernWrappedInJsonObject() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V1_0).create();
try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- final GraphWriter writer = graph.io(graphson()).writer().wrapAdjacencyList(true).create();
+ final GraphWriter writer = graph.io(graphson()).writer().wrapAdjacencyList(true).mapper(mapper).create();
writer.writeGraph(os, graph);
final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName(), LoadGraphWith.GraphData.MODERN);
graphProvider.clear(configuration);
final Graph g1 = graphProvider.openTestGraph(configuration);
- final GraphReader reader = graph.io(graphson()).reader().unwrapAdjacencyList(true).create();
+ final GraphReader reader = graph.io(graphson()).reader().mapper(mapper).unwrapAdjacencyList(true).create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readGraph(bais, g1);
}
@@ -402,7 +405,7 @@ public class IoTest {
final SimpleModule module = new SimpleModule();
module.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1d0());
final GraphWriter writer = graph.io(graphson).writer().mapper(
- graph.io(graphson).mapper().addCustomModule(module).embedTypes(true).create()).create();
+ graph.io(graphson).mapper().version(GraphSONVersion.V1_0).addCustomModule(module).embedTypes(true).create()).create();
try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
writer.writeGraph(baos, graph);
@@ -421,7 +424,7 @@ public class IoTest {
try (final InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
final GraphReader reader = graph.io(graphson).reader()
- .mapper(graph.io(graphson).mapper().embedTypes(true).addCustomModule(module).create()).create();
+ .mapper(graph.io(graphson).mapper().version(GraphSONVersion.V1_0).embedTypes(true).addCustomModule(module).create()).create();
reader.readGraph(is, g2);
}
@@ -437,6 +440,35 @@ public class IoTest {
@Test
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = FEATURE_STRING_VALUES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ public void shouldReadWriteSelfLoopingEdges() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V1_0).create();
+ final Graph source = graph;
+ final Vertex v1 = source.addVertex();
+ final Vertex v2 = source.addVertex();
+ v1.addEdge("CONTROL", v2);
+ v1.addEdge("SELFLOOP", v1);
+
+ final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null);
+ final Graph target = graphProvider.openTestGraph(targetConf);
+ try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ source.io(IoCore.graphson()).writer().mapper(mapper).create().writeGraph(os, source);
+ try (ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray())) {
+ target.io(IoCore.graphson()).reader().mapper(mapper).create().readGraph(is, target);
+ }
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+
+ assertEquals(IteratorUtils.count(source.vertices()), IteratorUtils.count(target.vertices()));
+ assertEquals(IteratorUtils.count(source.edges()), IteratorUtils.count(target.edges()));
+ }
+ }
+
+ public static final class GraphSONLegacyTest extends AbstractGremlinTest {
+ @Test
+ @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
@@ -450,12 +482,109 @@ public class IoTest {
// the id is lossy in migration because TP2 treated ID as String
assertClassicGraph(graph, false, true);
}
+ }
+
+ public static final class GraphSONV2D0Test extends AbstractGremlinTest {
+ private Io.Builder<GraphSONIo> graphson;
+
+ @Before
+ public void setupBeforeEachTest() {
+ graphson = graphson();
+ }
+
+ /**
+ * Only need to execute this test with TinkerGraph or other graphs that support user supplied identifiers.
+ */
+ @Test
+ @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
+ @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
+ @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_NUMERIC_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = Graph.Features.VertexPropertyFeatures.FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VariableFeatures.class, feature = FEATURE_VARIABLES)
+ @LoadGraphWith(LoadGraphWith.GraphData.CLASSIC)
+ public void shouldWriteNormalizedGraphSON() throws Exception {
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V2_0).typeInfo(TypeInfo.NO_TYPES).normalize(true).create();
+ final GraphSONWriter w = graph.io(graphson).writer().mapper(mapper).create();
+ w.writeGraph(bos, graph);
+
+ final String expected = streamToString(IoTest.class.getResourceAsStream(TestHelper.convertPackageToResourcePath(GraphSONResourceAccess.class) + "tinkerpop-classic-normalized-v2d0.json"));
+ assertEquals(expected.replace("\n", "").replace("\r", ""), bos.toString().replace("\n", "").replace("\r", ""));
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ public void shouldReadWriteModernWrappedInJsonObject() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V2_0).create();
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GraphWriter writer = graph.io(graphson()).writer().wrapAdjacencyList(true).mapper(mapper).create();
+ writer.writeGraph(os, graph);
+
+ final Configuration configuration = graphProvider.newGraphConfiguration("readGraph", this.getClass(), name.getMethodName(), LoadGraphWith.GraphData.MODERN);
+ graphProvider.clear(configuration);
+ final Graph g1 = graphProvider.openTestGraph(configuration);
+ final GraphReader reader = graph.io(graphson()).reader().mapper(mapper).unwrapAdjacencyList(true).create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readGraph(bais, g1);
+ }
+
+ // modern uses double natively so always assert as such
+ IoTest.assertModernGraph(g1, true, true);
+
+ graphProvider.clear(g1, configuration);
+ }
+ }
+
+ /**
+ * This is just a serialization check for JSON.
+ */
+ @Test
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
+ @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ANY_IDS)
+ public void shouldProperlySerializeCustomIdWithGraphSON() throws Exception {
+ final UUID id = UUID.fromString("AF4B5965-B176-4552-B3C1-FBBE2F52C305");
+ graph.addVertex(T.id, new CustomId("vertex", id));
+
+ final SimpleModule module = new CustomId.CustomIdTinkerPopJacksonModule();
+ final GraphWriter writer = graph.io(graphson).writer().mapper(
+ graph.io(graphson).mapper().version(GraphSONVersion.V2_0).addCustomModule(module).create()).create();
+
+ try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ writer.writeGraph(baos, graph);
+
+ // reusing the same config used for creation of "g".
+ final Configuration configuration = graphProvider.newGraphConfiguration("g2", this.getClass(), name.getMethodName(), null);
+ graphProvider.clear(configuration);
+ final Graph g2 = graphProvider.openTestGraph(configuration);
+
+ try (final InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
+ final GraphReader reader = graph.io(graphson).reader()
+ .mapper(graph.io(graphson).mapper().version(GraphSONVersion.V2_0).addCustomModule(module).create()).create();
+ reader.readGraph(is, g2);
+ }
+
+ final Vertex v2 = g2.vertices().next();
+ final CustomId customId = (CustomId) v2.id();
+ assertEquals(id, customId.getElementId());
+ assertEquals("vertex", customId.getCluster());
+
+ // need to manually close the "g2" instance
+ graphProvider.clear(g2, configuration);
+ }
+ }
@Test
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = FEATURE_STRING_VALUES)
@FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
public void shouldReadWriteSelfLoopingEdges() throws Exception {
+ final GraphSONMapper mapper = graph.io(graphson).mapper().version(GraphSONVersion.V2_0).create();
final Graph source = graph;
final Vertex v1 = source.addVertex();
final Vertex v2 = source.addVertex();
@@ -465,9 +594,9 @@ public class IoTest {
final Configuration targetConf = graphProvider.newGraphConfiguration("target", this.getClass(), name.getMethodName(), null);
final Graph target = graphProvider.openTestGraph(targetConf);
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- source.io(IoCore.graphson()).writer().create().writeGraph(os, source);
+ source.io(IoCore.graphson()).writer().mapper(mapper).create().writeGraph(os, source);
try (ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray())) {
- target.io(IoCore.graphson()).reader().create().readGraph(is, target);
+ target.io(IoCore.graphson()).reader().mapper(mapper).create().readGraph(is, target);
}
} catch (IOException ioe) {
throw new RuntimeException(ioe);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index b40515e..e47229b 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -230,7 +230,7 @@ public final class TinkerGraph implements Graph {
@Override
public <I extends Io> I io(final Io.Builder<I> builder) {
- return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV1d0.instance())).create();
+ return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV2d0.instance())).create();
}
@Override
[03/50] [abbrv] tinkerpop git commit: Move appendix to its own doc
and out of index.
Posted by sp...@apache.org.
Move appendix to its own doc and out of index.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3e54d897
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3e54d897
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3e54d897
Branch: refs/heads/TINKERPOP-1565
Commit: 3e54d897e70f26fdefbe30daf5ce19a38a052e4d
Parents: 7783c83
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 08:52:58 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 08:52:58 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 112 ++++++++++++++++++++++++++++++++
docs/src/recipes/index.asciidoc | 97 +--------------------------
2 files changed, 113 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e54d897/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
new file mode 100644
index 0000000..63ec447
--- /dev/null
+++ b/docs/src/recipes/appendix.asciidoc
@@ -0,0 +1,112 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+Appendix
+========
+
+Many of the recipes are based on questions and answers provided on the gremlin-users mailing list. This section
+contains a number of traversals from the mailing list that do not easily fit any particular pattern (i.e. a recipe),
+but are nonetheless interesting and thus remain good tools for learning Gremlin.
+
+[[appendix-a]]
+_For each person in a "follows" graph, determine the number of followers and list their names._
+
+[gremlin-groovy]
+----
+g.addV('name','marko').as('marko').
+ addV('name','josh').as('josh').
+ addV('name','daniel').as('daniel').
+ addV('name','matthias').as('matthias').
+ addE('follows').from('josh').to('marko').
+ addE('follows').from('matthias').to('josh').
+ addE('follows').from('daniel').to('josh').
+ addE('follows').from('daniel').to('marko').iterate()
+g.V().as('p').
+ map(__.in('follows').values('name').fold()).
+ group().by(select('p').by('name')).
+ by(project('numFollowers','followers').
+ by(count(local)).by()).next()
+----
+
+[[appendix-b]]
+_In the "modern" graph, show each person, the software they worked on and the co-worker count for the software and
+the names of those co-workers._
+
+[gremlin-groovy,modern]
+----
+g.V().hasLabel("person").as("p").
+ out("created").as("s").
+ map(__.in("created").
+ where(neq("p")).values("name").fold()).
+ group().by(select("p").by("name")).
+ by(group().by(select("s").by("name")).
+ by(project("numCoworkers","coworkers").
+ by(count(local)).by())).next()
+----
+
+[[appendix-c]]
+_Assuming a graph of students, classes and times, detect students who have a conflicting schedule._
+
+[gremlin-groovy]
+----
+g.addV(label, "student", "name", "Pete").as("s1").
+ addV(label, "student", "name", "Joe").as("s2").
+ addV(label, "class", "name", "Java's GC").as("c1").
+ addV(label, "class", "name", "FP Principles").as("c2").
+ addV(label, "class", "name", "Memory Management in C").as("c3").
+ addV(label, "class", "name", "Memory Management in C++").as("c4").
+ addV(label, "timeslot", "date", "11/25/2016", "fromTime", "10:00", "toTime", "11:00").as("t1").
+ addV(label, "timeslot", "date", "11/25/2016", "fromTime", "11:00", "toTime", "12:00").as("t2").
+ addE("attends").from("s1").to("c1").
+ addE("attends").from("s1").to("c2").
+ addE("attends").from("s1").to("c3").
+ addE("attends").from("s1").to("c4").
+ addE("attends").from("s2").to("c2").
+ addE("attends").from("s2").to("c3").
+ addE("allocated").from("c1").to("t1").
+ addE("allocated").from("c1").to("t2").
+ addE("allocated").from("c2").to("t1").
+ addE("allocated").from("c3").to("t2").
+ addE("allocated").from("c4").to("t2").iterate()
+g.V().hasLabel("student").as("s").
+ out("attends").as("c").
+ out("allocated").as("t").
+ select("s").
+ out("attends").
+ where(neq("c")).
+ out("allocated").
+ where(eq("t")).
+ group().
+ by(select("s").by("name")).
+ by(group().by(select("t").by(valueMap("fromTime","toTime"))).
+ by(select("c").dedup().values("name").fold())).next()
+----
+
+[[appendix-d]]
+_In the "modern" graph, with a duplicate edge added, find the vertex pairs that have more than one edge between them._
+
+[gremlin-groovy,modern]
+----
+g.V(1).as("a").V(3).addE("created").property("weight",0.4d).from("a").iterate()
+g.V(1).outE("created")
+g.V().as("a").
+ out().as("b").
+ groupCount().
+ by(select("a","b")).
+ unfold().
+ filter(select(values).is(gt(1))).
+ select(keys)
+----
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3e54d897/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index 9c42f0f..f77b929 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -135,99 +135,4 @@ GitHub and JIRA are linked. As mentioned earlier in this section, the recipe wi
committers prior to merging. This process may take several days to complete. We look forward to receiving your
submissions!
-Appendix
-========
-
-Many of the recipes are based on questions and answers provided on the gremlin-users mailing list. This section
-contains a number of traversals from the mailing list that do not easily fit any particular pattern (i.e. a recipe),
-but are nonetheless interesting and thus remain good tools for learning Gremlin.
-
-[[appendix-a]]
-_For each person in a "follows" graph, determine the number of followers and list their names._
-
-[gremlin-groovy]
-----
-g.addV('name','marko').as('marko').
- addV('name','josh').as('josh').
- addV('name','daniel').as('daniel').
- addV('name','matthias').as('matthias').
- addE('follows').from('josh').to('marko').
- addE('follows').from('matthias').to('josh').
- addE('follows').from('daniel').to('josh').
- addE('follows').from('daniel').to('marko').iterate()
-g.V().as('p').
- map(__.in('follows').values('name').fold()).
- group().by(select('p').by('name')).
- by(project('numFollowers','followers').
- by(count(local)).by()).next()
-----
-
-[[appendix-b]]
-_In the "modern" graph, show each person, the software they worked on and the co-worker count for the software and
-the names of those co-workers._
-
-[gremlin-groovy,modern]
-----
-g.V().hasLabel("person").as("p").
- out("created").as("s").
- map(__.in("created").
- where(neq("p")).values("name").fold()).
- group().by(select("p").by("name")).
- by(group().by(select("s").by("name")).
- by(project("numCoworkers","coworkers").
- by(count(local)).by())).next()
-----
-
-[[appendix-c]]
-_Assuming a graph of students, classes and times, detect students who have a conflicting schedule._
-
-[gremlin-groovy]
-----
-g.addV(label, "student", "name", "Pete").as("s1").
- addV(label, "student", "name", "Joe").as("s2").
- addV(label, "class", "name", "Java's GC").as("c1").
- addV(label, "class", "name", "FP Principles").as("c2").
- addV(label, "class", "name", "Memory Management in C").as("c3").
- addV(label, "class", "name", "Memory Management in C++").as("c4").
- addV(label, "timeslot", "date", "11/25/2016", "fromTime", "10:00", "toTime", "11:00").as("t1").
- addV(label, "timeslot", "date", "11/25/2016", "fromTime", "11:00", "toTime", "12:00").as("t2").
- addE("attends").from("s1").to("c1").
- addE("attends").from("s1").to("c2").
- addE("attends").from("s1").to("c3").
- addE("attends").from("s1").to("c4").
- addE("attends").from("s2").to("c2").
- addE("attends").from("s2").to("c3").
- addE("allocated").from("c1").to("t1").
- addE("allocated").from("c1").to("t2").
- addE("allocated").from("c2").to("t1").
- addE("allocated").from("c3").to("t2").
- addE("allocated").from("c4").to("t2").iterate()
-g.V().hasLabel("student").as("s").
- out("attends").as("c").
- out("allocated").as("t").
- select("s").
- out("attends").
- where(neq("c")).
- out("allocated").
- where(eq("t")).
- group().
- by(select("s").by("name")).
- by(group().by(select("t").by(valueMap("fromTime","toTime"))).
- by(select("c").dedup().values("name").fold())).next()
-----
-
-[[appendix-d]]
-_In the "modern" graph, with a duplicate edge added, find the vertex pairs that have more than one edge between them._
-
-[gremlin-groovy,modern]
-----
-g.V(1).as("a").V(3).addE("created").property("weight",0.4d).from("a").iterate()
-g.V(1).outE("created")
-g.V().as("a").
- out().as("b").
- groupCount().
- by(select("a","b")).
- unfold().
- filter(select(values).is(gt(1))).
- select(keys)
-----
\ No newline at end of file
+include::appendix.asciidoc[]
\ No newline at end of file
[37/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
docs/src/dev/io/graphson.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02f24b9e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02f24b9e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02f24b9e
Branch: refs/heads/TINKERPOP-1565
Commit: 02f24b9e572ad5c50259aba91efd442a451b65b7
Parents: 77a48f3 e80a4cd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 18 07:58:18 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 07:58:18 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/dev/io/graphson.asciidoc | 5 ++---
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 16 ++++++++++++++++
.../apache/tinkerpop/gremlin/driver/Handler.java | 15 +++++++++++++--
.../server/handler/SaslAuthenticationHandler.java | 14 ++++++++++++--
5 files changed, 44 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02f24b9e/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02f24b9e/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02f24b9e/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
[15/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0d2a277
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0d2a277
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0d2a277
Branch: refs/heads/TINKERPOP-1565
Commit: b0d2a277a6724c661393e326e027fe9ecd94691a
Parents: b0be1d4 c66424d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jan 13 12:32:15 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jan 13 12:32:15 2017 +0100
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0d2a277/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
[49/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Enabled more
GraphSON IO tests
Posted by sp...@apache.org.
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/64047c81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/64047c81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/64047c81
Branch: refs/heads/TINKERPOP-1565
Commit: 64047c81312b9950839f8c5d58ade0240c3d3f5e
Parents: 11fd6b8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 15:11:19 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:11:33 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/64047c81/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 605414e..6ce19f5 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());
[41/50] [abbrv] tinkerpop git commit: minor nothing tweak.
Posted by sp...@apache.org.
minor nothing tweak.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/612bcb36
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/612bcb36
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/612bcb36
Branch: refs/heads/TINKERPOP-1565
Commit: 612bcb3658a6d12f6d4b4acb6014693efc3ce0e7
Parents: f046ea6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Nov 30 07:55:45 2016 -0700
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:10:33 2017 -0500
----------------------------------------------------------------------
.../structure/util/reference/ReferenceVertexProperty.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/612bcb36/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
index 93b4c48..472a63b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceVertexProperty.java
@@ -34,7 +34,7 @@ import java.util.NoSuchElementException;
public class ReferenceVertexProperty<V> extends ReferenceElement<VertexProperty<V>> implements VertexProperty<V> {
private ReferenceVertex vertex;
- private String key;
+ private String label;
private V value;
private ReferenceVertexProperty() {
@@ -43,8 +43,8 @@ public class ReferenceVertexProperty<V> extends ReferenceElement<VertexProperty<
public ReferenceVertexProperty(final VertexProperty<V> vertexProperty) {
super(vertexProperty);
- this.vertex = ReferenceFactory.detach(vertexProperty.element());
- this.key = vertexProperty.key();
+ this.vertex = new ReferenceVertex(vertexProperty.element());
+ this.label = vertexProperty.key();
this.value = vertexProperty.value();
}
@@ -55,12 +55,12 @@ public class ReferenceVertexProperty<V> extends ReferenceElement<VertexProperty<
@Override
public String key() {
- return this.key;
+ return this.label;
}
@Override
public String label() {
- return this.key;
+ return this.label;
}
@Override
[20/50] [abbrv] tinkerpop git commit: Minor fix to grammer in
changelog CTR
Posted by sp...@apache.org.
Minor fix to grammer in changelog CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9d1c3e5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9d1c3e5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9d1c3e5e
Branch: refs/heads/TINKERPOP-1565
Commit: 9d1c3e5e1aa87803896e7f4fd520194f44bd3614
Parents: 5c8e124
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 09:55:08 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 09:55:08 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d1c3e5e/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c5e4471..0a2affe 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Make error messaging more consistent during result iteration timeouts in Gremlin Server.
+* Made error messaging more consistent during result iteration timeouts in Gremlin Server.
* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
* Fixed a bug in `AddVertexStartStep` where if a side-effect was being used in the parametrization, an NPE occurred.
* Fixed a bug in `LazyBarrierStrategy` where `profile()` was deactivating it accidentally.
[34/50] [abbrv] tinkerpop git commit: Consistent naming for
TinkerIoRegistry
Posted by sp...@apache.org.
Consistent naming for TinkerIoRegistry
Now that there are multiple versions of GraphSON/Gryo the naming of registries should reflect the version number. This is a non-breaking change. The old TinkerIoRegistry is just deprecated. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/802ff9f6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/802ff9f6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/802ff9f6
Branch: refs/heads/TINKERPOP-1565
Commit: 802ff9f69b48b4aa56a85c586ed3c58844a89c9f
Parents: 3bb177f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 19:04:03 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 19:04:03 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
gremlin-console/conf/remote-objects.yaml | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 2 +-
.../tinkergraph/structure/TinkerIoRegistry.java | 2 +
.../structure/TinkerIoRegistryV1d0.java | 263 +++++++++++++++++++
.../structure/TinkerIoRegistryV2d0.java | 5 +-
.../TinkerGraphGryoSerializerTest.java | 1 -
.../TinkerGraphGryoSerializerV1d0Test.java | 83 ++++++
.../TinkerGraphGryoSerializerV2d0Test.java | 80 ++++++
.../tinkergraph/structure/TinkerGraphTest.java | 30 ++-
10 files changed, 463 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 42088dd..9471b9f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.4 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Deprecated `TinkerIoRegistry` replacing it with the more consistently named `TinkerIoRegistryV1d0`.
* Made error messaging more consistent during result iteration timeouts in Gremlin Server.
* `PathRetractionStrategy` does not add a `NoOpBarrierStep` to the end of local children as its wasted computation in 99% of traversals.
* Fixed a bug in `AddVertexStartStep` where if a side-effect was being used in the parametrization, an NPE occurred.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/gremlin-console/conf/remote-objects.yaml
----------------------------------------------------------------------
diff --git a/gremlin-console/conf/remote-objects.yaml b/gremlin-console/conf/remote-objects.yaml
index f507f4e..d1909fc 100644
--- a/gremlin-console/conf/remote-objects.yaml
+++ b/gremlin-console/conf/remote-objects.yaml
@@ -38,4 +38,4 @@
hosts: [localhost]
port: 8182
serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0,
- config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }}
\ No newline at end of file
+ config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index 48f4d3d..fa8c62b 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -233,7 +233,7 @@ public final class TinkerGraph implements Graph {
@Override
public <I extends Io> I io(final Io.Builder<I> builder) {
- return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistry.instance())).create();
+ return (I) builder.graph(this).onMapper(mapper -> mapper.addRegistry(TinkerIoRegistryV1d0.instance())).create();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
index 66bdba1..40720e5 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
@@ -70,7 +70,9 @@ import java.util.Map;
* custom data class like a "geographic point".
*
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.4, replaced by {@link TinkerIoRegistryV1d0}.
*/
+@Deprecated
public final class TinkerIoRegistry extends AbstractIoRegistry {
private static final TinkerIoRegistry INSTANCE = new TinkerIoRegistry();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java
new file mode 100644
index 0000000..277bedc
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV1d0.java
@@ -0,0 +1,263 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.javatuples.Pair;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized. This registry allows a {@link TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion. This is a bit of a special case for TinkerGraph given its
+ * in-memory status. Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV1d0 extends AbstractIoRegistry {
+
+ private static final TinkerIoRegistryV1d0 INSTANCE = new TinkerIoRegistryV1d0();
+
+ private TinkerIoRegistryV1d0() {
+ register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+ register(GraphSONIo.class, null, new TinkerModule());
+ }
+
+ public static TinkerIoRegistryV1d0 instance() {
+ return INSTANCE;
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link TinkerGraph} into itself for Gryo. This is useful when
+ * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+ */
+ final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+ @Override
+ public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+ final byte[] bytes = stream.toByteArray();
+ output.writeInt(bytes.length);
+ output.write(bytes);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+ }
+
+ @Override
+ public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+ final TinkerGraph graph = TinkerGraph.open(conf);
+ final int len = input.readInt();
+ final byte[] bytes = input.readBytes(len);
+ try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+ GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+
+ return graph;
+ }
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link TinkerGraph} into itself for GraphSON. This is useful when
+ * shipping small graphs around through Gremlin Server.
+ */
+ final static class TinkerModule extends SimpleModule {
+ public TinkerModule() {
+ super("tinkergraph-1.0");
+ addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+ addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+ }
+ }
+
+ /**
+ * Serializes the graph into an edge list format. Edge list is a better choices than adjacency list (which is
+ * typically standard from the {@link GraphReader} and {@link GraphWriter} perspective) in this case because
+ * the use case for this isn't around massive graphs. The use case is for "small" subgraphs that are being
+ * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+ * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+ * list).
+ */
+ final static class TinkerGraphJacksonSerializer extends StdSerializer<TinkerGraph> {
+
+ public TinkerGraphJacksonSerializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+
+ jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Vertex> vertices = graph.vertices();
+ while (vertices.hasNext()) {
+ serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+ }
+
+ jsonGenerator.writeEndArray();
+
+ jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Edge> edges = graph.edges();
+ while (edges.hasNext()) {
+ serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+ }
+
+ jsonGenerator.writeEndArray();
+
+ jsonGenerator.writeEndObject();
+ }
+
+ @Override
+ public void serializeWithType(final TinkerGraph graph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeStringField(GraphSONTokens.CLASS, TinkerGraph.class.getName());
+
+ jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+ jsonGenerator.writeStartArray();
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Vertex> vertices = graph.vertices();
+ while (vertices.hasNext()) {
+ GraphSONUtil.writeWithType(vertices.next(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ jsonGenerator.writeEndArray();
+ jsonGenerator.writeEndArray();
+
+ jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+ jsonGenerator.writeStartArray();
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+
+ final Iterator<Edge> edges = graph.edges();
+ while (edges.hasNext()) {
+ GraphSONUtil.writeWithType(edges.next(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ jsonGenerator.writeEndArray();
+ jsonGenerator.writeEndArray();
+
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ /**
+ * Deserializes the edge list format.
+ */
+ static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+ public TinkerGraphJacksonDeserializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public TinkerGraph deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+ final TinkerGraph graph = TinkerGraph.open(conf);
+
+ final List<Map<String, Object>> edges;
+ final List<Map<String, Object>> vertices;
+ if (!jsonParser.getCurrentToken().isStructStart()) {
+ if (!jsonParser.getCurrentName().equals(GraphSONTokens.VERTICES))
+ throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.VERTICES));
+
+ jsonParser.nextToken();
+ vertices = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
+ jsonParser.nextToken();
+
+ if (!jsonParser.getCurrentName().equals(GraphSONTokens.EDGES))
+ throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.EDGES));
+
+ jsonParser.nextToken();
+ edges = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, ArrayList.class);
+ } else {
+ final Map<String, Object> graphData = deserializationContext.readValue(jsonParser, HashMap.class);
+ vertices = (List<Map<String,Object>>) graphData.get(GraphSONTokens.VERTICES);
+ edges = (List<Map<String,Object>>) graphData.get(GraphSONTokens.EDGES);
+ }
+
+ for (Map<String, Object> vertexData : vertices) {
+ final DetachedVertex detached = new DetachedVertex(vertexData.get(GraphSONTokens.ID),
+ vertexData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) vertexData.get(GraphSONTokens.PROPERTIES));
+ detached.attach(Attachable.Method.getOrCreate(graph));
+ }
+
+ for (Map<String, Object> edgeData : edges) {
+ final DetachedEdge detached = new DetachedEdge(edgeData.get(GraphSONTokens.ID),
+ edgeData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) edgeData.get(GraphSONTokens.PROPERTIES),
+ Pair.with(edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString()),
+ Pair.with(edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString()));
+ detached.attach(Attachable.Method.getOrCreate(graph));
+ }
+
+ return graph;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
index 32446a5..727931c 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
@@ -23,6 +23,7 @@ import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
@@ -56,8 +57,8 @@ import java.util.List;
import java.util.Map;
/**
- * An implementation of the {@link org.apache.tinkerpop.gremlin.structure.io.IoRegistry} interface that provides serializers with custom configurations for
- * implementation specific classes that might need to be serialized. This registry allows a {@link org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph} to
+ * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized. This registry allows a {@link TinkerGraph} to
* be serialized directly which is useful for moving small graphs around on the network.
* <p/>
* Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerTest.java
index 3decd5f..703d127 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerTest.java
@@ -57,7 +57,6 @@ public class TinkerGraphGryoSerializerTest {
@Before
public void setUp() throws Exception {
-
when(kryo.getRegistration((Class) any())).thenReturn(registration);
when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java
new file mode 100644
index 0000000..2233d53
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV1d0Test.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link TinkerIoRegistry.TinkerGraphGryoSerializer}
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TinkerGraphGryoSerializerV1d0Test {
+
+ @Mock
+ private Kryo kryo;
+ @Mock
+ private Registration registration;
+ @Mock
+ private Output output;
+ @Mock
+ private Input input;
+
+ private TinkerGraph graph = TinkerGraph.open();
+ private TinkerIoRegistryV1d0.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV1d0.TinkerGraphGryoSerializer();
+
+ @Before
+ public void setUp() throws Exception {
+ when(kryo.getRegistration((Class) any())).thenReturn(registration);
+ when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
+ }
+
+ @Test
+ public void shouldVerifyKryoUsedForWrite() throws Exception {
+ serializer.write(kryo, output, graph);
+ verify(kryo, atLeastOnce()).getRegistration((Class) any());
+ }
+
+ @Test
+ public void shouldVerifyKryoUsedForRead() throws Exception {
+ // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
+ try {
+ serializer.read(kryo, input, TinkerGraph.class);
+ } catch (RuntimeException ex) {
+ verify(kryo, atLeastOnce()).readObject(any(), any());
+ verify(kryo, atLeastOnce()).readClassAndObject(any());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java
new file mode 100644
index 0000000..7d2a5e3
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGryoSerializerV2d0Test.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Registration;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Unit tests for {@link TinkerIoRegistry.TinkerGraphGryoSerializer}
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TinkerGraphGryoSerializerV2d0Test {
+
+ @Mock
+ private Kryo kryo;
+ @Mock
+ private Registration registration;
+ @Mock
+ private Output output;
+ @Mock
+ private Input input;
+
+ private TinkerGraph graph = TinkerGraph.open();
+ private TinkerIoRegistryV2d0.TinkerGraphGryoSerializer serializer = new TinkerIoRegistryV2d0.TinkerGraphGryoSerializer();
+
+ @Before
+ public void setUp() throws Exception {
+ when(kryo.getRegistration((Class) any())).thenReturn(registration);
+ when(input.readBytes(anyInt())).thenReturn(Arrays.copyOf(GryoMapper.HEADER, 100));
+ }
+
+ @Test
+ public void shouldVerifyKryoUsedForWrite() throws Exception {
+ serializer.write(kryo, output, graph);
+ verify(kryo, atLeastOnce()).getRegistration((Class) any());
+ }
+
+ @Test
+ public void shouldVerifyKryoUsedForRead() throws Exception {
+ // Not possible to mock an entire deserialization so just verify the same kryo instances are being used
+ try {
+ serializer.read(kryo, input, TinkerGraph.class);
+ } catch (RuntimeException ex) {
+ verify(kryo, atLeastOnce()).readObject(any(), any());
+ verify(kryo, atLeastOnce()).readClassAndObject(any());
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/802ff9f6/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 9de9a70..a85b0ee 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -546,7 +546,35 @@ public class TinkerGraphTest {
final ArrayList<Color> colorList = new ArrayList<>(Arrays.asList(Color.RED, Color.GREEN));
final Supplier<ClassResolver> classResolver = new CustomClassResolverSupplier();
- final GryoMapper mapper = GryoMapper.build().addRegistry(TinkerIoRegistry.instance()).classResolver(classResolver).create();
+ final GryoMapper mapper = GryoMapper.build().addRegistry(TinkerIoRegistryV1d0.instance()).classResolver(classResolver).create();
+ final Kryo kryo = mapper.createMapper();
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ final Output out = new Output(stream);
+
+ kryo.writeObject(out, colorList);
+ out.flush();
+ final byte[] b = stream.toByteArray();
+
+ try (final InputStream inputStream = new ByteArrayInputStream(b)) {
+ final Input input = new Input(inputStream);
+ final List m = kryo.readObject(input, ArrayList.class);
+ final TinkerGraph readX = (TinkerGraph) m.get(0);
+ assertEquals(104, IteratorUtils.count(readX.vertices()));
+ assertEquals(102, IteratorUtils.count(readX.edges()));
+ }
+ }
+ }
+
+ @Test
+ public void shouldSerializeWithColorClassResolverToTinkerGraphUsingDeprecatedTinkerIoRegistry() throws Exception {
+ final Map<String,Color> colors = new HashMap<>();
+ colors.put("red", Color.RED);
+ colors.put("green", Color.GREEN);
+
+ final ArrayList<Color> colorList = new ArrayList<>(Arrays.asList(Color.RED, Color.GREEN));
+
+ final Supplier<ClassResolver> classResolver = new CustomClassResolverSupplier();
+ final GryoMapper mapper = GryoMapper.build().addRegistry(TinkerIoRegistryV1d0.instance()).classResolver(classResolver).create();
final Kryo kryo = mapper.createMapper();
try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
final Output out = new Output(stream);
[42/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 Updated the IO
dev docs with GraphSON 3.0.
Posted by sp...@apache.org.
TINKERPOP-1565 Updated the IO dev docs with 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/374d080d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/374d080d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/374d080d
Branch: refs/heads/TINKERPOP-1565
Commit: 374d080d5428edd5c6b95d2d05eb313faed698f2
Parents: 64047c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 12 15:12:45 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:11:33 2017 -0500
----------------------------------------------------------------------
docs/src/dev/io/graphson.asciidoc | 2367 ++++++++++++++++++++++++++++++++
1 file changed, 2367 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/374d080d/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index fafb4f9..9ae9ef7 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -3848,4 +3848,2371 @@ The following example is a `ZoneOffset` of three hours, six minutes, and nine se
"@type" : "gx:ZoneOffset",
"@value" : "+03:06:09"
}
+----
+
+[[graphson-3d0]]
+Version 3.0
+-----------
+
+Version 3.0 of GraphSON was first introduced on TinkerPop 3.3.0. It is quite similar to GraphSON 2.0 in many ways in
+terms of features, but it does not have an "untyped" version as previous version of GraphSON had.
+
+Core
+~~~~
+
+Class
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Class",
+ "@value" : "java.io.File"
+}
+----
+
+Date
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Date",
+ "@value" : 1481750076295
+}
+----
+
+Double
+^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Double",
+ "@value" : 100.0
+}
+----
+
+Float
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Float",
+ "@value" : 100.0
+}
+----
+
+Integer
+^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Int32",
+ "@value" : 100
+}
+----
+
+Long
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Int64",
+ "@value" : 100
+}
+----
+
+Timestamp
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Timestamp",
+ "@value" : 1481750076295
+}
+----
+
+UUID
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+}
+----
+
+
+Graph Structure
+~~~~~~~~~~~~~~~
+
+Edge
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+}
+----
+
+Path
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Path",
+ "@value" : {
+ "labels" : [ [ ], [ ], [ ] ],
+ "objects" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ } ]
+ }
+}
+----
+
+Property
+^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Property",
+ "@value" : {
+ "key" : "since",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ },
+ "edge" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
+----
+
+StarGraph
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "starVertex" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }
+}
+----
+
+TinkerGraph
+^^^^^^^^^^^
+
+`TinkerGraph` has a custom serializer that is registered as part of the `TinkerIoRegistry`.
+
+[source,json]
+----
+{
+ "@type" : "tinker:graph",
+ "@value" : {
+ "vertices" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : "stephen"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 10
+ },
+ "value" : "centreville",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1990
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 11
+ },
+ "value" : "dulles",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2000
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 12
+ },
+ "value" : "purcellville",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2006
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 2
+ },
+ "value" : "matthias"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "value" : "bremen",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 14
+ },
+ "value" : "baltimore",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2007
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 15
+ },
+ "value" : "oakland",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 16
+ },
+ "value" : "seattle",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2014
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 3
+ },
+ "value" : "daniel"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 17
+ },
+ "value" : "spremberg",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1982
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 18
+ },
+ "value" : "kaiserslautern",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 19
+ },
+ "value" : "aachen",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ }, {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ } ],
+ "edges" : [ {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 13
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2009
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 14
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 15
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 16
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 17
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2010
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 18
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2011
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 19
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 20
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 7
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 4
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 21
+ },
+ "label" : "develops",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "since" : {
+ "@type" : "g:Int32",
+ "@value" : 2012
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 22
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 23
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 8
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 24
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 5
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 25
+ },
+ "label" : "uses",
+ "inVLabel" : "software",
+ "outVLabel" : "person",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 9
+ },
+ "properties" : {
+ "skill" : {
+ "@type" : "g:Int32",
+ "@value" : 3
+ }
+ }
+ }
+ }, {
+ "@type" : "g:Edge",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 26
+ },
+ "label" : "traverses",
+ "inVLabel" : "software",
+ "outVLabel" : "software",
+ "inV" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "outV" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
+----
+
+Tree
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "value" : "gremlin"
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ {
+ "key" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 11
+ },
+ "label" : "software",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 5
+ },
+ "value" : "tinkergraph"
+ } ]
+ }
+ }
+ },
+ "value" : {
+ "@type" : "g:Tree",
+ "@value" : [ ]
+ }
+ } ]
+ }
+ } ]
+ }
+ } ]
+}
+----
+
+Vertex
+^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+}
+----
+
+VertexProperty
+^^^^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:VertexProperty",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko",
+ "vertex" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "name"
+ }
+}
+----
+
+
+Graph Process
+~~~~~~~~~~~~~
+
+Barrier
+^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Barrier",
+ "@value" : "normSack"
+}
+----
+
+Binding
+^^^^^^^
+
+A "Binding" refers to a `Bytecode.Binding`.
+
+[source,json]
+----
+{
+ "@type" : "g:Binding",
+ "@value" : {
+ "key" : "x",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+}
+----
+
+Bytecode
+^^^^^^^^
+
+The following `Bytecode` example represents the traversal of `g.V().hasLabel('person').out().in().tree()`. Obviously the serialized `Bytecode` woudl be quite different for the endless variations of commands that could be used together in the Gremlin language.
+
+[source,json]
+----
+{
+ "@type" : "g:Bytecode",
+ "@value" : {
+ "step" : [ [ "V" ], [ "hasLabel", "person" ], [ "out" ], [ "in" ], [ "tree" ] ]
+ }
+}
+----
+
+Cardinality
+^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Cardinality",
+ "@value" : "list"
+}
+----
+
+Column
+^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Column",
+ "@value" : "keys"
+}
+----
+
+Direction
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Direction",
+ "@value" : "OUT"
+}
+----
+
+Operator
+^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Operator",
+ "@value" : "sum"
+}
+----
+
+Order
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Order",
+ "@value" : "incr"
+}
+----
+
+Pick
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Pick",
+ "@value" : "any"
+}
+----
+
+Pop
+^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Pop",
+ "@value" : "all"
+}
+----
+
+Lambda
+^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Lambda",
+ "@value" : {
+ "script" : "{ it.get() }",
+ "language" : "gremlin-groovy",
+ "arguments" : 1
+ }
+}
+----
+
+Metrics
+^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "7.0.0()",
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ } ]
+ }
+}
+----
+
+P
+^
+
+[source,json]
+----
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+}
+----
+
+P and
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "and",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "lt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 10
+ }
+ }
+ } ]
+ }
+}
+----
+
+P or
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "or",
+ "value" : [ {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "gt",
+ "value" : {
+ "@type" : "g:Int32",
+ "@value" : 0
+ }
+ }
+ }, {
+ "@type" : "g:P",
+ "@value" : {
+ "predicate" : "within",
+ "value" : [ {
+ "@type" : "g:Int32",
+ "@value" : -1
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -10
+ }, {
+ "@type" : "g:Int32",
+ "@value" : -100
+ } ]
+ }
+ } ]
+ }
+}
+----
+
+Scope
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Scope",
+ "@value" : "local"
+}
+----
+
+T
+^
+
+[source,json]
+----
+{
+ "@type" : "g:T",
+ "@value" : "label"
+}
+----
+
+TraversalMetrics
+^^^^^^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:TraversalMetrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 0.004
+ },
+ "metrics" : [ {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 4
+ }
+ },
+ "name" : "TinkerGraphStep(vertex,[~label.eq(person)])",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "7.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 13
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "2.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ }
+ },
+ "name" : "VertexStep(OUT,vertex)",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "3.0.0()"
+ }
+ }, {
+ "@type" : "g:Metrics",
+ "@value" : {
+ "dur" : {
+ "@type" : "g:Double",
+ "@value" : 100.0
+ },
+ "counts" : {
+ "traverserCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "elementCount" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ }
+ },
+ "name" : "TreeStep",
+ "annotations" : {
+ "percentDur" : {
+ "@type" : "g:Double",
+ "@value" : 25.0
+ }
+ },
+ "id" : "4.0.0()"
+ }
+ } ]
+ }
+}
+----
+
+Traverser
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "g:Traverser",
+ "@value" : {
+ "bulk" : {
+ "@type" : "g:Int64",
+ "@value" : 1
+ },
+ "value" : {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ }
+ }
+}
+----
+
+
+RequestMessage
+~~~~~~~~~~~~~~
+
+Authentication Response
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The following `RequestMessage` is an example of the response that should be made to a SASL-based authentication challenge.
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "authentication",
+ "processor" : "",
+ "args" : {
+ "saslMechanism" : "PLAIN",
+ "sasl" : "AHN0ZXBocGhlbgBwYXNzd29yZA=="
+ }
+}
+----
+
+Session Eval
+^^^^^^^^^^^^
+
+The following `RequestMessage` is an example of a simple session request for a script evaluation with parameters.
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "g.V(x)",
+ "language" : "gremlin-groovy",
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
+----
+
+Session Eval Aliased
+^^^^^^^^^^^^^^^^^^^^
+
+The following `RequestMessage` is an example of a session request for a script evaluation with an alias that binds the `TraversalSource` of "g" to "social".
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "session",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
+----
+
+Session Close
+^^^^^^^^^^^^^
+
+The following `RequestMessage` is an example of a request to close a session.
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "close",
+ "processor" : "session",
+ "args" : {
+ "session" : {
+ "@type" : "g:UUID",
+ "@value" : "41d2e28a-20a4-4ab0-b379-d810dede3786"
+ }
+ }
+}
+----
+
+Sessionless Eval
+^^^^^^^^^^^^^^^^
+
+The following `RequestMessage` is an example of a simple sessionless request for a script evaluation with parameters.
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "g.V(x)",
+ "language" : "gremlin-groovy",
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
+----
+
+Sessionless Eval Aliased
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+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".
+
+[source,json]
+----
+{
+ "requestId" : "cb682578-9d92-4499-9ebc-5c6aa73c5397",
+ "op" : "eval",
+ "processor" : "",
+ "args" : {
+ "gremlin" : "social.V(x)",
+ "language" : "gremlin-groovy",
+ "aliases" : {
+ "g" : "social"
+ },
+ "bindings" : {
+ "x" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ }
+ }
+ }
+}
+----
+
+
+ResponseMessage
+~~~~~~~~~~~~~~~
+
+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 depending on the SASL implementation (e.g. multiple challenges maybe requested in some cases, but no in the default provided by Gremlin Server).
+
+[source,json]
+----
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 407,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : null,
+ "meta" : { }
+ }
+}
+----
+
+Standard Result
+^^^^^^^^^^^^^^^
+
+The following `ResponseMessage` is a typical example of the typical successful response Gremlin Server will return when returning results from a script.
+
+[source,json]
+----
+{
+ "requestId" : "41d2e28a-20a4-4ab0-b379-d810dede3786",
+ "status" : {
+ "message" : "",
+ "code" : 200,
+ "attributes" : { }
+ },
+ "result" : {
+ "data" : [ {
+ "@type" : "g:Vertex",
+ "@value" : {
+ "id" : {
+ "@type" : "g:Int32",
+ "@value" : 1
+ },
+ "label" : "person",
+ "properties" : {
+ "name" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 0
+ },
+ "value" : "marko"
+ } ],
+ "location" : [ {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 6
+ },
+ "value" : "san diego",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 1997
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 7
+ },
+ "value" : "santa cruz",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2001
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 8
+ },
+ "value" : "brussels",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2004
+ },
+ "endTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ }, {
+ "id" : {
+ "@type" : "g:Int64",
+ "@value" : 9
+ },
+ "value" : "santa fe",
+ "properties" : {
+ "startTime" : {
+ "@type" : "g:Int32",
+ "@value" : 2005
+ }
+ }
+ } ]
+ }
+ }
+ } ],
+ "meta" : { }
+ }
+}
+----
+
+
+Extended
+~~~~~~~~
+
+Note that the "extended" types require the addition of the separate `GraphSONXModuleV2d0` module as follows:
+
+[source,java]
+----
+mapper = GraphSONMapper.build().
+ typeInfo(TypeInfo.PARTIAL_TYPES).
+ addCustomModule(GraphSONXModuleV2d0.build().create(false)).
+ version(GraphSONVersion.V2_0).create().createMapper()
+----
+
+BigDecimal
+^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:BigDecimal",
+ "@value" : 123456789987654321123456789987654321
+}
+----
+
+BigInteger
+^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:BigInteger",
+ "@value" : 123456789987654321123456789987654321
+}
+----
+
+Byte
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:Byte",
+ "@value" : 1
+}
+----
+
+ByteBuffer
+^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:ByteBuffer",
+ "@value" : "c29tZSBieXRlcyBmb3IgeW91"
+}
+----
+
+Char
+^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:Char",
+ "@value" : "x"
+}
+----
+
+Duration
+^^^^^^^^
+
+The following example is a `Duration` of five days.
+
+[source,json]
+----
+{
+ "@type" : "gx:Duration",
+ "@value" : "PT120H"
+}
+----
+
+InetAddress
+^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:InetAddress",
+ "@value" : "localhost"
+}
+----
+
+Instant
+^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:Instant",
+ "@value" : "2016-12-14T16:39:19.349Z"
+}
+----
+
+LocalDate
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:LocalDate",
+ "@value" : "2016-01-01"
+}
+----
+
+LocalDateTime
+^^^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:LocalDateTime",
+ "@value" : "2016-01-01T12:30"
+}
+----
+
+LocalTime
+^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:LocalTime",
+ "@value" : "12:30:45"
+}
+----
+
+MonthDay
+^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:MonthDay",
+ "@value" : "--01-01"
+}
+----
+
+OffsetDateTime
+^^^^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:OffsetDateTime",
+ "@value" : "2007-12-03T10:15:30+01:00"
+}
+----
+
+OffsetTime
+^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:OffsetTime",
+ "@value" : "10:15:30+01:00"
+}
+----
+
+Period
+^^^^^^
+
+The following example is a `Period` of one year, six months and fifteen days.
+
+[source,json]
+----
+{
+ "@type" : "gx:Period",
+ "@value" : "P1Y6M15D"
+}
+----
+
+Short
+^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:Int16",
+ "@value" : 100
+}
+----
+
+Year
+^^^^
+
+The following example is of the `Year` "2016".
+
+[source,json]
+----
+{
+ "@type" : "gx:Year",
+ "@value" : "2016"
+}
+----
+
+YearMonth
+^^^^^^^^^
+
+The following example is a `YearMonth` of "June 2016"
+
+[source,json]
+----
+{
+ "@type" : "gx:YearMonth",
+ "@value" : "2016-06"
+}
+----
+
+ZonedDateTime
+^^^^^^^^^^^^^
+
+[source,json]
+----
+{
+ "@type" : "gx:ZonedDateTime",
+ "@value" : "2016-12-23T12:12:24.000000036+02:00[GMT+02:00]"
+}
+----
+
+ZoneOffset
+^^^^^^^^^^
+
+The following example is a `ZoneOffset` of three hours, six minutes, and nine seconds.
+
+[source,json]
+----
+{
+ "@type" : "gx:ZoneOffset",
+ "@value" : "+03:06:09"
+}
----
\ No newline at end of file
[26/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b2866d45
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b2866d45
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b2866d45
Branch: refs/heads/TINKERPOP-1565
Commit: b2866d453b1ec62566c2b588dd12875bf55abbd7
Parents: 5b653b5 1e856b3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 09:28:24 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 09:28:24 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultSetTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[50/50] [abbrv] tinkerpop git commit: TINKERPOP-1565 GraphSON 3.0
defaulted in drivers
Posted by sp...@apache.org.
TINKERPOP-1565 GraphSON 3.0 defaulted in drivers
Set this up for both python and java. Altered the sasl auth to use Base64 encoded strings in the drivers because GraphSON didn't have a byte array established as a type.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9aebbe63
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9aebbe63
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9aebbe63
Branch: refs/heads/TINKERPOP-1565
Commit: 9aebbe63c74e07e20414d40d3b88c92d250f104e
Parents: e6512e9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 13 13:50:01 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:13:42 2017 -0500
----------------------------------------------------------------------
.../ser/GraphSONMessageSerializerV3d0.java | 4 ++--
.../tinkerpop/gremlin/driver/ser/SerTokens.java | 1 +
.../gremlin/driver/ser/Serializers.java | 8 ++++++-
.../driver/driver_remote_connection.py | 4 ++--
.../jsr223/PythonGraphSONJavaTranslator.java | 4 ++--
.../handler/SaslAuthenticationHandler.java | 1 +
.../server/GremlinServerAuthIntegrateTest.java | 25 ++++++++++----------
.../GremlinServerAuthOldIntegrateTest.java | 17 ++++++-------
.../server/GremlinServerHttpIntegrateTest.java | 2 +-
.../remote/gremlin-server-integration.yaml | 1 +
.../server/gremlin-server-integration.yaml | 1 +
11 files changed, 40 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
index f6f2fc8..d1c9e46 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0.java
@@ -38,7 +38,7 @@ import java.util.UUID;
*/
public final class GraphSONMessageSerializerV3d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer {
private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV3d0.class);
- private static final String MIME_TYPE = SerTokens.MIME_JSON;
+ private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V3D0;
private static byte[] header;
@@ -65,7 +65,7 @@ public final class GraphSONMessageSerializerV3d0 extends AbstractGraphSONMessage
@Override
GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
// override the 2.0 in AbstractGraphSONMessageSerializerV2d0
- return builder.typeInfo(TypeInfo.PARTIAL_TYPES).version(GraphSONVersion.V3_0);
+ return builder.version(GraphSONVersion.V3_0);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
index ecda014..f342a57 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
@@ -39,6 +39,7 @@ public final class SerTokens {
public static final String MIME_JSON = "application/json";
public static final String MIME_GRAPHSON_V1D0 = "application/vnd.gremlin-v1.0+json";
public static final String MIME_GRAPHSON_V2D0 = "application/vnd.gremlin-v2.0+json";
+ public static final String MIME_GRAPHSON_V3D0 = "application/vnd.gremlin-v3.0+json";
public static final String MIME_GRYO_V1D0 = "application/vnd.gremlin-v1.0+gryo";
public static final String MIME_GRYO_LITE_V1D0 = "application/vnd.gremlin-v1.0+gryo-lite";
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
index bb0d377..69e8287 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
@@ -26,9 +26,13 @@ import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public enum Serializers {
+ /**
+ * GraphSON 3.0.
+ */
GRAPHSON(SerTokens.MIME_JSON),
GRAPHSON_V1D0(SerTokens.MIME_GRAPHSON_V1D0),
GRAPHSON_V2D0(SerTokens.MIME_GRAPHSON_V2D0),
+ GRAPHSON_V3D0(SerTokens.MIME_GRAPHSON_V3D0),
GRYO_V1D0(SerTokens.MIME_GRYO_V1D0),
GRYO_LITE_V1D0(SerTokens.MIME_GRYO_LITE_V1D0);
@@ -59,11 +63,13 @@ public enum Serializers {
public MessageSerializer simpleInstance() {
switch (value) {
case SerTokens.MIME_JSON:
- return new GraphSONMessageSerializerV1d0();
+ return new GraphSONMessageSerializerV3d0();
case SerTokens.MIME_GRAPHSON_V1D0:
return new GraphSONMessageSerializerGremlinV1d0();
case SerTokens.MIME_GRAPHSON_V2D0:
return new GraphSONMessageSerializerGremlinV2d0();
+ case SerTokens.MIME_GRAPHSON_V3D0:
+ return new GraphSONMessageSerializerV3d0();
case SerTokens.MIME_GRYO_V1D0:
return new GryoMessageSerializerV1d0();
case SerTokens.MIME_GRYO_LITE_V1D0:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index 2cbe0e7..7bc792f 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -153,7 +153,7 @@ class DriverRemoteConnection(RemoteConnection):
@gen.coroutine
def _execute_message(self, send_message):
send_message = b"".join([b"\x21",
- b"application/vnd.gremlin-v2.0+json",
+ b"application/vnd.gremlin-v3.0+json",
json.dumps(send_message, separators=(',', ':')).encode("utf-8")])
if self._websocket.protocol is None:
self._websocket = yield websocket.websocket_connect(self.url)
@@ -219,7 +219,7 @@ class Response:
if status_code == 407:
self._websocket.write_message(
b"".join([b"\x21",
- b"application/vnd.gremlin-v2.0+json",
+ b"application/vnd.gremlin-v3.0+json",
json.dumps({
"requestId": {
"@type": "g:UUID",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
index 09a457c..df3bb9d 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
@@ -53,10 +53,10 @@ final class PythonGraphSONJavaTranslator<S extends TraversalSource, T extends Tr
private final JavaTranslator<S, T> javaTranslator;
private final GraphSONReader reader = GraphSONReader.build().mapper(
GraphSONMapper.build().addCustomModule(GraphSONXModuleV2d0.build().create(false))
- .version(GraphSONVersion.V2_0).create()).create();
+ .version(GraphSONVersion.V3_0).create()).create();
private final GraphSONWriter writer = GraphSONWriter.build().mapper(
GraphSONMapper.build().addCustomModule(GraphSONXModuleV2d0.build().create(false))
- .version(GraphSONVersion.V2_0).create()).create();
+ .version(GraphSONVersion.V3_0).create()).create();
public PythonGraphSONJavaTranslator(final PythonTranslator pythonTranslator, final JavaTranslator<S, T> javaTranslator) {
this.pythonTranslator = pythonTranslator;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index 6cb0ddb..31171b5 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -22,6 +22,7 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.base64.Base64Decoder;
import io.netty.util.Attribute;
import java.net.InetAddress;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 5d0f82e..8488f28 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -23,6 +23,8 @@ import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import java.util.HashMap;
@@ -167,22 +169,22 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
}
@Test
- public void shouldAuthenticateWithPlainTextOverJSONSerialization() throws Exception {
+ public void shouldAuthenticateWithPlainTextOverDefaultJSONSerialization() throws Exception {
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
.credentials("stephen", "password").create();
final Client client = cluster.connect();
try {
- assertEquals(3, client.submit("1+2").all().get().get(0).get(Map.class).get("@value"));
- assertEquals(2, client.submit("1+1").all().get().get(0).get(Map.class).get("@value"));
- assertEquals(4, client.submit("1+3").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
+ assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
} finally {
cluster.close();
}
}
@Test
- public void shouldAuthenticateWithPlainTextOverGraphSONSerialization() throws Exception {
+ public void shouldAuthenticateWithPlainTextOverGraphSONV1Serialization() throws Exception {
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
.credentials("stephen", "password").create();
final Client client = cluster.connect();
@@ -197,25 +199,24 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
}
@Test
- public void shouldAuthenticateAndWorkWithVariablesOverJsonSerialization() throws Exception {
+ public void shouldAuthenticateAndWorkWithVariablesOverDefaultJsonSerialization() throws Exception {
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON)
.credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
try {
- final Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
- final Map<String, List<Map>> properties = (Map) ((Map) vertex.get("@value")).get("properties");
- assertEquals("stephen", properties.get("name").get(0).get("value"));
+ final Vertex vertex = (Vertex) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
+ assertEquals("stephen", vertex.value("name"));
- final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", ((Map) vpName.get("@value")).get("value"));
+ final Property vpName = (Property)client.submit("v.property('name')").all().get().get(0).getObject();
+ assertEquals("stephen", vpName.value());
} finally {
cluster.close();
}
}
@Test
- public void shouldAuthenticateAndWorkWithVariablesOverGraphSONSerialization() throws Exception {
+ public void shouldAuthenticateAndWorkWithVariablesOverGraphSONV1Serialization() throws Exception {
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0)
.credentials("stephen", "password").create();
final Client client = cluster.connect(name.getMethodName());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
index c8312ae..7fd3c61 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
@@ -24,6 +24,8 @@ import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import java.util.HashMap;
@@ -179,9 +181,9 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect();
try {
- assertEquals(3, client.submit("1+2").all().get().get(0).get(Map.class).get("@value"));
- assertEquals(2, client.submit("1+1").all().get().get(0).get(Map.class).get("@value"));
- assertEquals(4, client.submit("1+3").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
+ assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
+ assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
} finally {
cluster.close();
}
@@ -209,12 +211,11 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect(name.getMethodName());
try {
- final Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
- final Map<String, List<Map>> properties = (Map) ((Map) vertex.get("@value")).get("properties");
- assertEquals("stephen", properties.get("name").get(0).get("value"));
+ final Vertex vertex = (Vertex) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
+ assertEquals("stephen", vertex.value("name"));
- final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", ((Map) vpName.get("@value")).get("value"));
+ final Property vpName = (Property)client.submit("v.property('name')").all().get().get(0).getObject();
+ assertEquals("stephen", vpName.value());
} finally {
cluster.close();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index b2a1568..e46871b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -366,7 +366,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("stephen", node.get("result").get("data").get(0).get("@value").get("properties").get("name").get(0).get(GraphSONTokens.VALUE).asText());
+ assertEquals("stephen", node.get("result").get("data").get(0).get(GraphSONTokens.VALUEPROP).get("properties").get("name").get(0).get(GraphSONTokens.VALUEPROP).get(GraphSONTokens.VALUE).asText());
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
index 7d23fb9..98cdef0 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
@@ -38,6 +38,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }}
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
metrics: {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9aebbe63/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index a467111..1c1ef8d 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -34,6 +34,7 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { useMapperFromGraph: graph }}
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
metrics: {
[16/50] [abbrv] tinkerpop git commit: Finalized some variables. CTR
Posted by sp...@apache.org.
Finalized some variables. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ed634267
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ed634267
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ed634267
Branch: refs/heads/TINKERPOP-1565
Commit: ed63426770bc6dbfee863a7506cb4c9e11a72d05
Parents: c66424d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sat Jan 14 11:08:45 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sat Jan 14 11:08:45 2017 -0500
----------------------------------------------------------------------
.../process/traversal/util/ImmutableMetrics.java | 2 +-
.../process/traversal/util/MutableMetrics.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed634267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
index b02c26d..a563bbd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
@@ -59,7 +59,7 @@ public class ImmutableMetrics implements Metrics, Serializable {
@Override
public Map<String, Long> getCounts() {
- Map<String, Long> ret = new HashMap<>();
+ final Map<String, Long> ret = new HashMap<>();
for (Map.Entry<String, AtomicLong> count : counts.entrySet()) {
ret.put(count.getKey(), count.getValue().get());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed634267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
index 19e2069..47decf1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/MutableMetrics.java
@@ -54,7 +54,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
other.getNested().forEach(nested -> this.addNested(new MutableMetrics(nested)));
}
- public void addNested(MutableMetrics metrics) {
+ public void addNested(final MutableMetrics metrics) {
this.nested.put(metrics.getId(), metrics);
}
@@ -72,7 +72,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
this.tempTime = -1;
}
- public void incrementCount(String key, final long incr) {
+ public void incrementCount(final String key, final long incr) {
AtomicLong count = this.counts.get(key);
if (count == null) {
count = new AtomicLong();
@@ -81,15 +81,15 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
count.addAndGet(incr);
}
- public void setDuration(long dur, TimeUnit unit) {
+ public void setDuration(final long dur, final TimeUnit unit) {
this.durationNs = TimeUnit.NANOSECONDS.convert(dur, unit);
}
- public void setCount(String key, final long val) {
+ public void setCount(final String key, final long val) {
this.counts.put(key, new AtomicLong(val));
}
- public void aggregate(MutableMetrics other) {
+ public void aggregate(final MutableMetrics other) {
this.durationNs += other.durationNs;
for (Map.Entry<String, AtomicLong> otherCount : other.counts.entrySet()) {
AtomicLong thisCount = this.counts.get(otherCount.getKey());
@@ -149,7 +149,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
* @param key
* @param value
*/
- public void setAnnotation(String key, Object value) {
+ public void setAnnotation(final String key, final Object value) {
if (!(value instanceof String) && !(value instanceof Number)) {
throw new IllegalArgumentException("Metrics annotations only support String and Number values.");
}
@@ -157,7 +157,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
}
@Override
- public MutableMetrics getNested(String metricsId) {
+ public MutableMetrics getNested(final String metricsId) {
return (MutableMetrics) nested.get(metricsId);
}
@@ -189,7 +189,7 @@ public class MutableMetrics extends ImmutableMetrics implements Cloneable {
return clone;
}
- public void finish(long bulk) {
+ public void finish(final long bulk) {
stop();
incrementCount(TraversalMetrics.TRAVERSER_COUNT_ID, 1);
incrementCount(TraversalMetrics.ELEMENT_COUNT_ID, bulk);
[33/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/16830e88
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/16830e88
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/16830e88
Branch: refs/heads/TINKERPOP-1565
Commit: 16830e88acf4b8ed1fbe212123b4f3ccd7ddc78d
Parents: c328dac 3bb177f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 17 14:03:38 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 17 14:03:38 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16830e88/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16830e88/pom.xml
----------------------------------------------------------------------
[24/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1549'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1549'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5b653b5a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5b653b5a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5b653b5a
Branch: refs/heads/TINKERPOP-1565
Commit: 5b653b5a4b917cb9be0b06ad6f84c5579dfbd506
Parents: 20478d7 41f1288
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 17 13:00:51 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 17 13:00:51 2017 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/the-traversal.asciidoc | 30 +++++++++++-
.../traversal/dsl/graph/GraphTraversal.java | 13 +++++
.../gremlin/process/traversal/dsl/graph/__.java | 14 ++++++
.../traversal/step/filter/RangeGlobalStep.java | 18 ++++---
.../traversal/step/map/OrderGlobalStep.java | 2 +-
.../process/traversal/step/StepTest.java | 1 -
.../step/filter/RangeGlobalStepTest.java | 1 +
.../step/filter/GroovyRangeTest.groovy | 15 ++++++
.../gremlin_python/process/graph_traversal.py | 11 +++++
.../traversal/step/filter/RangeTest.java | 50 ++++++++++++++++++++
11 files changed, 147 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b653b5a/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b653b5a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b653b5a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
[19/50] [abbrv] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cce5fac6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cce5fac6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cce5fac6
Branch: refs/heads/TINKERPOP-1565
Commit: cce5fac6cbbfb45baa0138af3c6d8bfadedff095
Parents: 671bdbe 5c8e124
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 09:49:00 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 09:49:00 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/server/op/AbstractEvalOpProcessor.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cce5fac6/CHANGELOG.asciidoc
----------------------------------------------------------------------
[05/50] [abbrv] tinkerpop git commit: made skip test OLAP friendly
Posted by sp...@apache.org.
made skip test OLAP friendly
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ba6186a6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ba6186a6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ba6186a6
Branch: refs/heads/TINKERPOP-1565
Commit: ba6186a6e8b2d4569a3c4ebc8a30d26524006068
Parents: bfbd7d5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 10 16:07:12 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 10 16:07:58 2017 +0100
----------------------------------------------------------------------
.../process/traversal/step/filter/GroovyRangeTest.groovy | 4 ++--
.../gremlin/process/traversal/step/filter/RangeTest.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ba6186a6/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
index 56cb19d..4f7b0d4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
@@ -110,8 +110,8 @@ public abstract class GroovyRangeTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').skip(1).values('name')")
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').values('name').skip(1)")
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ba6186a6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
index b04c3fa..0abaf70 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
@@ -81,7 +81,7 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_selectXa_b_cX_byXnameX_rangeXlocal_1_2X();
- public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X();
public abstract Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
@@ -321,8 +321,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
- final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
+ public void g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals(Arrays.asList("marko", "josh", "peter"), traversal.toList());
@@ -420,8 +420,8 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
- return g.V().hasLabel("person").order().by("age").skip(1).values("name");
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X() {
+ return g.V().hasLabel("person").order().by("age").<String>values("name").skip(1);
}
@Override
[44/50] [abbrv] tinkerpop git commit: TINKERPOP-1414 Changed Gremlin
Server and TinkerGraph to default GraphSON 2.0
Posted by sp...@apache.org.
TINKERPOP-1414 Changed Gremlin Server and TinkerGraph to default GraphSON 2.0
This work is done as part of TINKERPOP-1565 which is related to GraphSON 2.0 changes.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc9ce593
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc9ce593
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc9ce593
Branch: refs/heads/TINKERPOP-1565
Commit: fc9ce59338bd3cf4588a43d0e9ac139547ad19ab
Parents: 612bcb3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 7 10:37:04 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 12:11:33 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 65 +++++-
.../structure/io/graphson/GraphSONIo.java | 2 +-
.../structure/io/graphson/GraphSONMapper.java | 4 +-
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 +-
.../server/GremlinServerAuthIntegrateTest.java | 16 +-
.../GremlinServerAuthOldIntegrateTest.java | 20 +-
.../server/GremlinServerHttpIntegrateTest.java | 31 +--
.../server/GremlinServerIntegrateTest.java | 2 +-
.../remote/gremlin-server-integration.yaml | 6 +-
.../server/gremlin-server-integration.yaml | 6 +-
.../gremlin/structure/SerializationTest.java | 229 ++++++++++++++++++-
.../tinkerpop/gremlin/structure/io/IoTest.java | 143 +++++++++++-
.../tinkergraph/structure/TinkerGraph.java | 2 +-
24 files changed, 521 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 764c44d..112e7c5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Added more specific typing to various `__` traversal steps. E.g. `<A,Vertex>out()` is `<Vertex,Vertex>out()`.
* Updated Docker build scripts to include Python dependencies (NOTE: users should remove any previously generated TinkerPop Docker images).
* Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in GraphSON serialization.
+* GraphSON 2.0 is now the default serialization format in TinkerGraph and Gremlin Server.
* Added `Vertex`, `Edge`, `VertexProperty`, and `Property` serializers to Gremlin-Python and exposed tests that use graph object arguments.
* `Bytecode.getSourceInstructions()` and `Bytecode.getStepInstructions()` now returns `List<Instruction>` instead of `Iterable<Instruction>`.
* Added various `TraversalStrategy` registrations with `GryoMapper`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 9233d57..4e43077 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -32,6 +32,69 @@ Please see the link:https://github.com/apache/tinkerpop/blob/3.3.3/CHANGELOG.asc
Upgrading for Users
~~~~~~~~~~~~~~~~~~~
+GraphSON 2.0
+^^^^^^^^^^^^
+
+Both TinkerGraph and Gremlin Server have been defaulted to work with GraphSON 2.0. For TinkerGraph this means that
+the following commands:
+
+[source,java]
+----
+Graph graph = TinkerFactory.createModern();
+graph.io(IoCore.graphson()).writeGraph("tinkerpop-modern.json");
+
+final Graph newGraph = TinkerGraph.open();
+newGraph.io(IoCore.graphson()).readGraph("tinkerpop-modern.json");
+----
+
+will write and read GraphSON 2.0 format rather than 1.0. To use 1.0 format simply set the `version()` on the
+appropriate builder methods:
+
+[source,java]
+----
+Graph graph = TinkerFactory.createModern();
+GraphSONMapper mapper = graph.io(IoCore.graphson()).mapper().version(GraphSONVersion.V1_0).create()
+try (OutputStream os = new FileOutputStream("tinkerpop-modern.json")) {
+ graph.io(IoCore.graphson()).writer().mapper(mapper).create().writeGraph(os, graph)
+}
+
+final Graph newGraph = TinkerGraph.open();
+try (InputStream stream = new FileInputStream("tinkerpop-modern.json")) {
+ newGraph.io(IoCore.graphson()).reader().mapper(mapper).vertexIdKey("name").create().readGraph(stream, newGraph);
+}
+----
+
+For Gremlin Server, this change means that the `application/json` mime type no longer returns GraphSON 1.0 without
+type embedding. Instead, Gremlin Server will return GraphSON 2.0 with partial types enabled (i.e. which is equivalent
+to `application/vnd.gremlin-v2.0+json`). The `serializers` section the sample Gremlin Server YAML files now typically
+look like this:
+
+[source,yaml]
+----
+serializers:
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
+----
+
+It is possible to bring back the original configuration for `application/json` by changing the last entry as follows:
+
+[source,yaml]
+----
+serializers:
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1414[TINKERPOP-1414]
+
GraphTraversal Has-Methods Re-Organized
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -176,4 +239,4 @@ If the old `GryoSerializer` model is desired, then the properties file should si
spark.serializer=org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoSerializer
```
-See: link:https://issues.apache.org/jira/browse/TINKERPOP-1389
\ No newline at end of file
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1389
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
index f56afb9..0c92e1c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
@@ -101,7 +101,7 @@ public final class GraphSONIo implements Io<GraphSONReader.Builder, GraphSONWrit
* Create a new builder using the default version of GraphSON.
*/
public static Io.Builder<GraphSONIo> build() {
- return build(GraphSONVersion.V1_0);
+ return build(GraphSONVersion.V2_0);
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 7e46c98..f82ebb7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -181,7 +181,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private boolean normalize = false;
private boolean embedTypes = false;
private List<IoRegistry> registries = new ArrayList<>();
- private GraphSONVersion version = GraphSONVersion.V1_0;
+ private GraphSONVersion version = GraphSONVersion.V2_0;
// GraphSON 2.0 should have types activated by default, otherwise use there's no point in using it instead of 1.0.
private TypeInfo typeInfo = TypeInfo.PARTIAL_TYPES;
@@ -198,7 +198,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
}
/**
- * Set the version of GraphSON to use. The default is {@link GraphSONVersion#V1_0}.
+ * Set the version of GraphSON to use. The default is {@link GraphSONVersion#V2_0}.
*/
public Builder version(final GraphSONVersion version) {
this.version = version;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-classic.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index ac78da0..d1cbbf3 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -28,12 +28,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-classic.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-modern-py.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern-py.yaml b/gremlin-server/conf/gremlin-server-modern-py.yaml
index e00eb1d..ff8228f 100644
--- a/gremlin-server/conf/gremlin-server-modern-py.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-py.yaml
@@ -43,12 +43,12 @@ scriptEngines: {
gremlin-python: {}
}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-modern-readonly.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern-readonly.yaml b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
index 379b358..18f7ca4 100644
--- a/gremlin-server/conf/gremlin-server-modern-readonly.yaml
+++ b/gremlin-server/conf/gremlin-server-modern-readonly.yaml
@@ -28,12 +28,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-modern-readonly.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-modern.yaml b/gremlin-server/conf/gremlin-server-modern.yaml
index 4ac5587..b063868 100644
--- a/gremlin-server/conf/gremlin-server-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-modern.yaml
@@ -28,12 +28,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-modern.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index 8d68c7f..6aac0f2 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -39,12 +39,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/empty-sample.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-rest-modern.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-rest-modern.yaml b/gremlin-server/conf/gremlin-server-rest-modern.yaml
index 8c41ee7..1fa23f9 100644
--- a/gremlin-server/conf/gremlin-server-rest-modern.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-modern.yaml
@@ -29,9 +29,9 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/generate-modern.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
metrics: {
slf4jReporter: {enabled: true, interval: 180000}}
strictTransactionManagement: false
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-rest-secure.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-rest-secure.yaml b/gremlin-server/conf/gremlin-server-rest-secure.yaml
index 646a1e5..8ed8f41 100644
--- a/gremlin-server/conf/gremlin-server-rest-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-rest-secure.yaml
@@ -42,9 +42,9 @@ scriptEngines: {
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider":[10000],
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.CompileStaticCustomizerProvider":["org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension"]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-secure.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-secure.yaml b/gremlin-server/conf/gremlin-server-secure.yaml
index 5b5e91e..14f7034 100644
--- a/gremlin-server/conf/gremlin-server-secure.yaml
+++ b/gremlin-server/conf/gremlin-server-secure.yaml
@@ -42,12 +42,12 @@ scriptEngines: {
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCustomizerProvider":[10000],
"org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.CompileStaticCustomizerProvider":["org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtension"]}}}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server-spark.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-spark.yaml b/gremlin-server/conf/gremlin-server-spark.yaml
index d79185f..3c198f5 100644
--- a/gremlin-server/conf/gremlin-server-spark.yaml
+++ b/gremlin-server/conf/gremlin-server-spark.yaml
@@ -52,12 +52,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/spark.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index 8cf2947..d4e2849 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -29,12 +29,12 @@ scriptEngines: {
staticImports: [java.lang.Math.PI],
scripts: [scripts/empty-sample.groovy]}}
serializers:
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }} # application/vnd.gremlin-v2.0+json
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v1.0+gryo-lite
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true }} # application/vnd.gremlin-v1.0+gryo-stringd
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }} # application/vnd.gremlin-v1.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }} # application/vnd.gremlin-v2.0+json
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }} # application/json
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
- { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 57c6994..59238fc 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -24,9 +24,8 @@ import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.SslProvider;
import io.netty.handler.ssl.util.SelfSignedCertificate;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.AbstractGryoMessageSerializerV1d0;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
+import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
@@ -72,7 +71,7 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
new Settings.SerializerSettings(GryoMessageSerializerV1d0.class.getName(), new HashMap<String,Object>(){{
put(AbstractGryoMessageSerializerV1d0.TOKEN_SERIALIZE_RESULT_TO_STRING, true);
}}),
- new Settings.SerializerSettings(GraphSONMessageSerializerV1d0.class.getName(), Collections.emptyMap())
+ new Settings.SerializerSettings(GraphSONMessageSerializerV2d0.class.getName(), Collections.emptyMap())
);
protected Settings settings;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
index 1c5188d..5d0f82e 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java
@@ -173,9 +173,9 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
final Client client = cluster.connect();
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
+ assertEquals(3, client.submit("1+2").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(2, client.submit("1+1").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(4, client.submit("1+3").all().get().get(0).get(Map.class).get("@value"));
} finally {
cluster.close();
}
@@ -203,12 +203,12 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
final Client client = cluster.connect(name.getMethodName());
try {
- Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
- Map<String, List<Map>> properties = (Map) vertex.get("properties");
+ final Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
+ final Map<String, List<Map>> properties = (Map) ((Map) vertex.get("@value")).get("properties");
assertEquals("stephen", properties.get("name").get(0).get("value"));
final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", vpName.get("value"));
+ assertEquals("stephen", ((Map) vpName.get("@value")).get("value"));
} finally {
cluster.close();
}
@@ -221,8 +221,8 @@ public class GremlinServerAuthIntegrateTest extends AbstractGremlinServerIntegra
final Client client = cluster.connect(name.getMethodName());
try {
- Map vertex = (Map) client.submit("v=graph.addVertex('name', 'stephen')").all().get().get(0).getObject();
- Map<String, List<Map>> properties = (Map) vertex.get("properties");
+ final Map vertex = (Map) client.submit("v=graph.addVertex('name', 'stephen')").all().get().get(0).getObject();
+ final Map<String, List<Map>> properties = (Map) vertex.get("properties");
assertEquals("stephen", properties.get("name").get(0).get("value"));
final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
index f0e2104..c8312ae 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthOldIntegrateTest.java
@@ -179,9 +179,9 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect();
try {
- assertEquals(2, client.submit("1+1").all().get().get(0).getInt());
- assertEquals(3, client.submit("1+2").all().get().get(0).getInt());
- assertEquals(4, client.submit("1+3").all().get().get(0).getInt());
+ assertEquals(3, client.submit("1+2").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(2, client.submit("1+1").all().get().get(0).get(Map.class).get("@value"));
+ assertEquals(4, client.submit("1+3").all().get().get(0).get(Map.class).get("@value"));
} finally {
cluster.close();
}
@@ -209,12 +209,12 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect(name.getMethodName());
try {
- Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
- Map<String, List<Map>> properties = (Map) vertex.get("properties");
+ final Map vertex = (Map) client.submit("v=graph.addVertex(\"name\", \"stephen\")").all().get().get(0).getObject();
+ final Map<String, List<Map>> properties = (Map) ((Map) vertex.get("@value")).get("properties");
assertEquals("stephen", properties.get("name").get(0).get("value"));
-
+
final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
- assertEquals("stephen", vpName.get("value"));
+ assertEquals("stephen", ((Map) vpName.get("@value")).get("value"));
} finally {
cluster.close();
}
@@ -227,10 +227,10 @@ public class GremlinServerAuthOldIntegrateTest extends AbstractGremlinServerInte
final Client client = cluster.connect(name.getMethodName());
try {
- Map vertex = (Map) client.submit("v=graph.addVertex('name', 'stephen')").all().get().get(0).getObject();
- Map<String, List<Map>> properties = (Map) vertex.get("properties");
+ final Map vertex = (Map) client.submit("v=graph.addVertex('name', 'stephen')").all().get().get(0).getObject();
+ final Map<String, List<Map>> properties = (Map) vertex.get("properties");
assertEquals("stephen", properties.get("name").get(0).get("value"));
-
+
final Map vpName = (Map)client.submit("v.property('name')").all().get().get(0).getObject();
assertEquals("stephen", vpName.get("value"));
} finally {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 78109e6..b2a1568 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.server;
+import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
import org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator;
import org.apache.tinkerpop.gremlin.server.channel.HttpChannelizer;
@@ -77,10 +78,10 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
deleteDirectory(new File("/tmp/neo4j"));
settings.graphs.put("graph", "conf/neo4j-empty.properties");
break;
- case "should200OnPOSTWithGraphSON2d0AcceptHeaderDefaultResultToJson":
+ case "should200OnPOSTWithGraphSON1d0AcceptHeaderDefaultResultToJson":
settings.serializers.clear();
final Settings.SerializerSettings serializerSettings = new Settings.SerializerSettings();
- serializerSettings.className = GraphSONMessageSerializerV2d0.class.getName();
+ serializerSettings.className = GraphSONMessageSerializerV1d0.class.getName();
settings.serializers.add(serializerSettings);
break;
case "should401OnGETWithNoAuthorizationHeader":
@@ -297,7 +298,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(0).intValue());
+ assertEquals(20, node.get("result").get("data").get(0).get("@value").intValue());
}
}
@@ -365,7 +366,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("stephen", node.get("result").get("data").get(0).get("properties").get("name").get(0).get(GraphSONTokens.VALUE).asText());
+ assertEquals("stephen", node.get("result").get("data").get(0).get("@value").get("properties").get("name").get(0).get(GraphSONTokens.VALUE).asText());
}
}
@@ -379,7 +380,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(0).intValue());
+ assertEquals(20, node.get("result").get("data").get(0).get("@value").intValue());
}
}
@@ -449,7 +450,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(Instant.MAX, Instant.parse(node.get("result").get("data").get(0).asText()));
+ assertEquals(Instant.MAX, Instant.parse(node.get("result").get("data").get(0).get("@value").asText()));
}
}
@@ -467,7 +468,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(0).intValue());
+ assertEquals(1, node.get("result").get("data").get(0).get("@value").intValue());
}
final HttpGet httpget = new HttpGet(TestClientFactory.createURLString("?gremlin=g.V().count()"));
@@ -481,7 +482,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(1, node.get("result").get("data").get(0).intValue());
+ assertEquals(1, node.get("result").get("data").get(0).get("@value").intValue());
}
}
}
@@ -599,7 +600,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(20, node.get("result").get("data").get(0).intValue());
+ assertEquals(20, node.get("result").get("data").get(0).get("@value").intValue());
}
}
@@ -615,7 +616,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(10, node.get("result").get("data").get(0).intValue());
+ assertEquals(10, node.get("result").get("data").get(0).get("@value").intValue());
}
}
@@ -631,7 +632,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals(10.5d, node.get("result").get("data").get(0).doubleValue(), 0.0001);
+ assertEquals(10.5d, node.get("result").get("data").get(0).get("@value").doubleValue(), 0.0001);
}
}
@@ -696,9 +697,9 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
assertEquals(true, node.get("result").get("data").isArray());
- assertEquals(1, node.get("result").get("data").get(0).intValue());
- assertEquals(2, node.get("result").get("data").get(1).intValue());
- assertEquals(3, node.get("result").get("data").get(2).intValue());
+ assertEquals(1, node.get("result").get("data").get(0).get("@value").intValue());
+ assertEquals(2, node.get("result").get("data").get(1).get("@value").intValue());
+ assertEquals(3, node.get("result").get("data").get(2).get("@value").intValue());
}
}
@@ -715,7 +716,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
assertEquals(true, node.get("result").get("data").get(0).isObject());
- assertEquals(1, node.get("result").get("data").get(0).get("y").asInt());
+ assertEquals(1, node.get("result").get("data").get(0).get("y").get("@value").asInt());
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 1743e89..96cc132 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -675,7 +675,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldReceiveFailureOnBadGraphSONSerialization() throws Exception {
- final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V1D0).create();
+ final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create();
final Client client = cluster.connect();
try {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
index a25c6b1..7d23fb9 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
@@ -35,9 +35,9 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph, custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph, custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }}
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
metrics: {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index d0f7b32..a467111 100644
--- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -31,9 +31,9 @@ serializers:
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { useMapperFromGraph: graph, custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoLiteMessageSerializerV1d0, config: { useMapperFromGraph: graph, custom: [groovy.json.JsonBuilder;org.apache.tinkerpop.gremlin.driver.ser.JsonBuilderGryoSerializer]}}
- { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { serializeResultToString: true}}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { useMapperFromGraph: graph }}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
- - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistry] }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0, config: { useMapperFromGraph: graph }}
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { useMapperFromGraph: graph }}
processors:
- { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
metrics: {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc9ce593/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 4dacf48..a112777 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -21,9 +21,11 @@ package org.apache.tinkerpop.gremlin.structure;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
@@ -45,10 +47,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
/**
@@ -245,7 +249,7 @@ public class SerializationTest {
assertEquals("The objects differ", after, before);
}
}
-
+
public static class GraphSONTest extends AbstractGremlinTest {
private final TypeReference<HashMap<String, Object>> mapTypeReference = new TypeReference<HashMap<String, Object>>() {
};
@@ -253,7 +257,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertex() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final Vertex v = graph.vertices(convertToVertexId("marko")).next();
final String json = mapper.writeValueAsString(v);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -272,7 +276,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeEdge() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final Edge e = g.E(convertToEdgeId("marko", "knows", "vadas")).next();
final String json = mapper.writeValueAsString(e);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -286,7 +290,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeProperty() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
final String json = mapper.writeValueAsString(p);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -298,7 +302,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeVertexProperty() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final VertexProperty vp = graph.vertices(convertToVertexId("marko")).next().property("name");
final String json = mapper.writeValueAsString(vp);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -311,7 +315,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.CREW)
public void shouldSerializeVertexPropertyWithProperties() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final VertexProperty vp = IteratorUtils.filter(graph.vertices(convertToVertexId("marko")).next().properties("location"), p -> p.value().equals("brussels")).next();
final String json = mapper.writeValueAsString(vp);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -326,7 +330,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializePath() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final Path p = g.V(convertToVertexId("marko")).as("a").outE().as("b").inV().as("c").path()
.filter(t -> ((Vertex) t.get().objects().get(2)).value("name").equals("lop")).next();
final String json = mapper.writeValueAsString(p);
@@ -354,8 +358,8 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeTraversalMetrics() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
- final TraversalMetrics tm = (TraversalMetrics) g.V().both().profile().next();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
+ final TraversalMetrics tm = g.V().both().profile().next();
final String json = mapper.writeValueAsString(tm);
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
@@ -375,7 +379,7 @@ public class SerializationTest {
@Test
@LoadGraphWith(LoadGraphWith.GraphData.MODERN)
public void shouldSerializeTree() throws Exception {
- final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().create().createMapper();
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V1_0).create().createMapper();
final Tree t = g.V(convertToVertexId("marko")).out().properties("name").tree().next();
final String json = mapper.writeValueAsString(t);
@@ -426,4 +430,209 @@ public class SerializationTest {
assertEquals(entry.getKey().toString(), branch2Prop.get(GraphSONTokens.KEY).get(GraphSONTokens.ID).toString());
}
}
+
+ public static class GraphSONV2d0Test extends AbstractGremlinTest {
+ private final TypeReference<HashMap<String, Object>> mapTypeReference = new TypeReference<HashMap<String, Object>>() {
+ };
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializeVertex() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final Vertex v = graph.vertices(convertToVertexId("marko")).next();
+ final String json = mapper.writeValueAsString(v);
+ final Vertex detached = mapper.readValue(json, Vertex.class);
+
+ assertNotNull(detached);
+ assertEquals(v.label(), detached.label());
+ assertEquals(v.id(), detached.id());
+ assertEquals(v.value("name").toString(), detached.value("name"));
+ assertEquals((Integer) v.value("age"), detached.value("age"));
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializeEdge() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final Edge e = g.E(convertToEdgeId("marko", "knows", "vadas")).next();
+ final String json = mapper.writeValueAsString(e);
+ final Edge detached = mapper.readValue(json, Edge.class);
+
+ assertNotNull(detached);
+ assertEquals(e.label(), detached.label());
+ assertEquals(e.id(), detached.id());
+ assertEquals((Double) e.value("weight"), detached.value("weight"));
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializeProperty() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
+ final String json = mapper.writeValueAsString(p);
+ final Property detached = mapper.readValue(json, Property.class);
+
+ assertNotNull(detached);
+ assertEquals(p.key(), detached.key());
+ assertEquals(p.value(), detached.value());
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializeVertexProperty() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final VertexProperty vp = graph.vertices(convertToVertexId("marko")).next().property("name");
+ final String json = mapper.writeValueAsString(vp);
+ final VertexProperty detached = mapper.readValue(json, VertexProperty.class);
+
+ assertNotNull(detached);
+ assertEquals(vp.label(), detached.label());
+ assertEquals(vp.id(), detached.id());
+ assertEquals(vp.value(), detached.value());
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.CREW)
+ public void shouldSerializeVertexPropertyWithProperties() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final VertexProperty vp = IteratorUtils.filter(graph.vertices(convertToVertexId("marko")).next().properties("location"), p -> p.value().equals("brussels")).next();
+ final String json = mapper.writeValueAsString(vp);
+ final VertexProperty<?> detached = mapper.readValue(json, VertexProperty.class);
+
+ assertNotNull(detached);
+ assertEquals(vp.label(), detached.label());
+ assertEquals(vp.id(), detached.id());
+ assertEquals(vp.value(), detached.value());
+ assertEquals(vp.values("startTime").next(), detached.values("startTime").next());
+ assertEquals(((Property) vp.properties("startTime").next()).key(), ((Property) detached.properties("startTime").next()).key());
+ assertEquals(vp.values("endTime").next(), detached.values("endTime").next());
+ assertEquals(((Property) vp.properties("endTime").next()).key(), ((Property) detached.properties("endTime").next()).key());
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializePath() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final Path p = g.V(convertToVertexId("marko")).as("a").outE().as("b").inV().as("c").path()
+ .filter(t -> ((Vertex) t.get().objects().get(2)).value("name").equals("lop")).next();
+ final String json = mapper.writeValueAsString(p);
+ final Path detached = mapper.readValue(json, Path.class);
+
+ assertNotNull(detached);
+ assertEquals(p.labels().size(), detached.labels().size());
+ assertEquals(p.labels().get(0).size(), detached.labels().get(0).size());
+ assertEquals(p.labels().get(1).size(), detached.labels().get(1).size());
+ assertEquals(p.labels().get(2).size(), detached.labels().get(2).size());
+ assertTrue(p.labels().stream().flatMap(Collection::stream).allMatch(detached::hasLabel));
+
+ final Vertex vOut = p.get("a");
+ final Vertex detachedVOut = detached.get("a");
+ assertEquals(vOut.label(), detachedVOut.label());
+ assertEquals(vOut.id(), detachedVOut.id());
+
+ // TODO: dunno GraphSON seems to return properties - will make this more consistent here
+ // this is a SimpleTraverser so no properties are present in detachment
+ //assertFalse(detachedVOut.properties().hasNext());
+
+ final Edge e = p.get("b");
+ final Edge detachedE = detached.get("b");
+ assertEquals(e.label(), detachedE.label());
+ assertEquals(e.id(), detachedE.id());
+
+ // TODO: dunno GraphSON seems to return properties - will make this more consistent here
+ // this is a SimpleTraverser so no properties are present in detachment
+ //assertFalse(detachedE.properties().hasNext());
+
+ final Vertex vIn = p.get("c");
+ final Vertex detachedVIn = detached.get("c");
+ assertEquals(vIn.label(), detachedVIn.label());
+ assertEquals(vIn.id(), detachedVIn.id());
+
+ // TODO: dunno GraphSON seems to return properties - will make this more consistent here
+ // this is a SimpleTraverser so no properties are present in detachment
+ //assertFalse(detachedVIn.properties().hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldSerializeTraversalMetrics() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final TraversalMetrics before = g.V().both().profile().next();
+ final String json = mapper.writeValueAsString(before);
+ final TraversalMetrics after = mapper.readValue(json, TraversalMetrics.class);
+
+ assertNotNull(after);
+ assertEquals(before.getMetrics().size(), after.getMetrics().size());
+ assertEquals(before.getDuration(TimeUnit.MILLISECONDS), after.getDuration(TimeUnit.MILLISECONDS));
+ assertEquals(before.getMetrics().size(), after.getMetrics().size());
+
+ before.getMetrics().forEach(b -> {
+ final Optional<? extends Metrics> mFromA = after.getMetrics().stream().filter(a -> b.getId().equals(a.getId())).findFirst();
+ if (mFromA.isPresent()) {
+ final Metrics m = mFromA.get();
+ assertEquals(b.getAnnotations(), m.getAnnotations());
+ assertEquals(b.getCounts(), m.getCounts());
+ assertEquals(b.getName(), m.getName());
+ assertEquals(b.getDuration(TimeUnit.MILLISECONDS), m.getDuration(TimeUnit.MILLISECONDS));
+ } else {
+ fail("Metrics were not present after deserialization");
+ }
+ });
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ @org.junit.Ignore("TINKERPOP-1509")
+ public void shouldSerializeTree() throws Exception {
+ final ObjectMapper mapper = graph.io(GraphSONIo.build()).mapper().version(GraphSONVersion.V2_0).create().createMapper();
+ final Tree t = g.V(convertToVertexId("marko")).out().properties("name").tree().next();
+ final String json = mapper.writeValueAsString(t);
+
+ final HashMap<String, Object> m = (HashMap<String, Object>) mapper.readValue(json, mapTypeReference);
+
+ // Check Structure
+ assertEquals(1, m.size());
+ assertTrue(m.containsKey(convertToVertexId("marko").toString()));
+
+ // Check Structure n+1
+ final HashMap<String, Object> branch = (HashMap<String, Object>) m.get(convertToVertexId("marko").toString());
+ assertEquals(2, branch.size());
+ assertTrue(branch.containsKey(GraphSONTokens.KEY));
+ assertTrue(branch.containsKey(GraphSONTokens.VALUE));
+
+ //Check n+1 key (traversed element)
+ final HashMap<String, Object> branchKey = (HashMap<String, Object>) branch.get(GraphSONTokens.KEY);
+ assertTrue(branchKey.containsKey(GraphSONTokens.ID));
+ assertTrue(branchKey.containsKey(GraphSONTokens.LABEL));
+ assertTrue(branchKey.containsKey(GraphSONTokens.TYPE));
+ assertTrue(branchKey.containsKey(GraphSONTokens.PROPERTIES));
+ assertEquals(convertToVertexId("marko").toString(), branchKey.get(GraphSONTokens.ID).toString());
+ assertEquals("person", branchKey.get(GraphSONTokens.LABEL));
+ assertEquals("vertex", branchKey.get(GraphSONTokens.TYPE));
+ final HashMap<String, List<HashMap<String, Object>>> branchKeyProps = (HashMap<String, List<HashMap<String, Object>>>) branchKey.get(GraphSONTokens.PROPERTIES);
+ assertEquals("marko", branchKeyProps.get("name").get(0).get("value"));
+ assertEquals(29, branchKeyProps.get("age").get(0).get("value"));
+
+ //Check n+1 value (traversed element)
+ final HashMap<String, Object> branchValue = (HashMap<String, Object>) branch.get(GraphSONTokens.VALUE);
+ assertEquals(3, branchValue.size());
+ assertTrue(branchValue.containsKey(convertToVertexId("vadas").toString()));
+ assertTrue(branchValue.containsKey(convertToVertexId("lop").toString()));
+ assertTrue(branchValue.containsKey(convertToVertexId("josh").toString()));
+
+ // Check that vp[] functioned properly
+ final HashMap<String, HashMap<String, Object>> branch2 = (HashMap<String, HashMap<String, Object>>) branchValue.get(convertToVertexId("vadas").toString());
+ assertTrue(branch2.containsKey(GraphSONTokens.KEY));
+ assertTrue(branch2.containsKey(GraphSONTokens.VALUE));
+
+ final Map.Entry entry = branch2.get(GraphSONTokens.VALUE).entrySet().iterator().next();
+ final HashMap<String, HashMap<String, Object>> branch2Prop = (HashMap<String, HashMap<String, Object>>) entry.getValue();
+ assertTrue(branch2Prop.get(GraphSONTokens.KEY).containsKey(GraphSONTokens.ID));
+ assertTrue(branch2Prop.get(GraphSONTokens.KEY).containsKey(GraphSONTokens.VALUE));
+ assertTrue(branch2Prop.get(GraphSONTokens.KEY).containsKey(GraphSONTokens.LABEL));
+ assertEquals("name", branch2Prop.get(GraphSONTokens.KEY).get(GraphSONTokens.LABEL));
+ assertEquals("vadas", branch2Prop.get(GraphSONTokens.KEY).get(GraphSONTokens.VALUE));
+ assertEquals(entry.getKey().toString(), branch2Prop.get(GraphSONTokens.KEY).get(GraphSONTokens.ID).toString());
+ }
+ }
}
[13/50] [abbrv] tinkerpop git commit: Merge branch
'TINKERPOP-1545-tp31' into tp31
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1545-tp31' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4b8ea270
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4b8ea270
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4b8ea270
Branch: refs/heads/TINKERPOP-1565
Commit: 4b8ea2703c1fe30b0345624b329d79d5ea1d6924
Parents: a27a048 52e3b86
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jan 12 15:22:33 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jan 12 15:22:33 2017 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../IncidentToAdjacentStrategy.java | 50 +++++++++--------
.../IncidentToAdjacentStrategyTest.java | 56 ++++++++++----------
3 files changed, 58 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[02/50] [abbrv] tinkerpop git commit: Added duplicate edge detection
recipe
Posted by sp...@apache.org.
Added duplicate edge detection recipe
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7783c838
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7783c838
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7783c838
Branch: refs/heads/TINKERPOP-1565
Commit: 7783c838e15cfdf3ee567790c657f34403766936
Parents: 043d1a3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jan 10 08:49:02 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jan 10 08:49:02 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/duplicate-edge.asciidoc | 142 ++++++++++++++++++++++++++
docs/src/recipes/index.asciidoc | 18 ++++
2 files changed, 160 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7783c838/docs/src/recipes/duplicate-edge.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/duplicate-edge.asciidoc b/docs/src/recipes/duplicate-edge.asciidoc
new file mode 100644
index 0000000..ed56106
--- /dev/null
+++ b/docs/src/recipes/duplicate-edge.asciidoc
@@ -0,0 +1,142 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+////
+[[duplicate-edge]]
+Duplicate Edge Detection
+------------------------
+
+Whether part of a graph maintenance process or for some other analysis need, it is sometimes necessary to detect
+if there is more than one edge between two vertices. The following examples will assume that an edge with the same
+label and direction will be considered "duplicate".
+
+The "modern" graph does not have any duplicate edges that fit that definition, so the following example adds one
+that is duplicative of the "created" edge between vertex "1" and "3".
+
+[gremlin-groovy,modern]
+----
+g.V(1).as("a").V(3).addE("created").from("a").iterate()
+g.V(1).outE("created")
+----
+
+One way to find the duplicate edges would be to do something like this:
+
+[gremlin-groovy,existing]
+----
+g.V().outE().
+ project("a","b"). <1>
+ by().by(inV().path().by().by(label)).
+ group(). <2>
+ by(select("b")).
+ by(select("a").fold()).
+ unfold(). <3>
+ select(values). <4>
+ where(count(local).is(gt(1)))
+----
+
+<1> The "a" and "b" from the `project` contain the edge and the path respectively. The path consists of a the outgoing
+vertex, an edge, and the incoming vertex. The use of `by().by(label))` converts the edge to its label (recall that `by`
+are applied in round-robin fashion), so the path will look something like: `[v[1],created,v[3]]`.
+<2> Group by the path from "b" and construct a list of edges from "a". Any value in this `Map` that has a list of edges
+greater than one means that there is more than one edge for that edge label between those two vertices (i.e. the `Map`
+key).
+<3> Unroll the key-value pairs in the `Map` of paths-edges.
+<4> Only the values from the `Map` are needed and as mentioned earlier, those lists with more than one edge would
+containa duplicate.
+
+This method find the duplicates, but does require more memory than other approaches. A slightly more complex approach
+that uses less memory might look like this:
+
+[gremlin-groovy,existing]
+----
+g.V().as("ov").
+ outE().as("e").
+ inV().as("iv").
+ inE(). <1>
+ where(neq("e")). <2>
+ where(eq("e")).by(label).
+ where(outV().as("ov")).
+ group().
+ by(select("ov","e","iv").by().by(label)). <3>
+ unfold(). <4>
+ select(values).
+ where(count(local).is(gt(1)))
+----
+
+<1> To this point in the traversal, the outgoing edges of a vertex are being iterated with the current edge labelled
+as "e". For "e", Gremlin traverses to the incoming vertex and back on in edges of that vertex.
+<2> Those incoming edges are filtered with the following `where` steps. The first ensures that it does not traverse
+back over "e" (i.e. the current edge). The second determines if the edge label is equivalent (i.e. the test for the
+working definition of "duplicate"). The third determines if the outgoing vertex matches the one that started the
+path labelled as "ov".
+<3> This line is quite similar to the output achieved in the previous example at step 2. A `Map` is produced that uses
+the outgoing vertex, the edge label, and the incoming vertex as the key, with the list of edges for that path as the
+value.
+<4> The rest of the traversal is the same as the previous one.
+
+A third way to approach this problem would be to force a link:https://en.wikipedia.org/wiki/Depth-first_search[depth-first search].
+The previous examples invoke traversal strategies that force a link:https://en.wikipedia.org/wiki/Breadth-first_search[breadth first search]
+as a performance optimization.
+
+[gremlin-groovy,existing]
+----
+g.withoutStrategies(LazyBarrierStrategy, PathRetractionStrategy).V().as("ov"). <1>
+ outE().as("e1").
+ inV().as("iv").
+ inE().
+ where(neq("e1")).
+ where(outV().as("ov")).as("e2"). <2>
+ filter(select("e1","e2").by(label).where("e1", eq("e2"))) <3>
+----
+
+<1> Remove strategies that will optimize for breadth first searches and thus allow Gremlin to go depth first.
+<2> To this point, the traversal is very much like the previous one. Review step 2 in the previous example to see the
+parallels here.
+<3> The final `filter` simply looks for edges that match on label, which would then meet the working definition of
+"duplicate".
+
+The basic pattern at play here is to compare the path of the outgoing vertex, its outgoing edge label and the incoming
+vertex. This model can obviously be contracted or expanded as needed to fit different definitions of "duplicate" For
+example, if the definition of "duplicate" was just two vertices with more than one edge of any label between them, then
+the approach might look something like this:
+
+[gremlin-groovy,existing]
+----
+----
+
+Alternatively, a "duplicate" definition could extended to the label and properties of the edge. For purposes of
+demonstration, an additional edge is added to the "modern" graph:
+
+[gremlin-groovy]
+----
+g = TinkerFactory.createModern().traversal()
+g.V(1).as("a").V(3).addE("created").property("weight",0.4d).from("a").iterate()
+g.V(1).as("a").V(3).addE("created").property("weight",0.5d).from("a").iterate()
+g.V(1).outE("created").valueMap(true)
+----
+
+To identify the duplicate with this revised definition, the previous traversal can be modified to:
+
+[gremlin-groovy,existing]
+----
+g.withoutStrategies(LazyBarrierStrategy, PathRetractionStrategy).V().as("ov").
+ outE().as("e1").
+ inV().as("iv").
+ inE().
+ where(neq("e1")).
+ where(outV().as("ov")).as("e2").
+ filter(select("e1","e2").by(label).where("e1", eq("e2"))).
+ filter(select("e1","e2").by("weight").where("e1", eq("e2"))).valueMap(true)
+----
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7783c838/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index 2e88ac5..9c42f0f 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -44,6 +44,8 @@ include::connected-components.asciidoc[]
include::cycle-detection.asciidoc[]
+include::duplicate-edge.asciidoc[]
+
include::if-then-based-grouping.asciidoc[]
include::pagination.asciidoc[]
@@ -212,4 +214,20 @@ g.V().hasLabel("student").as("s").
by(select("s").by("name")).
by(group().by(select("t").by(valueMap("fromTime","toTime"))).
by(select("c").dedup().values("name").fold())).next()
+----
+
+[[appendix-d]]
+_In the "modern" graph, with a duplicate edge added, find the vertex pairs that have more than one edge between them._
+
+[gremlin-groovy,modern]
+----
+g.V(1).as("a").V(3).addE("created").property("weight",0.4d).from("a").iterate()
+g.V(1).outE("created")
+g.V().as("a").
+ out().as("b").
+ groupCount().
+ by(select("a","b")).
+ unfold().
+ filter(select(values).is(gt(1))).
+ select(keys)
----
\ No newline at end of file
[22/50] [abbrv] tinkerpop git commit: Add another example for
appendix d of recipes.
Posted by sp...@apache.org.
Add another example for appendix d of recipes.
The addition find vertex pairs with more than one edge between them assuming undirected edges.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c14dde5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c14dde5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c14dde5
Branch: refs/heads/TINKERPOP-1565
Commit: 1c14dde500f24f90eabb3d0517ecce6c8626100f
Parents: 4be8a1b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 16 15:36:34 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jan 16 15:36:34 2017 -0500
----------------------------------------------------------------------
docs/src/recipes/appendix.asciidoc | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c14dde5/docs/src/recipes/appendix.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/appendix.asciidoc b/docs/src/recipes/appendix.asciidoc
index 9d0ea7b..15fda50 100644
--- a/docs/src/recipes/appendix.asciidoc
+++ b/docs/src/recipes/appendix.asciidoc
@@ -136,6 +136,16 @@ g.V().as("a").
select(keys)
----
+The following example assumes that the edges point in the `OUT` direction. Assuming undirected edges:
+
+[gremlin-groovy,modern]
+----
+g.V().where(without("x")).as("a").
+ outE().as("e").inV().as("b").
+ filter(bothE().where(neq("e")).otherV().where(eq("a"))).store("x").
+ select("a","b").dedup()
+----
+
[[appendix-e]]
_In the "crew" graph, find vertices that match on a complete set of multi-properties._
[38/50] [abbrv] tinkerpop git commit: Added docs for not()-step
Posted by sp...@apache.org.
Added docs for not()-step
Re-arranged some steps that were out of order CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/28e1d93f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/28e1d93f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/28e1d93f
Branch: refs/heads/TINKERPOP-1565
Commit: 28e1d93fe84fa35439ad81493daa270299461cfa
Parents: e80a4cd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 18 11:31:59 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 18 11:31:59 2017 -0500
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 90 +++++++++++++++-----------
1 file changed, 53 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/28e1d93f/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 6380efc..861adce 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -438,43 +438,6 @@ g.V().groupCount('a').by(label).groupCount('b').by(outE().count()).cap('a','b')
<1> Group and count verticies by their label. Emit the side effect labeled 'a', which is the group count by label.
<2> Same as statement 1, but also emit the side effect labeled 'b' which groups vertices by the number of out edges.
-[[coalesce-step]]
-Coalesce Step
-~~~~~~~~~~~~~
-
-The `coalesce()`-step evaluates the provided traversals in order and returns the first traversal that emits at
-least one element.
-
-[gremlin-groovy,modern]
-----
-g.V(1).coalesce(outE('knows'), outE('created')).inV().path().by('name').by(label)
-g.V(1).coalesce(outE('created'), outE('knows')).inV().path().by('name').by(label)
-g.V(1).property('nickname', 'okram')
-g.V().hasLabel('person').coalesce(values('nickname'), values('name'))
-----
-
-[[count-step]]
-Count Step
-~~~~~~~~~~
-
-image::count-step.png[width=195]
-
-The `count()`-step (*map*) counts the total number of represented traversers in the streams (i.e. the bulk count).
-
-[gremlin-groovy,modern]
-----
-g.V().count()
-g.V().hasLabel('person').count()
-g.V().hasLabel('person').outE('created').count().path() <1>
-g.V().hasLabel('person').outE('created').count().map {it.get() * 10}.path() <2>
-----
-
-<1> `count()`-step is a <<a-note-on-barrier-steps,reducing barrier step>> meaning that all of the previous traversers are folded into a new traverser.
-<2> The path of the traverser emanating from `count()` starts at `count()`.
-
-IMPORTANT: `count(local)` counts the current, local object (not the objects in the traversal stream). This works for
-`Collection`- and `Map`-type objects. For any other object, a count of 1 is returned.
-
[[choose-step]]
Choose Step
~~~~~~~~~~~
@@ -532,6 +495,21 @@ g.V().hasLabel('person').
option(none, values('name'))
----
+[[coalesce-step]]
+Coalesce Step
+~~~~~~~~~~~~~
+
+The `coalesce()`-step evaluates the provided traversals in order and returns the first traversal that emits at
+least one element.
+
+[gremlin-groovy,modern]
+----
+g.V(1).coalesce(outE('knows'), outE('created')).inV().path().by('name').by(label)
+g.V(1).coalesce(outE('created'), outE('knows')).inV().path().by('name').by(label)
+g.V(1).property('nickname', 'okram')
+g.V().hasLabel('person').coalesce(values('nickname'), values('name'))
+----
+
[[coin-step]]
Coin Step
~~~~~~~~~
@@ -565,6 +543,28 @@ g.V().coalesce(
<1> Show the names of people, but show "inhuman" for other vertices.
<2> Same as statement 1 (unless there is a person vertex with no name).
+[[count-step]]
+Count Step
+~~~~~~~~~~
+
+image::count-step.png[width=195]
+
+The `count()`-step (*map*) counts the total number of represented traversers in the streams (i.e. the bulk count).
+
+[gremlin-groovy,modern]
+----
+g.V().count()
+g.V().hasLabel('person').count()
+g.V().hasLabel('person').outE('created').count().path() <1>
+g.V().hasLabel('person').outE('created').count().map {it.get() * 10}.path() <2>
+----
+
+<1> `count()`-step is a <<a-note-on-barrier-steps,reducing barrier step>> meaning that all of the previous traversers are folded into a new traverser.
+<2> The path of the traverser emanating from `count()` starts at `count()`.
+
+IMPORTANT: `count(local)` counts the current, local object (not the objects in the traversal stream). This works for
+`Collection`- and `Map`-type objects. For any other object, a count of 1 is returned.
+
[[cyclicpath-step]]
CyclicPath Step
~~~~~~~~~~~~~~~
@@ -1184,6 +1184,22 @@ g.V().repeat(both()).times(3).values('age').min()
IMPORTANT: `min(local)` determines the min of the current, local object (not the objects in the traversal stream).
This works for `Collection` and `Number`-type objects. For any other object, a min of `Double.NaN` is returned.
+[[not-step]]
+Not Step
+~~~~~~~~
+
+The `not()`-step (*filter*) removes objects from the traversal stream when the traversal provided as an argument does
+not return any objects.
+
+[gremlin-groovy,modern]
+----
+g.V().not(hasLabel('person')).valueMap(true)
+g.V().hasLabel('person').
+ not(out('created').count().is(gt(1))).values('name') <1>
+----
+
+<1> josh created two projects and vadas none
+
[[option-step]]
Option Step
~~~~~~~~~~~