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/07/12 12:59:29 UTC
[12/24] tinkerpop git commit: Change "@class" to "@type" for GraphSON
2.0.
Change "@class" to "@type" for GraphSON 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4d88da1d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4d88da1d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4d88da1d
Branch: refs/heads/graphson-2.0
Commit: 4d88da1d2e7a1b77c7624d1532ed26fd76518ff2
Parents: e1b6dae
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Tue Jul 5 11:25:38 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Tue Jul 5 11:25:38 2016 +0100
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java | 2 +-
.../tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d88da1d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 620855e..6911021 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -101,7 +101,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder()
.typesEmbedding(getTypeInfo())
.init(JsonTypeInfo.Id.CUSTOM, graphSONTypeIdResolver)
- .typeProperty(GraphSONTokens.CLASS);
+ .typeProperty(GraphSONTokens.VALUETYPE);
// Register types to typeResolver for the GraphSON module
for (Map.Entry<String, Class> typeDeser : graphSONModule.getAddedDeserializers().entrySet()) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d88da1d/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 a91c2d4..1adee09 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
@@ -26,6 +26,7 @@ public final class GraphSONTokens {
private GraphSONTokens() {}
public static final String CLASS = "@class";
+ public static final String VALUETYPE = "@type";
public static final String ID = "id";
public static final String TYPE = "type";
public static final String VALUE = "value";