Fixed GraphSONMessageSerializer tests.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7309230d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7309230d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7309230d Branch: refs/heads/TINKERPOP-1274 Commit: 7309230ddd43b793afa299b14c985a6a781477b1 Parents: b44ec66 Author: Kevin Gallardo <[email protected]> Authored: Wed Jun 29 15:00:44 2016 +0100 Committer: Kevin Gallardo <[email protected]> Committed: Thu Jun 30 10:39:47 2016 +0100 ---------------------------------------------------------------------- .../io/graphson/GraphSONSerializerProvider.java | 15 +++------------ .../ser/GraphSONMessageSerializerV2d0Test.java | 8 ++++---- 2 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7309230d/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 c4dcddd..c373692 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 @@ -33,7 +33,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.ToStringSerializer; */ final class GraphSONSerializerProvider extends DefaultSerializerProvider { private static final long serialVersionUID = 1L; - private final JsonSerializer<Object> unknownTypeSerializer; + private static JsonSerializer<Object> unknownTypeSerializer = new ToStringSerializer(); public GraphSONSerializerProvider(GraphSONVersion version) { super(); @@ -47,17 +47,8 @@ final class GraphSONSerializerProvider extends DefaultSerializerProvider { } protected GraphSONSerializerProvider(final SerializerProvider src, - final SerializationConfig config, final SerializerFactory f, - final GraphSONVersion version) { + final SerializationConfig config, final SerializerFactory f) { super(src, config, f); - if (version == GraphSONVersion.V1_0) { - setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer()); - unknownTypeSerializer = new ToStringSerializer(); - } else { - setDefaultKeySerializer(new GraphSONSerializersV2d0.GraphSONKeySerializer()); - unknownTypeSerializer = new ToStringGraphSONSerializer(); - } - } @Override @@ -68,6 +59,6 @@ final class GraphSONSerializerProvider extends DefaultSerializerProvider { @Override public GraphSONSerializerProvider createInstance(final SerializationConfig config, final SerializerFactory jsf) { - return new GraphSONSerializerProvider(this, config, jsf, GraphSONVersion.V1_0); + return new GraphSONSerializerProvider(this, config, jsf); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7309230d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java index 0e07d44..5100f05 100644 --- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java @@ -227,9 +227,9 @@ public class GraphSONMessageSerializerV2d0Test { final JsonNode edgeAsJson = converted.get(0); assertNotNull(edgeAsJson); - assertEquals(((Long) e.id()).longValue(), edgeAsJson.get(GraphSONTokens.ID).get(1).asLong()); // lossy - assertEquals(((Long) v1.id()).longValue(), edgeAsJson.get(GraphSONTokens.OUT).get(1).asLong());// lossy - assertEquals(((Long) v2.id()).longValue(), edgeAsJson.get(GraphSONTokens.IN).get(1).asLong()); // lossy + assertEquals(((Long) e.id()).longValue(), edgeAsJson.get(GraphSONTokens.ID).get(1).asLong()); + assertEquals(((Long) v1.id()).longValue(), edgeAsJson.get(GraphSONTokens.OUT).get(1).asLong()); + assertEquals(((Long) v2.id()).longValue(), edgeAsJson.get(GraphSONTokens.IN).get(1).asLong()); assertEquals(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText()); assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText()); @@ -434,7 +434,7 @@ public class GraphSONMessageSerializerV2d0Test { .get("properties").get("name").get(0).get("value").asText()); } - private static class FunObject { + private class FunObject { private String val; public FunObject(String val) {
