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 2015/05/26 15:36:17 UTC
[2/2] incubator-tinkerpop git commit: Explicitly specify
GraphSONVersion to serializers.
Explicitly specify GraphSONVersion to serializers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/483b3702
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/483b3702
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/483b3702
Branch: refs/heads/master
Commit: 483b3702cb13f73f507e0bfc7ae2117df04a0cf7
Parents: f1ce393
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 26 09:35:53 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 26 09:35:53 2015 -0400
----------------------------------------------------------------------
.../driver/ser/GraphSONMessageSerializerGremlinV1d0.java | 4 +++-
.../gremlin/driver/ser/GraphSONMessageSerializerV1d0.java | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/483b3702/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
index 834439d..7c6cc59 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.driver.ser;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import java.nio.ByteBuffer;
@@ -60,7 +61,8 @@ public class GraphSONMessageSerializerGremlinV1d0 extends AbstractGraphSONMessag
@Override
GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
- return builder.addCustomModule(new GraphSONMessageSerializerV1d0.GremlinServerModule())
+ return builder.version(GraphSONVersion.V1_0)
+ .addCustomModule(new GraphSONMessageSerializerV1d0.GremlinServerModule())
.embedTypes(true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/483b3702/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
index f4293a8..672b4df 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
@@ -22,6 +22,7 @@ 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,8 +62,9 @@ public class GraphSONMessageSerializerV1d0 extends AbstractGraphSONMessageSerial
}
@Override
- GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) {
- return builder.addCustomModule(new GremlinServerModule())
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ return builder.version(GraphSONVersion.V1_0)
+ .addCustomModule(new GremlinServerModule())
.embedTypes(false);
}