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 67FA9200CC4 for ; Thu, 13 Jul 2017 19:27:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6743116C74A; Thu, 13 Jul 2017 17:27:21 +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 B951016C73E for ; Thu, 13 Jul 2017 19:27:20 +0200 (CEST) Received: (qmail 13285 invoked by uid 500); 13 Jul 2017 17:27:19 -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 13231 invoked by uid 99); 13 Jul 2017 17:27:18 -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; Thu, 13 Jul 2017 17:27:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AA0E3DFF8A; Thu, 13 Jul 2017 17:27:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Thu, 13 Jul 2017 17:27:18 -0000 Message-Id: <8221a80f05314918b41b3764321e0f8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/34] tinkerpop git commit: TINKERPOP-1427 Should use GraphSON 3.0 in the serializer provider archived-at: Thu, 13 Jul 2017 17:27:21 -0000 Repository: tinkerpop Updated Branches: refs/heads/master bb108ccea -> 3ce806996 TINKERPOP-1427 Should use GraphSON 3.0 in the serializer provider Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/12bbbf40 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/12bbbf40 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/12bbbf40 Branch: refs/heads/master Commit: 12bbbf40586f4e8cf2885b2e1fcc18bd2572e7ba Parents: 49f30e4 Author: Stephen Mallette Authored: Fri Jun 30 14:00:13 2017 -0400 Committer: Stephen Mallette Committed: Thu Jul 13 12:51:37 2017 -0400 ---------------------------------------------------------------------- .../structure/io/graphson/GraphSONSerializerProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/12bbbf40/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java index 458a2d9..bd7f966 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializerProvider.java @@ -40,9 +40,12 @@ final class GraphSONSerializerProvider extends DefaultSerializerProvider { if (version == GraphSONVersion.V1_0) { setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer()); unknownTypeSerializer = new ToStringSerializer(); - } else { + } else if (version == GraphSONVersion.V2_0) { setDefaultKeySerializer(new GraphSONSerializersV2d0.GraphSONKeySerializer()); unknownTypeSerializer = new ToStringGraphSONSerializer(); + } else { + setDefaultKeySerializer(new GraphSONSerializersV3d0.GraphSONKeySerializer()); + unknownTypeSerializer = new ToStringGraphSONSerializer(); } }