Needed to specify the exact version of Gryo in the serializer

This only executes when the message serializer is built via configuration. The 
GryoMapper version needs to be set manually in there. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/89b35b31
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/89b35b31
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/89b35b31

Branch: refs/heads/TINKERPOP-1682
Commit: 89b35b31c96144281ac2eadd806b4e630a48095b
Parents: 327b913
Author: Stephen Mallette <[email protected]>
Authored: Thu Jul 20 15:38:10 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Thu Jul 20 15:38:10 2017 -0400

----------------------------------------------------------------------
 .../gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java     | 3 ++-
 .../gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89b35b31/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
index 1b4c180..223a62e 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
@@ -26,6 +26,7 @@ import 
org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
 import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.shaded.kryo.ClassResolver;
 import org.apache.tinkerpop.shaded.kryo.Kryo;
 import org.apache.tinkerpop.shaded.kryo.Serializer;
@@ -86,7 +87,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 
extends AbstractMessageS
 
     @Override
     public final void configure(final Map<String, Object> config, final 
Map<String, Graph> graphs) {
-        final GryoMapper.Builder builder = GryoMapper.build();
+        final GryoMapper.Builder builder = 
GryoMapper.build().version(GryoVersion.V1_0);
         addIoRegistries(config, builder);
         addClassResolverSupplier(config, builder);
         addCustomClasses(config, builder);

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89b35b31/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
----------------------------------------------------------------------
diff --git 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
index 63cfa64..d74a106 100644
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
@@ -25,6 +25,7 @@ import 
org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
 import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoVersion;
 import org.apache.tinkerpop.shaded.kryo.ClassResolver;
 import org.apache.tinkerpop.shaded.kryo.Kryo;
 import org.apache.tinkerpop.shaded.kryo.Serializer;
@@ -82,7 +83,7 @@ public abstract class AbstractGryoMessageSerializerV3d0 
extends AbstractMessageS
 
     @Override
     public final void configure(final Map<String, Object> config, final 
Map<String, Graph> graphs) {
-        final GryoMapper.Builder builder = GryoMapper.build();
+        final GryoMapper.Builder builder = 
GryoMapper.build().version(GryoVersion.V3_0);
         addIoRegistries(config, builder);
         addClassResolverSupplier(config, builder);
         addCustomClasses(config, builder);

Reply via email to