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:28 UTC
[1/3] incubator-tinkerpop git commit: Got failing test working after
yesterday's GraphSON refactoring.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 311db29fd -> 0b8b40eb6
Got failing test working after yesterday's GraphSON refactoring.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/de016233
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/de016233
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/de016233
Branch: refs/heads/master
Commit: de016233134dbefd1cbb7ad48d590e2d37af2a9a
Parents: c8dcead
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 28 13:00:38 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 28 13:00:38 2015 -0400
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONSerializers.java | 11 ++++++++---
.../driver/ser/AbstractJsonMessageSerializerV1d0.java | 1 +
.../driver/ser/JsonMessageSerializerGremlinV1d0Test.java | 8 +++-----
3 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/de016233/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 107b2aa..1e0ac4e 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
@@ -172,21 +172,25 @@ class GraphSONSerializers {
throws IOException {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- serializerProvider.defaultSerializeField(GraphSONTokens.ID, vertex.id(), jsonGenerator);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
- writeProperties(vertex, jsonGenerator);
+ writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
jsonGenerator.writeEndObject();
}
- private static void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator) throws IOException {
+ private static void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
final Iterator<VertexProperty<Object>> vertexProperties = vertex.properties();
if (vertexProperties.hasNext()) {
jsonGenerator.writeArrayFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
while (vertexProperties.hasNext()) {
jsonGenerator.writeObject(vertexProperties.next());
}
jsonGenerator.writeEndArray();
+ jsonGenerator.writeEndArray();
}
}
@@ -327,6 +331,7 @@ class GraphSONSerializers {
final SerializerProvider serializerProvider,
final TypeSerializer typeSerializer) throws IOException {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
final Iterator<Property<Object>> metaProperties = property.properties();
while (metaProperties.hasNext()) {
final Property<Object> metaProperty = metaProperties.next();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/de016233/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 71f7f4c..0058451 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,6 +101,7 @@ 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);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/de016233/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
index 087e473..da4ce64 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0Test.java
@@ -160,9 +160,7 @@ public class JsonMessageSerializerGremlinV1d0Test {
assertEquals(123, propertyList.get(0).get("value"));
}
- // todo: gotta get this one working......
@Test
- @org.junit.Ignore
public void serializeVertexWithEmbeddedMap() throws Exception {
final Graph graph = TinkerGraph.open();
final Vertex v = graph.addVertex();
@@ -189,10 +187,10 @@ public class JsonMessageSerializerGremlinV1d0Test {
assertEquals(v.id(), deserializedVertex.get(GraphSONTokens.ID));
assertEquals(Vertex.DEFAULT_LABEL, deserializedVertex.get(GraphSONTokens.LABEL));
- final Map<String, Object> properties = (Map<String, Object>) deserializedVertex.get(GraphSONTokens.PROPERTIES);
- assertEquals(1, properties.size());
+ final Map<String, Object> properties = ((List<Map<String, Object>>) deserializedVertex.get(GraphSONTokens.PROPERTIES)).get(0);
+ assertEquals(3, properties.size());
- final List<Object> deserializedInnerList = (List<Object>) ((Map<String, Object>) ((List<Object>) properties.get("friends")).get(0)).get(GraphSONTokens.VALUE);
+ final List<Object> deserializedInnerList = (List<Object>) properties.get(GraphSONTokens.VALUE);
assertEquals(3, deserializedInnerList.size());
assertEquals("x", deserializedInnerList.get(0));
assertEquals(5, deserializedInnerList.get(1));
[2/3] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9d76521d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9d76521d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9d76521d
Branch: refs/heads/master
Commit: 9d76521dd18c32ac811a7a04a01b17365aa3f77e
Parents: de01623 311db29
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 28 13:13:27 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 28 13:13:27 2015 -0400
----------------------------------------------------------------------
.../structure/io/gryo/GryoOutputFormat.java | 4 -
.../io/TestFileReaderWriterHelper.java | 123 +++++++++++++++++++
.../GraphSONRecordReaderWriterTest.java | 87 ++-----------
.../io/gryo/GryoRecordReaderWriterTest.java | 96 ++-------------
4 files changed, 142 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-tinkerpop git commit: Properly constructed a typed
array list for GraphSON.
Posted by sp...@apache.org.
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);