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 2016/08/23 10:44:22 UTC
[4/4] tinkerpop git commit: Added a 'bulk' graphson token.
Added a 'bulk' graphson token.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/098b81f7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/098b81f7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/098b81f7
Branch: refs/heads/TINKERPOP-1278
Commit: 098b81f7803f8b197d7c40b1a41d9068e7276df9
Parents: d05e15c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Aug 23 06:43:49 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Aug 23 06:43:49 2016 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java | 2 ++
.../structure/io/graphson/GraphSONTraversalSerializersV2d0.java | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/098b81f7/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 e24cbab..5171204 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
@@ -62,4 +62,6 @@ public final class GraphSONTokens {
public static final String NAME = "name";
public static final String COUNTS = "counts";
public static final String ANNOTATIONS = "annotations";
+
+ public static final String BULK = "Bulk";
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/098b81f7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
index 796e225..88b6f63 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
@@ -213,8 +213,7 @@ final class GraphSONTraversalSerializersV2d0 {
private void ser(final Traverser traverserInstance, final JsonGenerator jsonGenerator) throws IOException {
jsonGenerator.writeStartObject();
- jsonGenerator.writeStringField(GraphSONTokens.VALUETYPE, "Traverser");
- jsonGenerator.writeObjectField("bulk", traverserInstance.bulk());
+ jsonGenerator.writeObjectField(GraphSONTokens.BULK, traverserInstance.bulk());
jsonGenerator.writeObjectField(GraphSONTokens.VALUE, traverserInstance.get());
jsonGenerator.writeEndObject();
}
@@ -417,7 +416,7 @@ final class GraphSONTraversalSerializersV2d0 {
jsonParser.nextToken();
// This will automatically parse all typed stuff.
final Map<String, Object> mapData = deserializationContext.readValue(jsonParser, Map.class);
- return new DefaultRemoteTraverser<>(mapData.get(GraphSONTokens.VALUE), (Long) mapData.get("bulk"));
+ return new DefaultRemoteTraverser<>(mapData.get(GraphSONTokens.VALUE), (Long) mapData.get(GraphSONTokens.BULK));
}
}
}