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 2018/03/27 18:02:17 UTC
[3/3] tinkerpop git commit: Minor fix to GraphSON type serializer
Minor fix to GraphSON type serializer
No need to check for the string JsonToken - the remaining shapes can be passed straight through. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bd0324c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bd0324c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bd0324c0
Branch: refs/heads/tp33
Commit: bd0324c0e9e7ec8e1d68a313aa07e4129e197249
Parents: 9a75f92
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 13:56:34 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 13:56:34 2018 -0400
----------------------------------------------------------------------
.../io/graphson/GraphSONTypeSerializerV3d0.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bd0324c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 4f4bbbb..3bdbc71 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -64,11 +64,7 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
@Override
public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
if (writableTypeId.forValue instanceof Map) {
writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
jsonGenerator.writeStartArray();
@@ -82,6 +78,8 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
} else {
jsonGenerator.writeStartArray();
}
+ } else if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
} else {
throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}
@@ -91,11 +89,7 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
@Override
public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypeSuffix(jsonGenerator);
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
if (writableTypeId.forValue instanceof Map) {
jsonGenerator.writeEndArray();
writeTypeSuffix(jsonGenerator);
@@ -109,6 +103,8 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
} else {
jsonGenerator.writeEndArray();
}
+ } else if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
} else {
throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}