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 2015/04/28 19:14:30 UTC
[3/3] incubator-tinkerpop git commit: Properly constructed a typed
array list for GraphSON.
Properly constructed a typed array list for GraphSON.
Only use an embedded list when doing type embedding.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0b8b40eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0b8b40eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0b8b40eb
Branch: refs/heads/master
Commit: 0b8b40eb6e2606829399ad0765cce1efec74d2cc
Parents: 9d76521
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 28 13:13:32 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 28 13:13:32 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONSerializers.java | 9 ++++++---
.../driver/ser/AbstractJsonMessageSerializerV1d0.java | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0b8b40eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
index 1e0ac4e..d19b30b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
@@ -184,13 +184,16 @@ class GraphSONSerializers {
final Iterator<VertexProperty<Object>> vertexProperties = vertex.properties();
if (vertexProperties.hasNext()) {
jsonGenerator.writeArrayFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeString(ArrayList.class.getName());
- jsonGenerator.writeStartArray();
+ if (typeSerializer != null) {
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+ }
+
while (vertexProperties.hasNext()) {
jsonGenerator.writeObject(vertexProperties.next());
}
jsonGenerator.writeEndArray();
- jsonGenerator.writeEndArray();
+ if (typeSerializer != null) jsonGenerator.writeEndArray();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0b8b40eb/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
index 0058451..71f7f4c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
@@ -101,7 +101,6 @@ public abstract class AbstractJsonMessageSerializerV1d0 implements MessageSerial
ByteBuf encodedMessage = null;
try {
final byte[] payload = mapper.writeValueAsBytes(createResponseMessageMap(responseMessage));
- final String x = new String(payload, "UTF-8");
encodedMessage = allocator.buffer(payload.length);
encodedMessage.writeBytes(payload);