Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 991A9200CDA for ; Fri, 4 Aug 2017 18:58:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 978D516DE5D; Fri, 4 Aug 2017 16:58:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E4FF216DE5B for ; Fri, 4 Aug 2017 18:58:47 +0200 (CEST) Received: (qmail 559 invoked by uid 500); 4 Aug 2017 16:58:42 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 538 invoked by uid 99); 4 Aug 2017 16:58:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2017 16:58:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 685BDF5852; Fri, 4 Aug 2017 16:58:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkuppitz@apache.org To: commits@tinkerpop.apache.org Date: Fri, 04 Aug 2017 16:58:54 -0000 Message-Id: <93cb307cff2b40c69398d92270ea4b48@git.apache.org> In-Reply-To: <82d50bdfb79f49e1824f1220957a84cc@git.apache.org> References: <82d50bdfb79f49e1824f1220957a84cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] tinkerpop git commit: Needed to specify the exact version of Gryo in the serializer archived-at: Fri, 04 Aug 2017 16:58:48 -0000 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 Authored: Thu Jul 20 15:38:10 2017 -0400 Committer: Stephen Mallette 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 config, final Map 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 config, final Map 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);