You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/08/24 11:34:02 UTC
tinkerpop git commit: updated TraversalJacksonSerializer as
recommended by Kevin. Also,
fixed a naming issue in TraverserJacksonSerializer.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 136531ea2 -> 79120e543
updated TraversalJacksonSerializer as recommended by Kevin. Also, fixed a naming issue in TraverserJacksonSerializer.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79120e54
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79120e54
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/79120e54
Branch: refs/heads/TINKERPOP-1278
Commit: 79120e5433b96ee72ee63de33bb948346301b172
Parents: 136531e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Aug 24 05:33:58 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Aug 24 05:33:58 2016 -0600
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONModule.java | 6 ++----
.../io/graphson/GraphSONTraversalSerializersV2d0.java | 11 +++++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79120e54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 440904e..5aeae98 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -42,8 +42,6 @@ import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONDeserializer;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1d0;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2d0;
import org.apache.tinkerpop.gremlin.util.function.Lambda;
@@ -198,7 +196,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
addSerializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonSerializer());
addSerializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonSerializer());
addSerializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonSerializer());
- addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserSerializer());
+ addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserJacksonSerializer());
/////////////////////// DESERIALIZERS ////////////////////////////
@@ -340,7 +338,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
addSerializer(P.class, new GraphSONTraversalSerializersV2d0.PJacksonSerializer());
addSerializer(Lambda.class, new GraphSONTraversalSerializersV2d0.LambdaJacksonSerializer());
addSerializer(Bytecode.Binding.class, new GraphSONTraversalSerializersV2d0.BindingJacksonSerializer());
- addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserSerializer());*/
+ addSerializer(Traverser.class, new GraphSONTraversalSerializersV2d0.TraverserJacksonSerializer());*/
// -- deserializers for traversal
addDeserializer(Bytecode.class, new GraphSONTraversalSerializersV2d0.BytecodeJacksonDeserializer());
//addDeserializer(Enum.class, new GraphSONTraversalSerializersV2d0.EnumJacksonDeserializer());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79120e54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
index d2bad29..ef3fd04 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTraversalSerializersV2d0.java
@@ -34,6 +34,7 @@ import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdScalarSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
@@ -67,6 +68,12 @@ final class GraphSONTraversalSerializersV2d0 {
jsonGenerator.writeObject(traversal.asAdmin().getBytecode());
}
+ @Override
+ public void serializeWithType(final Traversal traversal, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException {
+ serialize(traversal, jsonGenerator, serializerProvider);
+ }
+
}
final static class BytecodeJacksonSerializer extends StdScalarSerializer<Bytecode> {
@@ -194,9 +201,9 @@ final class GraphSONTraversalSerializersV2d0 {
}
- final static class TraverserSerializer extends StdScalarSerializer<Traverser> {
+ final static class TraverserJacksonSerializer extends StdScalarSerializer<Traverser> {
- public TraverserSerializer() {
+ public TraverserJacksonSerializer() {
super(Traverser.class);
}