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 2016/06/30 17:33:30 UTC
[01/50] [abbrv] tinkerpop git commit: the latest up-merge from tp31
had a minor bug.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1274 f5b64fafb -> 10abe8e14
the latest up-merge from tp31 had a minor bug.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a526eb5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a526eb5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a526eb5
Branch: refs/heads/TINKERPOP-1274
Commit: 1a526eb5bf95aac8388d9e4935659344c933dcdc
Parents: 8147e11
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 14 15:05:25 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 14 15:05:25 2016 -0600
----------------------------------------------------------------------
.../process/traversal/step/map/GroovyPropertiesTest.groovy | 2 +-
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a526eb5/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 895eccd..eb161d7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -47,7 +47,7 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal<Vertex, VertexProperty<String>> get_g_V_hasXageX_propertiesXnameX() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('age').properties('name')", g)
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('age').properties('name')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a526eb5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..d0445a9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph, vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph, vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
- assertEquals(convertToVertex(graph, vertexProperty.value()), vertexProperty.element());
- assertEquals(convertToVertexId(graph, vertexProperty.value()), vertexProperty.element().id());
+ //assertEquals(convertToVertex(graph, vertexProperty.value()), vertexProperty.element());
+ //assertEquals(convertToVertexId(graph, vertexProperty.value()), vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[13/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/reference/implementations-hadoop.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c166325
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c166325
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c166325
Branch: refs/heads/TINKERPOP-1274
Commit: 6c1663255591748deb1fab7fd5cf9f7ab987ad08
Parents: c2d2a7d e3c5d8e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:28:43 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:28:43 2016 -0400
----------------------------------------------------------------------
docs/src/dev/provider/index.asciidoc | 67 +++++++++++++++++++
.../reference/implementations-hadoop.asciidoc | 70 +-------------------
2 files changed, 68 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c166325/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/dev/provider/index.asciidoc
index 00dd770,7b876a1..90ab5c0
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@@ -290,6 -288,48 +290,73 @@@ for (final MapReduce mapReduce : mapRed
<2> If there is no reduce stage, the the map-stage results are inserted into Memory as specified by the application
developer's `MapReduce.addResultToMemory()` implementation.
+ Hadoop-Gremlin Usage
+ ^^^^^^^^^^^^^^^^^^^^
+
+ Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a 3rd-party graph system provider wishes to
+ leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then they need to provide, at minimum, a
+ Hadoop2 `InputFormat<NullWritable,VertexWritable>` for their graph system. If the provider wishes to persist computed
+ results back to their graph system (and not just to HDFS via a `FileOutputFormat`), then a graph system specific
+ `OutputFormat<NullWritable,VertexWritable>` must be developed as well.
+
+ Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object. There is no "data" in the `HadoopGraph` as
+ the `InputFormat` specifies where and how to get the graph data at OLAP (and OLTP) runtime. Thus, `HadoopGraph` is a
+ small object with little overhead. Graph system providers should realize `HadoopGraph` as the gateway to the OLAP
+ features offered by Hadoop-Gremlin. For example, a graph system specific `Graph.compute(Class<? extends GraphComputer>
+ graphComputerClass)`-method may look as follows:
+
+ [source,java]
+ ----
+ public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) throws IllegalArgumentException {
+ try {
+ if (AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
+ return graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
+ else
+ throw Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+ } catch (final Exception e) {
+ throw new IllegalArgumentException(e.getMessage(),e);
+ }
+ }
+ ----
+
+ Note that the configurations for Hadoop are assumed to be in the `Graph.configuration()` object. If this is not the
+ case, then the `Configuration` provided to `HadoopGraph.open()` should be dynamically created within the
+ `compute()`-method. It is in the provided configuration that `HadoopGraph` gets the various properties which
-determine how to read and write data to and from Hadoop. For instance, `gremlin.hadoop.graphInputFormat` and
-`gremlin.hadoop.graphOutputFormat`.
++determine how to read and write data to and from Hadoop. For instance, `gremlin.hadoop.graphReader` and
++`gremlin.hadoop.graphWriter`.
++
++GraphFilterAware Interface
++++++++++++++++++++++++++++
++
++<<graph-filter,Graph filters>> by OLAP processors to only pull a subgraph of the full graph from the graph data source. For instance, the
++example below constructs a `GraphFilter` that will only pull the the "knows"-graph amongst people into the `GraphComputer`
++for processing.
++
++[source,java]
++----
++graph.compute().vertices(hasLabel("person")).edges(bothE("knows"))
++----
++
++If the provider has a custom `InputRDD`, they can implement `GraphFilterAware` and that graph filter will be provided to their
++`InputRDD` at load time. For providers that use an `InputFormat`, state but the graph filter can be accessed from the configuration
++as such:
++
++[source,java]
++----
++if (configuration.containsKey(Constants.GREMLIN_HADOOP_GRAPH_FILTER))
++ this.graphFilter = VertexProgramHelper.deserialize(configuration, Constants.GREMLIN_HADOOP_GRAPH_FILTER);
++----
++
++PersistResultGraphAware Interface
+++++++++++++++++++++++++++++++++++
+
-IMPORTANT: A graph system provider's `OutputFormat` should implement the `PersistResultGraphAware` interface which
++A graph system provider's `OutputFormat` should implement the `PersistResultGraphAware` interface which
+ determines which persistence options are available to the user. For the standard file-based `OutputFormats` provided
+ by Hadoop-Gremlin (e.g. <<gryo-io-format,`GryoOutputFormat`>>, <<graphson-io-format,`GraphSONOutputFormat`>>,
+ and <<script-io-format,`ScriptInputOutputFormat`>>) `ResultGraph.ORIGINAL` is not supported as the original graph
+ data files are not random access and are, in essence, immutable. Thus, these file-based `OutputFormats` only support
+ `ResultGraph.NEW` which creates a copy of the data specified by the `Persist` enum.
+
[[io-implementations]]
IO Implementations
^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c166325/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
[37/50] [abbrv] tinkerpop git commit: Frame up for GraphSON 2.0
Posted by sp...@apache.org.
Frame up for GraphSON 2.0
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0554b59b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0554b59b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0554b59b
Branch: refs/heads/TINKERPOP-1274
Commit: 0554b59bfcc5944e8b1c007cce178c8945fc040c
Parents: 5395aae
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 18 08:41:26 2016 -0400
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:39:41 2016 +0100
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONMapper.java | 20 +-
.../structure/io/graphson/GraphSONModule.java | 141 ++++--
.../io/graphson/GraphSONSerializers.java | 465 -------------------
.../io/graphson/GraphSONSerializersV1d0.java | 465 +++++++++++++++++++
.../structure/io/graphson/GraphSONVersion.java | 3 +-
.../io/graphson/JavaTimeSerializers.java | 326 -------------
.../io/graphson/JavaTimeSerializersV1d0.java | 326 +++++++++++++
.../io/graphson/JavaUtilSerializers.java | 86 ----
.../io/graphson/JavaUtilSerializersV1d0.java | 86 ++++
9 files changed, 997 insertions(+), 921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 73e9552..be5377a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -75,12 +75,18 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
final ObjectMapper om = new ObjectMapper();
om.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
- if (embedTypes) {
- final TypeResolverBuilder<?> typer = new StdTypeResolverBuilder()
- .init(JsonTypeInfo.Id.CLASS, null)
- .inclusion(JsonTypeInfo.As.PROPERTY)
- .typeProperty(GraphSONTokens.CLASS);
- om.setDefaultTyping(typer);
+ if (version == GraphSONVersion.V1_0) {
+ if (embedTypes) {
+ final TypeResolverBuilder<?> typer = new StdTypeResolverBuilder()
+ .init(JsonTypeInfo.Id.CLASS, null)
+ .inclusion(JsonTypeInfo.As.PROPERTY)
+ .typeProperty(GraphSONTokens.CLASS);
+ om.setDefaultTyping(typer);
+ }
+ } else if (version == GraphSONVersion.V2_0) {
+
+ } else {
+ throw new IllegalStateException("Unknown GraphSONVersion");
}
if (normalize)
@@ -88,7 +94,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
// this provider toStrings all unknown classes and converts keys in Map objects that are Object to String.
final DefaultSerializerProvider provider = new GraphSONSerializerProvider();
- provider.setDefaultKeySerializer(new GraphSONSerializers.GraphSONKeySerializer());
+ provider.setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer());
om.setSerializerProvider(provider);
om.registerModule(version.getBuilder().create(normalize));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/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 7cc6c91..639e90d 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
@@ -61,6 +61,75 @@ abstract class GraphSONModule extends SimpleModule {
}
/**
+ * Version 2.0 of GraphSON.
+ */
+ static final class GraphSONModuleV2d0 extends GraphSONModule {
+
+ /**
+ * Constructs a new object.
+ */
+ protected GraphSONModuleV2d0(final boolean normalize) {
+ super("graphson-2.0");
+ // graph
+ addSerializer(Edge.class, new GraphSONSerializersV1d0.EdgeJacksonSerializer(normalize));
+ addSerializer(Vertex.class, new GraphSONSerializersV1d0.VertexJacksonSerializer(normalize));
+ addSerializer(VertexProperty.class, new GraphSONSerializersV1d0.VertexPropertyJacksonSerializer(normalize));
+ addSerializer(Property.class, new GraphSONSerializersV1d0.PropertyJacksonSerializer());
+ addSerializer(TraversalMetrics.class, new GraphSONSerializersV1d0.TraversalMetricsJacksonSerializer());
+ addSerializer(TraversalExplanation.class, new GraphSONSerializersV1d0.TraversalExplanationJacksonSerializer());
+ addSerializer(Path.class, new GraphSONSerializersV1d0.PathJacksonSerializer());
+ addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer(normalize));
+ addSerializer(Tree.class, new GraphSONSerializersV1d0.TreeJacksonSerializer());
+
+ // java.util
+ addSerializer(Map.Entry.class, new JavaUtilSerializersV1d0.MapEntryJacksonSerializer());
+
+ // java.time
+ addSerializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonSerializer());
+ addSerializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonSerializer());
+ addSerializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonSerializer());
+ addSerializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonSerializer());
+ addSerializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonSerializer());
+ addSerializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonSerializer());
+ addSerializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonSerializer());
+ addSerializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonSerializer());
+ addSerializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonSerializer());
+ addSerializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonSerializer());
+ addSerializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonSerializer());
+ addSerializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonSerializer());
+ addSerializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonSerializer());
+
+ addDeserializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonDeserializer());
+ addDeserializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonDeserializer());
+ addDeserializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonDeserializer());
+ addDeserializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonDeserializer());
+ addDeserializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonDeserializer());
+ addDeserializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonDeserializer());
+ addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonDeserializer());
+ addDeserializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonDeserializer());
+ addDeserializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonDeserializer());
+ addDeserializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonDeserializer());
+ addDeserializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonDeserializer());
+ addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonDeserializer());
+ addDeserializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonDeserializer());
+ }
+
+ public static Builder build() {
+ return new Builder();
+ }
+
+ static final class Builder implements GraphSONModuleBuilder {
+
+ private Builder() {}
+
+ @Override
+ public GraphSONModule create(final boolean normalize) {
+ return new GraphSONModuleV2d0(normalize);
+ }
+ }
+ }
+
+ /**
* Version 1.0 of GraphSON.
*/
static final class GraphSONModuleV1d0 extends GraphSONModule {
@@ -71,47 +140,47 @@ abstract class GraphSONModule extends SimpleModule {
protected GraphSONModuleV1d0(final boolean normalize) {
super("graphson-1.0");
// graph
- addSerializer(Edge.class, new GraphSONSerializers.EdgeJacksonSerializer(normalize));
- addSerializer(Vertex.class, new GraphSONSerializers.VertexJacksonSerializer(normalize));
- addSerializer(VertexProperty.class, new GraphSONSerializers.VertexPropertyJacksonSerializer(normalize));
- addSerializer(Property.class, new GraphSONSerializers.PropertyJacksonSerializer());
- addSerializer(TraversalMetrics.class, new GraphSONSerializers.TraversalMetricsJacksonSerializer());
- addSerializer(TraversalExplanation.class, new GraphSONSerializers.TraversalExplanationJacksonSerializer());
- addSerializer(Path.class, new GraphSONSerializers.PathJacksonSerializer());
+ addSerializer(Edge.class, new GraphSONSerializersV1d0.EdgeJacksonSerializer(normalize));
+ addSerializer(Vertex.class, new GraphSONSerializersV1d0.VertexJacksonSerializer(normalize));
+ addSerializer(VertexProperty.class, new GraphSONSerializersV1d0.VertexPropertyJacksonSerializer(normalize));
+ addSerializer(Property.class, new GraphSONSerializersV1d0.PropertyJacksonSerializer());
+ addSerializer(TraversalMetrics.class, new GraphSONSerializersV1d0.TraversalMetricsJacksonSerializer());
+ addSerializer(TraversalExplanation.class, new GraphSONSerializersV1d0.TraversalExplanationJacksonSerializer());
+ addSerializer(Path.class, new GraphSONSerializersV1d0.PathJacksonSerializer());
addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer(normalize));
- addSerializer(Tree.class, new GraphSONSerializers.TreeJacksonSerializer());
+ addSerializer(Tree.class, new GraphSONSerializersV1d0.TreeJacksonSerializer());
// java.util
- addSerializer(Map.Entry.class, new JavaUtilSerializers.MapEntryJacksonSerializer());
+ addSerializer(Map.Entry.class, new JavaUtilSerializersV1d0.MapEntryJacksonSerializer());
// java.time
- addSerializer(Duration.class, new JavaTimeSerializers.DurationJacksonSerializer());
- addSerializer(Instant.class, new JavaTimeSerializers.InstantJacksonSerializer());
- addSerializer(LocalDate.class, new JavaTimeSerializers.LocalDateJacksonSerializer());
- addSerializer(LocalDateTime.class, new JavaTimeSerializers.LocalDateTimeJacksonSerializer());
- addSerializer(LocalTime.class, new JavaTimeSerializers.LocalTimeJacksonSerializer());
- addSerializer(MonthDay.class, new JavaTimeSerializers.MonthDayJacksonSerializer());
- addSerializer(OffsetDateTime.class, new JavaTimeSerializers.OffsetDateTimeJacksonSerializer());
- addSerializer(OffsetTime.class, new JavaTimeSerializers.OffsetTimeJacksonSerializer());
- addSerializer(Period.class, new JavaTimeSerializers.PeriodJacksonSerializer());
- addSerializer(Year.class, new JavaTimeSerializers.YearJacksonSerializer());
- addSerializer(YearMonth.class, new JavaTimeSerializers.YearMonthJacksonSerializer());
- addSerializer(ZonedDateTime.class, new JavaTimeSerializers.ZonedDateTimeJacksonSerializer());
- addSerializer(ZoneOffset.class, new JavaTimeSerializers.ZoneOffsetJacksonSerializer());
-
- addDeserializer(Duration.class, new JavaTimeSerializers.DurationJacksonDeserializer());
- addDeserializer(Instant.class, new JavaTimeSerializers.InstantJacksonDeserializer());
- addDeserializer(LocalDate.class, new JavaTimeSerializers.LocalDateJacksonDeserializer());
- addDeserializer(LocalDateTime.class, new JavaTimeSerializers.LocalDateTimeJacksonDeserializer());
- addDeserializer(LocalTime.class, new JavaTimeSerializers.LocalTimeJacksonDeserializer());
- addDeserializer(MonthDay.class, new JavaTimeSerializers.MonthDayJacksonDeserializer());
- addDeserializer(OffsetDateTime.class, new JavaTimeSerializers.OffsetDateTimeJacksonDeserializer());
- addDeserializer(OffsetTime.class, new JavaTimeSerializers.OffsetTimeJacksonDeserializer());
- addDeserializer(Period.class, new JavaTimeSerializers.PeriodJacksonDeserializer());
- addDeserializer(Year.class, new JavaTimeSerializers.YearJacksonDeserializer());
- addDeserializer(YearMonth.class, new JavaTimeSerializers.YearMonthJacksonDeserializer());
- addDeserializer(ZonedDateTime.class, new JavaTimeSerializers.ZonedDateTimeJacksonDeserializer());
- addDeserializer(ZoneOffset.class, new JavaTimeSerializers.ZoneOffsetJacksonDeserializer());
+ addSerializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonSerializer());
+ addSerializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonSerializer());
+ addSerializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonSerializer());
+ addSerializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonSerializer());
+ addSerializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonSerializer());
+ addSerializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonSerializer());
+ addSerializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonSerializer());
+ addSerializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonSerializer());
+ addSerializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonSerializer());
+ addSerializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonSerializer());
+ addSerializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonSerializer());
+ addSerializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonSerializer());
+ addSerializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonSerializer());
+
+ addDeserializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonDeserializer());
+ addDeserializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonDeserializer());
+ addDeserializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonDeserializer());
+ addDeserializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonDeserializer());
+ addDeserializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonDeserializer());
+ addDeserializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonDeserializer());
+ addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonDeserializer());
+ addDeserializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonDeserializer());
+ addDeserializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonDeserializer());
+ addDeserializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonDeserializer());
+ addDeserializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonDeserializer());
+ addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonDeserializer());
+ addDeserializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonDeserializer());
}
public static Builder build() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/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
deleted file mode 100644
index aaca316..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-import org.javatuples.Pair;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-
-/**
- * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
- * present a generalized way to serialize the implementations of core interfaces.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-final class GraphSONSerializers {
-
- private GraphSONSerializers() {}
-
- final static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
-
- private final boolean normalize;
-
- public VertexPropertyJacksonSerializer(final boolean normalize) {
- super(VertexProperty.class);
- this.normalize = normalize;
- }
-
- @Override
- public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize, true);
- }
-
- @Override
- public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize, true);
- }
- }
-
- final static class PropertyJacksonSerializer extends StdSerializer<Property> {
-
- public PropertyJacksonSerializer() {
- super(Property.class);
- }
-
- @Override
- public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- ser(property, jsonGenerator, serializerProvider, null);
- }
- @Override
- public void serializeWithType(final Property property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- ser(property, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- private static void ser(final Property property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
- serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
- jsonGenerator.writeEndObject();
- }
- }
-
- final static class EdgeJacksonSerializer extends StdSerializer<Edge> {
-
- private final boolean normalize;
-
- public EdgeJacksonSerializer(final boolean normalize) {
- super(Edge.class);
- this.normalize = normalize;
- }
-
-
- @Override
- public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- ser(edge, jsonGenerator, serializerProvider, null);
- }
- @Override
- public void serializeWithType(final Edge edge, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- ser(edge, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- private void ser(final Edge edge, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
-
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
- jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.EDGE);
- jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
- jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
- GraphSONUtil.writeWithType(GraphSONTokens.IN, edge.inVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
- GraphSONUtil.writeWithType(GraphSONTokens.OUT, edge.outVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
- writeProperties(edge, jsonGenerator, serializerProvider, typeSerializer);
- jsonGenerator.writeEndObject();
- }
-
- private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
- final Iterator<Property<Object>> elementProperties = normalize ?
- IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
- if (elementProperties.hasNext()) {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- while (elementProperties.hasNext()) {
- final Property<Object> elementProperty = elementProperties.next();
- GraphSONUtil.writeWithType(elementProperty.key(), elementProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
- }
- jsonGenerator.writeEndObject();
- }
- }
-
- }
-
- final static class VertexJacksonSerializer extends StdSerializer<Vertex> {
-
- private final boolean normalize;
-
- public VertexJacksonSerializer(final boolean normalize) {
- super(Vertex.class);
- this.normalize = normalize;
- }
-
- @Override
- public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- ser(vertex, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final Vertex vertex, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- ser(vertex, jsonGenerator, serializerProvider, typeSerializer);
-
- }
-
- private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
- throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
- jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
- writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
- jsonGenerator.writeEndObject();
- }
-
- private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
- final List<String> keys = normalize ?
- IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
- for (String key : keys) {
- final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
- IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
-
- if (vertexProperties.hasNext()) {
- jsonGenerator.writeArrayFieldStart(key);
- if (typeSerializer != null) {
- jsonGenerator.writeString(ArrayList.class.getName());
- jsonGenerator.writeStartArray();
- }
-
- while (vertexProperties.hasNext()) {
- serializerVertexProperty(vertexProperties.next(), jsonGenerator, serializerProvider, typeSerializer, normalize, false);
- }
-
- jsonGenerator.writeEndArray();
- if (typeSerializer != null) jsonGenerator.writeEndArray();
- }
- }
-
- jsonGenerator.writeEndObject();
- }
-
- }
-
- final static class PathJacksonSerializer extends StdSerializer<Path> {
-
- public PathJacksonSerializer() {
- super(Path.class);
- }
- @Override
- public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException, JsonGenerationException {
- ser(path, jsonGenerator, null);
- }
-
- @Override
- public void serializeWithType(final Path path, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
- throws IOException, JsonProcessingException {
- ser(path, jsonGenerator, typeSerializer);
- }
- private static void ser(final Path path, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
- throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
- jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
- jsonGenerator.writeEndObject();
- }
-
- }
-
- final static class TreeJacksonSerializer extends StdSerializer<Tree> {
-
- public TreeJacksonSerializer() {
- super(Tree.class);
- }
-
- @Override
- public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- ser(tree, jsonGenerator, null);
- }
-
- @Override
- public void serializeWithType(final Tree tree, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
- throws IOException, JsonProcessingException {
- ser(tree, jsonGenerator, typeSerializer);
- }
-
- private static void ser(final Tree tree, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
- throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
- Set<Map.Entry<Element, Tree>> set = tree.entrySet();
- for(Map.Entry<Element, Tree> entry : set)
- {
- jsonGenerator.writeObjectFieldStart(entry.getKey().id().toString());
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
- jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndObject();
- }
- }
-
- /**
- * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
- */
- final static class GraphSONKeySerializer extends StdKeySerializer {
-
- @Override
- public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
- ser(o, jsonGenerator, serializerProvider);
- }
- @Override
- public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- ser(o, jsonGenerator, serializerProvider);
- }
-
- private void ser(final Object o, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException {
- if (Element.class.isAssignableFrom(o.getClass()))
- jsonGenerator.writeFieldName((((Element) o).id()).toString());
- else
- super.serialize(o, jsonGenerator, serializerProvider);
- }
- }
-
- final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
- public TraversalExplanationJacksonSerializer() {
- super(TraversalExplanation.class);
- }
-
- @Override
- public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException {
- ser(traversalExplanation, jsonGenerator);
- }
-
- @Override
- public void serializeWithType(final TraversalExplanation value, final JsonGenerator gen,
- final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
- ser(value, gen);
- }
-
- public void ser(final TraversalExplanation te, final JsonGenerator jsonGenerator) throws IOException {
- final Map<String, Object> m = new HashMap<>();
- m.put(GraphSONTokens.ORIGINAL, getStepsAsList(te.getOriginalTraversal()));
-
- final List<Pair<TraversalStrategy, Traversal.Admin<?,?>>> strategyTraversals = te.getStrategyTraversals();
-
- final List<Map<String,Object>> intermediates = new ArrayList<>();
- for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
- final Map<String,Object> intermediate = new HashMap<>();
- intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
- intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
- intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
- intermediates.add(intermediate);
- }
- m.put(GraphSONTokens.INTERMEDIATE, intermediates);
-
- if (strategyTraversals.isEmpty())
- m.put(GraphSONTokens.FINAL, getStepsAsList(te.getOriginalTraversal()));
- else
- m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
-
- jsonGenerator.writeObject(m);
- }
-
- private List<String> getStepsAsList(final Traversal.Admin<?,?> t) {
- final List<String> steps = new ArrayList<>();
- t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
- return steps;
- }
- }
-
- final static class TraversalMetricsJacksonSerializer extends StdSerializer<TraversalMetrics> {
- public TraversalMetricsJacksonSerializer() {
- super(TraversalMetrics.class);
- }
-
- @Override
- public void serialize(final TraversalMetrics property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- serializeInternal(property, jsonGenerator);
- }
-
- @Override
- public void serializeWithType(final TraversalMetrics property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- serializeInternal(property, jsonGenerator);
- }
-
- private static void serializeInternal(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator) throws IOException {
- // creation of the map enables all the fields to be properly written with their type if required
- final Map<String, Object> m = new HashMap<>();
- m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
- final List<Map<String, Object>> metrics = new ArrayList<>();
- traversalMetrics.getMetrics().forEach(it -> metrics.add(metricsToMap(it)));
- m.put(GraphSONTokens.METRICS, metrics);
-
- jsonGenerator.writeObject(m);
- }
-
- private static Map<String, Object> metricsToMap(final Metrics metrics) {
- final Map<String, Object> m = new HashMap<>();
- m.put(GraphSONTokens.ID, metrics.getId());
- m.put(GraphSONTokens.NAME, metrics.getName());
- m.put(GraphSONTokens.COUNTS, metrics.getCounts());
- m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
-
- if (!metrics.getAnnotations().isEmpty()) {
- m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
- }
-
- if (!metrics.getNested().isEmpty()) {
- final List<Map<String, Object>> nested = new ArrayList<>();
- metrics.getNested().forEach(it -> nested.add(metricsToMap(it)));
- m.put(GraphSONTokens.METRICS, nested);
- }
- return m;
- }
- }
-
- private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer, final boolean normalize,
- final boolean includeLabel) throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
- GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
- if (includeLabel) jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
- tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
- jsonGenerator.writeEndObject();
- }
-
- private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
- // when "detached" you can't check features of the graph it detached from so it has to be
- // treated differently from a regular VertexProperty implementation.
- if (property instanceof DetachedVertexProperty) {
- // only write meta properties key if they exist
- if (property.properties().hasNext()) {
- writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
- }
- } else {
- // still attached - so we can check the features to see if it's worth even trying to write the
- // meta properties key
- if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
- writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
- }
- }
- }
-
- private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- final Iterator<Property<Object>> metaProperties = normalize ?
- IteratorUtils.list(( Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
- while (metaProperties.hasNext()) {
- final Property<Object> metaProperty = metaProperties.next();
- GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
- }
- jsonGenerator.writeEndObject();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
new file mode 100644
index 0000000..2411d8f
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
@@ -0,0 +1,465 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.javatuples.Pair;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+final class GraphSONSerializersV1d0 {
+
+ private GraphSONSerializersV1d0() {}
+
+ final static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
+
+ private final boolean normalize;
+
+ public VertexPropertyJacksonSerializer(final boolean normalize) {
+ super(VertexProperty.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize, true);
+ }
+
+ @Override
+ public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize, true);
+ }
+ }
+
+ final static class PropertyJacksonSerializer extends StdSerializer<Property> {
+
+ public PropertyJacksonSerializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(property, jsonGenerator, serializerProvider, null);
+ }
+ @Override
+ public void serializeWithType(final Property property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(property, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private static void ser(final Property property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
+ serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ final static class EdgeJacksonSerializer extends StdSerializer<Edge> {
+
+ private final boolean normalize;
+
+ public EdgeJacksonSerializer(final boolean normalize) {
+ super(Edge.class);
+ this.normalize = normalize;
+ }
+
+
+ @Override
+ public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(edge, jsonGenerator, serializerProvider, null);
+ }
+ @Override
+ public void serializeWithType(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(edge, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+ jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.EDGE);
+ jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+ jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+ GraphSONUtil.writeWithType(GraphSONTokens.IN, edge.inVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.OUT, edge.outVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+ writeProperties(edge, jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ final Iterator<Property<Object>> elementProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (elementProperties.hasNext()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ while (elementProperties.hasNext()) {
+ final Property<Object> elementProperty = elementProperties.next();
+ GraphSONUtil.writeWithType(elementProperty.key(), elementProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ }
+
+ final static class VertexJacksonSerializer extends StdSerializer<Vertex> {
+
+ private final boolean normalize;
+
+ public VertexJacksonSerializer(final boolean normalize) {
+ super(Vertex.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(vertex, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(vertex, jsonGenerator, serializerProvider, typeSerializer);
+
+ }
+
+ private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+ jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
+ writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+ final List<String> keys = normalize ?
+ IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+ for (String key : keys) {
+ final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+ IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+
+ if (vertexProperties.hasNext()) {
+ jsonGenerator.writeArrayFieldStart(key);
+ if (typeSerializer != null) {
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+ }
+
+ while (vertexProperties.hasNext()) {
+ serializerVertexProperty(vertexProperties.next(), jsonGenerator, serializerProvider, typeSerializer, normalize, false);
+ }
+
+ jsonGenerator.writeEndArray();
+ if (typeSerializer != null) jsonGenerator.writeEndArray();
+ }
+ }
+
+ jsonGenerator.writeEndObject();
+ }
+
+ }
+
+ final static class PathJacksonSerializer extends StdSerializer<Path> {
+
+ public PathJacksonSerializer() {
+ super(Path.class);
+ }
+ @Override
+ public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException, JsonGenerationException {
+ ser(path, jsonGenerator, null);
+ }
+
+ @Override
+ public void serializeWithType(final Path path, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException, JsonProcessingException {
+ ser(path, jsonGenerator, typeSerializer);
+ }
+ private static void ser(final Path path, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
+ jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
+ jsonGenerator.writeEndObject();
+ }
+
+ }
+
+ final static class TreeJacksonSerializer extends StdSerializer<Tree> {
+
+ public TreeJacksonSerializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(tree, jsonGenerator, null);
+ }
+
+ @Override
+ public void serializeWithType(final Tree tree, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException, JsonProcessingException {
+ ser(tree, jsonGenerator, typeSerializer);
+ }
+
+ private static void ser(final Tree tree, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+ Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+ for(Map.Entry<Element, Tree> entry : set)
+ {
+ jsonGenerator.writeObjectFieldStart(entry.getKey().id().toString());
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ /**
+ * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+ */
+ final static class GraphSONKeySerializer extends StdKeySerializer {
+
+ @Override
+ public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+ @Override
+ public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ private void ser(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ if (Element.class.isAssignableFrom(o.getClass()))
+ jsonGenerator.writeFieldName((((Element) o).id()).toString());
+ else
+ super.serialize(o, jsonGenerator, serializerProvider);
+ }
+ }
+
+ final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+ public TraversalExplanationJacksonSerializer() {
+ super(TraversalExplanation.class);
+ }
+
+ @Override
+ public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(traversalExplanation, jsonGenerator);
+ }
+
+ @Override
+ public void serializeWithType(final TraversalExplanation value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ ser(value, gen);
+ }
+
+ public void ser(final TraversalExplanation te, final JsonGenerator jsonGenerator) throws IOException {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ORIGINAL, getStepsAsList(te.getOriginalTraversal()));
+
+ final List<Pair<TraversalStrategy, Traversal.Admin<?,?>>> strategyTraversals = te.getStrategyTraversals();
+
+ final List<Map<String,Object>> intermediates = new ArrayList<>();
+ for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+ final Map<String,Object> intermediate = new HashMap<>();
+ intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+ intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+ intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+ intermediates.add(intermediate);
+ }
+ m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+ if (strategyTraversals.isEmpty())
+ m.put(GraphSONTokens.FINAL, getStepsAsList(te.getOriginalTraversal()));
+ else
+ m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+ jsonGenerator.writeObject(m);
+ }
+
+ private List<String> getStepsAsList(final Traversal.Admin<?,?> t) {
+ final List<String> steps = new ArrayList<>();
+ t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+ return steps;
+ }
+ }
+
+ final static class TraversalMetricsJacksonSerializer extends StdSerializer<TraversalMetrics> {
+ public TraversalMetricsJacksonSerializer() {
+ super(TraversalMetrics.class);
+ }
+
+ @Override
+ public void serialize(final TraversalMetrics property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ serializeInternal(property, jsonGenerator);
+ }
+
+ @Override
+ public void serializeWithType(final TraversalMetrics property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ serializeInternal(property, jsonGenerator);
+ }
+
+ private static void serializeInternal(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator) throws IOException {
+ // creation of the map enables all the fields to be properly written with their type if required
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+ final List<Map<String, Object>> metrics = new ArrayList<>();
+ traversalMetrics.getMetrics().forEach(it -> metrics.add(metricsToMap(it)));
+ m.put(GraphSONTokens.METRICS, metrics);
+
+ jsonGenerator.writeObject(m);
+ }
+
+ private static Map<String, Object> metricsToMap(final Metrics metrics) {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ID, metrics.getId());
+ m.put(GraphSONTokens.NAME, metrics.getName());
+ m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+ m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+ if (!metrics.getAnnotations().isEmpty()) {
+ m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+ }
+
+ if (!metrics.getNested().isEmpty()) {
+ final List<Map<String, Object>> nested = new ArrayList<>();
+ metrics.getNested().forEach(it -> nested.add(metricsToMap(it)));
+ m.put(GraphSONTokens.METRICS, nested);
+ }
+ return m;
+ }
+ }
+
+ private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize,
+ final boolean includeLabel) throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+ if (includeLabel) jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+ tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+ jsonGenerator.writeEndObject();
+ }
+
+ private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+ // when "detached" you can't check features of the graph it detached from so it has to be
+ // treated differently from a regular VertexProperty implementation.
+ if (property instanceof DetachedVertexProperty) {
+ // only write meta properties key if they exist
+ if (property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+ }
+ } else {
+ // still attached - so we can check the features to see if it's worth even trying to write the
+ // meta properties key
+ if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+ }
+ }
+ }
+
+ private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ final Iterator<Property<Object>> metaProperties = normalize ?
+ IteratorUtils.list(( Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ while (metaProperties.hasNext()) {
+ final Property<Object> metaProperty = metaProperties.next();
+ GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ jsonGenerator.writeEndObject();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
index 628ea22..7740b06 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONVersion.java
@@ -24,7 +24,8 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public enum GraphSONVersion {
- V1_0(GraphSONModule.GraphSONModuleV1d0.build(), "1.0");
+ V1_0(GraphSONModule.GraphSONModuleV1d0.build(), "1.0"),
+ V2_0(GraphSONModule.GraphSONModuleV2d0.build(), "2.0");
private final GraphSONModule.GraphSONModuleBuilder builder;
private final String versionNumber;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializers.java
deleted file mode 100644
index 7ceae94..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializers.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-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.StdSerializer;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
-/**
- * GraphSON serializers for classes in {@code java.time.*}.
- */
-final class JavaTimeSerializers {
-
- private JavaTimeSerializers() {}
-
- /**
- * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
- */
- static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
-
- public AbstractJavaTimeSerializer(final Class<T> clazz) {
- super(clazz);
- }
-
- @Override
- public void serialize(final T value, final JsonGenerator gen,
- final SerializerProvider serializerProvider) throws IOException {
- gen.writeString(value.toString());
- }
-
- @Override
- public void serializeWithType(final T value, final JsonGenerator gen,
- final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
- typeSer.writeTypePrefixForObject(value, gen);
- gen.writeStringField(GraphSONTokens.VALUE, value.toString());
- typeSer.writeTypeSuffixForObject(value, gen);
- }
- }
- /**
- * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
- */
- abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
- public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
- super(clazz);
- }
-
- public abstract T parse(final String val);
-
- @Override
- public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
- if (!jsonParser.getText().equals(GraphSONTokens.VALUE))
- throw new IOException(String.format("Invalid format for %s - expecting '%s' with a text value in ISO-8061 format", _valueClass.getSimpleName(), GraphSONTokens.VALUE));
-
- return parse(jsonParser.nextTextValue());
- }
- }
-
- final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
-
- public DurationJacksonSerializer() {
- super(Duration.class);
- }
- }
-
- final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
- public DurationJacksonDeserializer() {
- super(Duration.class);
- }
-
- @Override
- public Duration parse(final String val) {
- return Duration.parse(val);
- }
- }
-
- final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
-
- public InstantJacksonSerializer() {
- super(Instant.class);
- }
- }
-
- final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
- public InstantJacksonDeserializer() {
- super(Instant.class);
- }
-
- @Override
- public Instant parse(final String val) {
- return Instant.parse(val);
- }
- }
-
- final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
-
- public LocalDateJacksonSerializer() {
- super(LocalDate.class);
- }
- }
-
- final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
- public LocalDateJacksonDeserializer() {
- super(LocalDate.class);
- }
-
- @Override
- public LocalDate parse(final String val) {
- return LocalDate.parse(val);
- }
- }
-
- final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
-
- public LocalDateTimeJacksonSerializer() {
- super(LocalDateTime.class);
- }
- }
-
- final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
- public LocalDateTimeJacksonDeserializer() {
- super(LocalDateTime.class);
- }
-
- @Override
- public LocalDateTime parse(final String val) {
- return LocalDateTime.parse(val);
- }
- }
-
- final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
-
- public LocalTimeJacksonSerializer() {
- super(LocalTime.class);
- }
- }
-
- final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
- public LocalTimeJacksonDeserializer() {
- super(LocalTime.class);
- }
-
- @Override
- public LocalTime parse(final String val) {
- return LocalTime.parse(val);
- }
- }
-
- final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
-
- public MonthDayJacksonSerializer() {
- super(MonthDay.class);
- }
- }
-
- final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
- public MonthDayJacksonDeserializer() {
- super(MonthDay.class);
- }
-
- @Override
- public MonthDay parse(final String val) {
- return MonthDay.parse(val);
- }
- }
-
- final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
-
- public OffsetDateTimeJacksonSerializer() {
- super(OffsetDateTime.class);
- }
- }
-
- final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
- public OffsetDateTimeJacksonDeserializer() {
- super(OffsetDateTime.class);
- }
-
- @Override
- public OffsetDateTime parse(final String val) {
- return OffsetDateTime.parse(val);
- }
- }
-
- final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
-
- public OffsetTimeJacksonSerializer() {
- super(OffsetTime.class);
- }
- }
-
- final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
- public OffsetTimeJacksonDeserializer() {
- super(OffsetTime.class);
- }
-
- @Override
- public OffsetTime parse(final String val) {
- return OffsetTime.parse(val);
- }
- }
-
- final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
-
- public PeriodJacksonSerializer() {
- super(Period.class);
- }
- }
-
- final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
- public PeriodJacksonDeserializer() {
- super(Period.class);
- }
-
- @Override
- public Period parse(final String val) {
- return Period.parse(val);
- }
- }
-
- final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
-
- public YearJacksonSerializer() {
- super(Year.class);
- }
- }
-
- final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
- public YearJacksonDeserializer() {
- super(Year.class);
- }
-
- @Override
- public Year parse(final String val) {
- return Year.parse(val);
- }
- }
-
- final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
-
- public YearMonthJacksonSerializer() {
- super(YearMonth.class);
- }
- }
-
- final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
- public YearMonthJacksonDeserializer() {
- super(YearMonth.class);
- }
-
- @Override
- public YearMonth parse(final String val) {
- return YearMonth.parse(val);
- }
- }
-
- final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
-
- public ZonedDateTimeJacksonSerializer() {
- super(ZonedDateTime.class);
- }
- }
-
- final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
- public ZonedDateTimeJacksonDeserializer() {
- super(ZonedDateTime.class);
- }
-
- @Override
- public ZonedDateTime parse(final String val) {
- return ZonedDateTime.parse(val);
- }
- }
-
- final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
-
- public ZoneOffsetJacksonSerializer() {
- super(ZoneOffset.class);
- }
- }
-
- final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
- public ZoneOffsetJacksonDeserializer() {
- super(ZoneOffset.class);
- }
-
- @Override
- public ZoneOffset parse(final String val) {
- return ZoneOffset.of(val);
- }
- }
-}
[33/50] [abbrv] tinkerpop git commit: Enhanced pre-processor output
for failure cases.
Posted by sp...@apache.org.
Enhanced pre-processor output for failure cases.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/98f09bad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/98f09bad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/98f09bad
Branch: refs/heads/TINKERPOP-1274
Commit: 98f09bad615c2be3b5f8a4145f9a106977f13d6b
Parents: 82afed3
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 28 14:02:32 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 28 14:02:32 2016 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/98f09bad/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 35b1f15..57a8b98 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -71,6 +71,13 @@ fi
trap cleanup INT
function cleanup {
+ if [ -f "${output}" ]; then
+ if [ `wc -l /tmp/foo | awk '{print $1}'` -gt 0 ]; then
+ echo -e "\n\e[1mLast 10 lines of ${output}:\e[0m\n"
+ tail -n10 ${output}
+ echo
+ fi
+ fi
rm -rf ${output} ${CONSOLE_HOME}/.ext
exit 255
}
[09/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/97a7ba5b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/97a7ba5b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/97a7ba5b
Branch: refs/heads/TINKERPOP-1274
Commit: 97a7ba5b9c54dc803bc52a3711947aa4e4635f72
Parents: c1b4dae ebfa785
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:01:37 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:01:37 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/97a7ba5b/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[06/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c1b4dae3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c1b4dae3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c1b4dae3
Branch: refs/heads/TINKERPOP-1274
Commit: c1b4dae383db3daebb138fa9b9d9fcdabf3af1c9
Parents: 842a58f 2c835c3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 09:00:52 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 09:00:52 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[39/50] [abbrv] tinkerpop git commit: TINKERPOP-1274: GraphSON 2.0.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
new file mode 100644
index 0000000..0fea292
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import java.time.*;
+import java.util.*;
+
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * Tests non-typed serialization/deserialization for GraphSON 2.0.
+ */
+
+public class GraphSONMapperV2d0Test {
+ private final ObjectMapper mapper = GraphSONMapper.build()
+ .version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.NO_TYPES)
+ .create()
+ .createMapper();
+
+ @Test
+ public void shouldHandleTraversalExplanation() throws Exception {
+ final TraversalExplanation te = __().out().outV().outE().explain();
+ final String json = mapper.writeValueAsString(te);
+ assertEquals("{\"original\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"],\"intermediate\":[],\"final\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"]}", json);
+ }
+
+ @Test
+ public void shouldHandleDuration() throws Exception {
+ final Duration o = Duration.ZERO;
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleInstant() throws Exception {
+ final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleLocalDate() throws Exception {
+ final LocalDate o = LocalDate.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleLocalDateTime() throws Exception {
+ final LocalDateTime o = LocalDateTime.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleLocalTime() throws Exception {
+ final LocalTime o = LocalTime.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleMonthDay() throws Exception {
+ final MonthDay o = MonthDay.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleOffsetDateTime() throws Exception {
+ final OffsetDateTime o = OffsetDateTime.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleOffsetTime() throws Exception {
+ final OffsetTime o = OffsetTime.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandlePeriod() throws Exception {
+ final Period o = Period.ofDays(3);
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleYear() throws Exception {
+ final Year o = Year.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleYearMonth() throws Exception {
+ final YearMonth o = YearMonth.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleZonedDateTime() throws Exception {
+ final ZonedDateTime o = ZonedDateTime.now();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldHandleZoneOffset() throws Exception {
+ final ZoneOffset o = ZonedDateTime.now().getOffset();
+ final String json = mapper.writeValueAsString(o);
+ assertEquals("\"" + o.toString() + "\"", json);
+ }
+
+ @Test
+ public void shouldSerializeDeserializeNestedCollectionsAndMapAndTypedCollectionsCorrectly() throws Exception {
+ UUID uuid = UUID.randomUUID();
+ List myList = new ArrayList<>();
+
+ List myList2 = new ArrayList<>();
+ myList2.add(UUID.randomUUID());
+ myList2.add(33L);
+ myList2.add(84);
+ Map map2 = new HashMap<>();
+ map2.put("eheh", UUID.randomUUID());
+ map2.put("normal", "normal");
+ myList2.add(map2);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("hello", "world");
+ map1.put("test", uuid);
+ map1.put("hehe", myList2);
+ myList.add(map1);
+
+ myList.add("kjkj");
+ myList.add(UUID.randomUUID());
+
+ String json = mapper.writeValueAsString(myList);
+ Object read = mapper.readValue(json, Object.class);
+
+ // Not equals because of type loss
+ assertNotEquals(myList, read);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
new file mode 100644
index 0000000..d0303eb
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
@@ -0,0 +1,248 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import groovy.json.JsonBuilder;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.ReferenceCountUtil;
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMessageSerializer {
+ private static final Logger logger = LoggerFactory.getLogger(AbstractGraphSONMessageSerializerV2d0.class);
+
+ protected ObjectMapper mapper;
+
+ protected static final String TOKEN_USE_MAPPER_FROM_GRAPH = "useMapperFromGraph";
+
+ protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
+ };
+
+ public AbstractGraphSONMessageSerializerV2d0() {
+ final GraphSONMapper.Builder builder = configureBuilder(GraphSONMapper.build());
+ mapper = builder.create().createMapper();
+ }
+
+ public AbstractGraphSONMessageSerializerV2d0(final GraphSONMapper mapper) {
+ this.mapper = mapper.createMapper();
+ }
+
+ abstract byte[] obtainHeader();
+
+ abstract GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder);
+
+ @Override
+ public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
+ final GraphSONMapper.Builder initialBuilder;
+ final Object graphToUseForMapper = config.get(TOKEN_USE_MAPPER_FROM_GRAPH);
+ if (graphToUseForMapper != null) {
+ if (null == graphs) throw new IllegalStateException(String.format(
+ "No graphs have been provided to the serializer and therefore %s is not a valid configuration", TOKEN_USE_MAPPER_FROM_GRAPH));
+
+ final Graph g = graphs.get(graphToUseForMapper.toString());
+ if (null == g) throw new IllegalStateException(String.format(
+ "There is no graph named [%s] configured to be used in the %s setting",
+ graphToUseForMapper, TOKEN_USE_MAPPER_FROM_GRAPH));
+
+ // a graph was found so use the mapper it constructs. this allows graphson to be auto-configured with any
+ // custom classes that the implementation allows for
+ initialBuilder = g.io(GraphSONIo.build()).mapper();
+ } else {
+ // no graph was supplied so just use the default - this will likely be the case when using a graph
+ // with no custom classes or a situation where the user needs complete control like when using two
+ // distinct implementations each with their own custom classes.
+ initialBuilder = GraphSONMapper.build();
+ }
+
+ addIoRegistries(config, initialBuilder);
+
+ mapper = configureBuilder(initialBuilder).create().createMapper();
+ }
+
+ @Override
+ public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] payload = mapper.writeValueAsBytes(responseMessage);
+ encodedMessage = allocator.buffer(payload.length);
+ encodedMessage.writeBytes(payload);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public ByteBuf serializeRequestAsBinary(final RequestMessage requestMessage, final ByteBufAllocator allocator) throws SerializationException {
+ ByteBuf encodedMessage = null;
+ try {
+ final byte[] header = obtainHeader();
+ final byte[] payload = mapper.writeValueAsBytes(requestMessage);
+
+ encodedMessage = allocator.buffer(header.length + payload.length);
+ encodedMessage.writeBytes(header);
+ encodedMessage.writeBytes(payload);
+
+ return encodedMessage;
+ } catch (Exception ex) {
+ if (encodedMessage != null) ReferenceCountUtil.release(encodedMessage);
+
+ logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public RequestMessage deserializeRequest(final ByteBuf msg) throws SerializationException {
+ try {
+ final byte[] payload = new byte[msg.readableBytes()];
+ msg.readBytes(payload);
+ return mapper.readValue(payload, RequestMessage.class);
+ } catch (Exception ex) {
+ logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public ResponseMessage deserializeResponse(final ByteBuf msg) throws SerializationException {
+ try {
+ final byte[] payload = new byte[msg.readableBytes()];
+ msg.readBytes(payload);
+ final Map<String, Object> responseData = mapper.readValue(payload, mapTypeReference);
+ final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+ final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+ return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+ .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+ .statusMessage(status.get(SerTokens.TOKEN_MESSAGE).toString())
+ .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+ .result(result.get(SerTokens.TOKEN_DATA))
+ .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+ .create();
+ } catch (Exception ex) {
+ logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ public final static class GremlinServerModule extends SimpleModule {
+ public GremlinServerModule() {
+ super("graphson-gremlin-server");
+ addSerializer(JsonBuilder.class, new JsonBuilderJacksonSerializer());
+ addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
+ }
+ }
+
+ public final static class JsonBuilderJacksonSerializer extends StdSerializer<JsonBuilder> {
+ public JsonBuilderJacksonSerializer() {
+ super(JsonBuilder.class);
+ }
+
+ @Override
+ public void serialize(final JsonBuilder json, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException, JsonGenerationException {
+ // the JSON from the builder will already be started/ended as array or object...just need to surround it
+ // with appropriate chars to fit into the serialization pattern.
+ jsonGenerator.writeRaw(":");
+ jsonGenerator.writeRaw(json.toString());
+ jsonGenerator.writeRaw(",");
+ }
+ }
+
+ public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+ public ResponseMessageSerializer() {
+ super(ResponseMessage.class);
+ }
+
+ @Override
+ public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_STATUS);
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+ jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+ jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
+ jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_RESULT);
+
+ GraphSONUtil.writeStartObject(responseMessage, jsonGenerator, typeSerializer);
+
+ if (null == responseMessage.getResult().getData())
+ {
+ jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
+ }
+ else
+ {
+ jsonGenerator.writeFieldName(SerTokens.TOKEN_DATA);
+ Object result = responseMessage.getResult().getData();
+ serializerProvider.findTypedValueSerializer(result.getClass(), true, null).serialize(result, jsonGenerator, serializerProvider);
+ }
+
+ jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+
+ GraphSONUtil.writeEndObject(responseMessage, jsonGenerator, typeSerializer);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java
new file mode 100644
index 0000000..3c2fd3f
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Serialize results to JSON with version 2.0.x schema.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerGremlinV2d0 extends AbstractGraphSONMessageSerializerV2d0 {
+
+ private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1D0;
+
+ private static byte[] header;
+
+ static {
+ final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+ buffer.put((byte) MIME_TYPE.length());
+ buffer.put(MIME_TYPE.getBytes());
+ header = buffer.array();
+ }
+
+ public GraphSONMessageSerializerGremlinV2d0() {
+ super();
+ }
+
+ public GraphSONMessageSerializerGremlinV2d0(final GraphSONMapper mapper) {
+ super(mapper);
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[]{MIME_TYPE};
+ }
+
+ @Override
+ byte[] obtainHeader() {
+ return header;
+ }
+
+ @Override
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ return builder.version(GraphSONVersion.V2_0)
+ .addCustomModule(new GremlinServerModule())
+ .typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java
new file mode 100644
index 0000000..85d1c5b
--- /dev/null
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Serialize results to JSON with version 2.0.x schema.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class GraphSONMessageSerializerV2d0 extends AbstractGraphSONMessageSerializerV2d0 implements MessageTextSerializer {
+ private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV2d0.class);
+ private static final String MIME_TYPE = SerTokens.MIME_JSON;
+
+ private static byte[] header;
+
+ static {
+ final ByteBuffer buffer = ByteBuffer.allocate(MIME_TYPE.length() + 1);
+ buffer.put((byte) MIME_TYPE.length());
+ buffer.put(MIME_TYPE.getBytes());
+ header = buffer.array();
+ }
+
+ public GraphSONMessageSerializerV2d0() {
+ super();
+ }
+
+ public GraphSONMessageSerializerV2d0(final GraphSONMapper mapper) {
+ super(mapper);
+ }
+
+ @Override
+ public String[] mimeTypesSupported() {
+ return new String[]{MIME_TYPE};
+ }
+
+ @Override
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
+ return builder.version(GraphSONVersion.V2_0)
+ .addCustomModule(new GremlinServerModule())
+ .typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES);
+ }
+
+ @Override
+ byte[] obtainHeader() {
+ return header;
+ }
+
+ @Override
+ public ResponseMessage deserializeResponse(final String msg) throws SerializationException {
+ try {
+ final Map<String, Object> responseData = mapper.readValue(msg, mapTypeReference);
+ final Map<String, Object> status = (Map<String, Object>) responseData.get(SerTokens.TOKEN_STATUS);
+ final Map<String, Object> result = (Map<String, Object>) responseData.get(SerTokens.TOKEN_RESULT);
+ return ResponseMessage.build(UUID.fromString(responseData.get(SerTokens.TOKEN_REQUEST).toString()))
+ .code(ResponseStatusCode.getFromValue((Integer) status.get(SerTokens.TOKEN_CODE)))
+ .statusMessage(status.get(SerTokens.TOKEN_MESSAGE).toString())
+ .statusAttributes((Map<String, Object>) status.get(SerTokens.TOKEN_ATTRIBUTES))
+ .result(result.get(SerTokens.TOKEN_DATA))
+ .responseMetaData((Map<String, Object>) result.get(SerTokens.TOKEN_META))
+ .create();
+ } catch (Exception ex) {
+ logger.warn("Response [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public String serializeResponseAsString(final ResponseMessage responseMessage) throws SerializationException {
+ try {
+ return mapper.writeValueAsString(responseMessage);
+ } catch (Exception ex) {
+ logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public RequestMessage deserializeRequest(final String msg) throws SerializationException {
+ try {
+ return mapper.readValue(msg, RequestMessage.class);
+ } catch (Exception ex) {
+ logger.warn("Request [{}] could not be deserialized by {}.", msg, AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+
+ @Override
+ public String serializeRequestAsString(final RequestMessage requestMessage) throws SerializationException {
+ try {
+ return mapper.writeValueAsString(requestMessage);
+ } catch (Exception ex) {
+ logger.warn("Request [{}] could not be serialized by {}.", requestMessage.toString(), AbstractGraphSONMessageSerializerV2d0.class.getName());
+ throw new SerializationException(ex);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
new file mode 100644
index 0000000..7f21586
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
@@ -0,0 +1,321 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+
+import java.util.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * Serializer tests that cover non-lossy serialization/deserialization methods for GraphSONMessage.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONMessageSerializerGremlinV2d0Test {
+ private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+ private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+ private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+ public MessageSerializer serializer = new GraphSONMessageSerializerGremlinV2d0();
+
+ @Test
+ public void shouldSerializeIterable() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(2, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertEquals(new Integer(100), deserializedFunList.get(1));
+ }
+
+ @Test
+ public void shouldSerializeIterableWithNull() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(null);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(3, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertNull(deserializedFunList.get(1));
+ assertEquals(new Integer(100), deserializedFunList.get(2));
+ }
+
+ @Test
+ public void shouldSerializeMap() throws Exception {
+ final Map<String, Object> map = new HashMap<>();
+ final Map<String, String> innerMap = new HashMap<>();
+ innerMap.put("a", "b");
+
+ map.put("x", 1);
+ map.put("y", "some");
+ map.put("z", innerMap);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+ assertEquals(3, deserializedMap.size());
+ assertEquals(1, deserializedMap.get("x"));
+ assertEquals("some", deserializedMap.get("y"));
+
+ final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+ assertEquals(1, deserializedInnerMap.size());
+ assertEquals("b", deserializedInnerMap.get("a"));
+ }
+
+ @Test
+ public void shouldSerializeMapEntries() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Date d = new Date();
+
+ final Map<Object, Object> map = new HashMap<>();
+ map.put("x", 1);
+ map.put(v1, 100);
+ map.put(d, "test");
+
+ final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
+ assertCommon(response);
+
+ final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(3, deserializedEntries.size());
+ deserializedEntries.forEach(e -> {
+ if (e.containsKey("x"))
+ assertEquals(1, e.get("x"));
+ else if (e.containsKey(v1.id().toString()))
+ assertEquals(100, e.get(v1.id().toString()));
+ else if (e.containsKey(StdDateFormat.instance.format(d)))
+ assertEquals("test", e.get(StdDateFormat.instance.format(d)));
+ else
+ fail("Map entries contains a key that is not part of what was serialized");
+ });
+ }
+
+ @Test
+ public void shouldSerializeEdge() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
+
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, edgeList.size());
+
+ final Map<String, Object> deserializedEdge = edgeList.get(0);
+ assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
+ assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
+ assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
+ assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
+ assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
+ assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
+ assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
+
+ final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
+ assertNotNull(properties);
+ assertEquals(123, properties.get("abc"));
+
+ }
+
+ @Test
+ public void shouldSerializeEdgeProperty() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, propertyList.size());
+ assertEquals(123, propertyList.get(0).get("value"));
+ }
+
+ @Test
+ public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v = graph.addVertex();
+ final Map<String, Object> map = new HashMap<>();
+ map.put("x", 500);
+ map.put("y", "some");
+
+ final ArrayList<Object> friends = new ArrayList<>();
+ friends.add("x");
+ friends.add(5);
+ friends.add(map);
+
+ v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+ final List list = IteratorUtils.list(graph.vertices());
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, vertexList.size());
+
+ final Map<String, Object> deserializedVertex = vertexList.get(0);
+ 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 List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
+ assertEquals(1, friendsProperties.size());
+
+ final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
+ assertEquals(3, deserializedInnerList.size());
+ assertEquals("x", deserializedInnerList.get(0));
+ assertEquals(5, deserializedInnerList.get(1));
+
+ final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+ assertEquals(2, deserializedInnerInnerMap.size());
+ assertEquals(500, deserializedInnerInnerMap.get("x"));
+ assertEquals("some", deserializedInnerInnerMap.get("y"));
+ }
+
+ @Test
+ public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map<Vertex, Integer> map = new HashMap<>();
+ map.put(g.V().has("name", "marko").next(), 1000);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
+ assertEquals(1, deserializedMap.size());
+
+ // with no embedded types the key (which is a vertex) simply serializes out to an id
+ // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+ assertEquals(new Integer(1000), deserializedMap.get("1"));
+ }
+
+ @Test
+ public void shouldSerializeToJsonTree() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map t = g.V(1).out().properties("name").tree().next();
+
+ final ResponseMessage response = convert(t);
+ assertCommon(response);
+
+ final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
+
+ assertEquals(1, deserializedMap.size());
+
+ //check the first object and it's properties
+ Map<String,Object> vertex = deserializedMap.get("1").get("key");
+ Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
+ assertEquals(1, (int)vertex.get("id"));
+ assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
+
+ //check objects tree structure
+ //check Vertex property
+ Map<String, Map<String, Map>> subTreeMap = deserializedMap.get("1").get("value");
+ Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
+ Map<String, String> vertexPropertiesDeep = subTreeMap2.get("3").get("key");
+ assertEquals("vadas", vertexPropertiesDeep.get("value"));
+ assertEquals("name", vertexPropertiesDeep.get("label"));
+
+ // check subitem
+ Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
+ Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
+
+ assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
+ }
+
+ @Test
+ public void shouldSerializeFullResponseMessage() throws Exception {
+ final UUID id = UUID.randomUUID();
+
+ final Map<String, Object> metaData = new HashMap<>();
+ metaData.put("test", "this");
+ metaData.put("one", 1);
+
+ final Map<String, Object> attributes = new HashMap<>();
+ attributes.put("test", "that");
+ attributes.put("two", 2);
+
+ final ResponseMessage response = ResponseMessage.build(id)
+ .responseMetaData(metaData)
+ .code(ResponseStatusCode.SUCCESS)
+ .result("some-result")
+ .statusAttributes(attributes)
+ .statusMessage("worked")
+ .create();
+
+ final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeResponse(bb);
+
+ assertEquals(id, deserialized.getRequestId());
+ assertEquals("this", deserialized.getResult().getMeta().get("test"));
+ assertEquals(1, deserialized.getResult().getMeta().get("one"));
+ assertEquals("some-result", deserialized.getResult().getData());
+ assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+ assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+ assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+ assertEquals("worked", deserialized.getStatus().getMessage());
+ }
+
+ private void assertCommon(final ResponseMessage response) {
+ assertEquals(requestId, response.getRequestId());
+ assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+ }
+
+ private ResponseMessage convert(final Object toSerialize) throws SerializationException {
+ final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+ return serializer.deserializeResponse(bb);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/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
new file mode 100644
index 0000000..0e07d44
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV2d0Test.java
@@ -0,0 +1,474 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.*;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
+/**
+ * These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
+ * vertices, edges, annotated values, etc.) are handled in the IO packages.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONMessageSerializerV2d0Test {
+
+ public static final GraphSONMessageSerializerV2d0 SERIALIZER = new GraphSONMessageSerializerV2d0();
+ private static final RequestMessage msg = RequestMessage.build("op")
+ .overrideRequestId(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595")).create();
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Test
+ public void shouldConfigureIoRegistry() throws Exception {
+ final GraphSONMessageSerializerV1d0 serializer = new GraphSONMessageSerializerV1d0();
+ final Map<String, Object> config = new HashMap<String, Object>() {{
+ put(GryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES, Arrays.asList(ColorIoRegistry.class.getName()));
+ }};
+
+ serializer.configure(config, null);
+
+ final ResponseMessage toSerialize = ResponseMessage.build(UUID.fromString("2D62161B-9544-4F39-AF44-62EC49F9A595"))
+ .result(Color.RED).create();
+ final String results = serializer.serializeResponseAsString(toSerialize);
+ final JsonNode json = mapper.readTree(results);
+ assertNotNull(json);
+ assertThat(json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA).booleanValue(), is(true));
+ }
+
+ @Test
+ public void shouldSerializeToJsonNullResultReturnsNull() throws Exception {
+ final ResponseMessage message = ResponseMessage.build(msg).create();
+ final String results = SERIALIZER.serializeResponseAsString(message);
+ final JsonNode json = mapper.readTree(results);
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.path(SerTokens.TOKEN_REQUEST).asText());
+ assertEquals(NullNode.getInstance(), json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA));
+ }
+
+ @Test
+ public void shouldSerializeToJsonIterable() throws Exception {
+ final ArrayList<FunObject> funList = new ArrayList<>();
+ funList.add(new FunObject("x"));
+ funList.add(new FunObject("y"));
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertEquals(2, converted.size());
+
+ assertEquals("x", converted.get(0).asText());
+ assertEquals("y", converted.get(1).asText());
+ }
+
+ @Test
+ public void shouldSerializeToJsonIterator() throws Exception {
+ final ArrayList<FunObject> funList = new ArrayList<>();
+ funList.add(new FunObject("x"));
+ funList.add(new FunObject("y"));
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertEquals(2, converted.size());
+
+ assertEquals("x", converted.get(0).asText());
+ assertEquals("y", converted.get(1).asText());
+ }
+
+ @Test
+ public void shouldSerializeToJsonIteratorNullElement() throws Exception {
+
+ final ArrayList<FunObject> funList = new ArrayList<>();
+ funList.add(new FunObject("x"));
+ funList.add(null);
+ funList.add(new FunObject("y"));
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(funList.iterator()).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertEquals(3, converted.size());
+
+ assertEquals("x", converted.get(0).asText());
+ assertEquals(NullNode.getInstance(), converted.get(1));
+ assertEquals("y", converted.get(2).asText());
+ }
+
+ @Test
+ public void shouldSerializeToJsonMap() throws Exception {
+ final Map<String, Object> map = new HashMap<>();
+ final Map<String, String> innerMap = new HashMap<>();
+ innerMap.put("a", "b");
+
+ map.put("x", new FunObject("x"));
+ map.put("y", "some");
+ map.put("z", innerMap);
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertNotNull(jsonObject);
+ assertEquals("some", jsonObject.get("y").asText());
+ assertEquals("x", jsonObject.get("x").asText());
+
+ final JsonNode innerJsonObject = jsonObject.get("z");
+ assertNotNull(innerJsonObject);
+ assertEquals("b", innerJsonObject.get("a").asText());
+ }
+
+ @Test
+ public void shouldShouldSerializeMapEntries() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Date d = new Date();
+
+ final Map<Object, Object> map = new HashMap<>();
+ map.put("x", 1);
+ map.put(v1, 100);
+ map.put(d, "test");
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(IteratorUtils.asList(map)).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode jsonObject = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+ jsonObject.elements().forEachRemaining(e -> {
+ if (e.has("x"))
+ assertEquals(1, e.get("x").asInt());
+ else if (e.has(v1.id().toString()))
+ assertEquals(100, e.get(v1.id().toString()).asInt());
+ else if (e.has(StdDateFormat.instance.format(d)))
+ assertEquals("test", e.get(StdDateFormat.instance.format(d)).asText());
+ else
+ fail("Map entries contains a key that is not part of what was serialized");
+ });
+ }
+
+ @Test
+ public void shouldSerializeEdge() throws Exception {
+ final Graph g = TinkerGraph.open();
+ final Vertex v1 = g.addVertex();
+ final Vertex v2 = g.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Edge> iterable = IteratorUtils.list(g.edges());
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
+
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertNotNull(converted);
+ assertEquals(1, converted.size());
+
+ 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(e.label(), edgeAsJson.get(GraphSONTokens.LABEL).asText());
+ assertEquals(GraphSONTokens.EDGE, edgeAsJson.get(GraphSONTokens.TYPE).asText());
+
+ final JsonNode properties = edgeAsJson.get(GraphSONTokens.PROPERTIES);
+ assertNotNull(properties);
+ assertEquals(123, properties.get("abc").asInt());
+ }
+
+ @Test
+ public void shouldSerializeEdgeProperty() throws Exception {
+ final Graph g = TinkerGraph.open();
+ final Vertex v1 = g.addVertex();
+ final Vertex v2 = g.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
+
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertNotNull(converted);
+ assertEquals(1, converted.size());
+
+ final JsonNode propertyAsJson = converted.get(0);
+ assertNotNull(propertyAsJson);
+
+ assertEquals(123, propertyAsJson.get("value").asInt());
+ }
+
+ @Test
+ public void shouldSerializeToJsonIteratorWithEmbeddedMap() throws Exception {
+ final Graph g = TinkerGraph.open();
+ final Vertex v = g.addVertex();
+ final Map<String, Object> map = new HashMap<>();
+ map.put("x", 500);
+ map.put("y", "some");
+
+ final ArrayList<Object> friends = new ArrayList<>();
+ friends.add("x");
+ friends.add(5);
+ friends.add(map);
+
+ v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+ final Iterable iterable = IteratorUtils.list(g.vertices());
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(iterable).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertNotNull(converted);
+ assertEquals(1, converted.size());
+
+ final JsonNode vertexAsJson = converted.get(0);
+ assertNotNull(vertexAsJson);
+
+ final JsonNode properties = vertexAsJson.get(GraphSONTokens.PROPERTIES);
+ assertNotNull(properties);
+ assertEquals(1, properties.size());
+
+ final JsonNode friendProperties = properties.get("friends");
+ assertEquals(1, friendProperties.size());
+ final JsonNode friendsProperty = friendProperties.get(0);
+ assertNotNull(friendsProperty);
+ assertEquals(3, friends.size());
+
+ final String object1 = friendsProperty.get(GraphSONTokens.VALUE).get(0).asText();
+ assertEquals("x", object1);
+
+ final int object2 = friendsProperty.get(GraphSONTokens.VALUE).get(1).asInt();
+ assertEquals(5, object2);
+
+ final JsonNode object3 = friendsProperty.get(GraphSONTokens.VALUE).get(2);
+ assertEquals(500, object3.get("x").asInt());
+ assertEquals("some", object3.get("y").asText());
+ }
+
+ @Test
+ public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map<Vertex, Integer> map = new HashMap<>();
+ map.put(g.V().has("name", "marko").next(), 1000);
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(map).create());
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+
+ assertNotNull(converted);
+
+ // with no embedded types the key (which is a vertex) simply serializes out to an id
+ // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+ assertEquals(1000, converted.get("1").asInt());
+ }
+
+ @Test
+ public void shouldDeserializeRequestNicelyWithNoArgs() throws Exception {
+ final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+ final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\"}", request));
+ assertEquals(request, m.getRequestId());
+ assertEquals("eval", m.getOp());
+ assertNotNull(m.getArgs());
+ assertEquals(0, m.getArgs().size());
+ }
+
+ @Test
+ public void shouldDeserializeRequestNicelyWithArgs() throws Exception {
+ final UUID request = UUID.fromString("011CFEE9-F640-4844-AC93-034448AC0E80");
+ final RequestMessage m = SERIALIZER.deserializeRequest(String.format("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}", request));
+ assertEquals(request, m.getRequestId());
+ assertEquals("eval", m.getOp());
+ assertNotNull(m.getArgs());
+ assertEquals("y", m.getArgs().get("x"));
+ }
+
+ @Test(expected = SerializationException.class)
+ public void shouldDeserializeRequestParseMessage() throws Exception {
+ SERIALIZER.deserializeRequest("{\"requestId\":\"%s\",\"op\":\"eval\",\"args\":{\"x\":\"y\"}}");
+ }
+
+ @Test
+ public void shouldSerializeFullResponseMessage() throws Exception {
+ final UUID id = UUID.randomUUID();
+
+ final Map<String, Object> metaData = new HashMap<>();
+ metaData.put("test", "this");
+ metaData.put("one", 1);
+
+ final Map<String, Object> attributes = new HashMap<>();
+ attributes.put("test", "that");
+ attributes.put("two", 2);
+
+ final ResponseMessage response = ResponseMessage.build(id)
+ .responseMetaData(metaData)
+ .code(ResponseStatusCode.SUCCESS)
+ .result("some-result")
+ .statusAttributes(attributes)
+ .statusMessage("worked")
+ .create();
+
+ final String results = SERIALIZER.serializeResponseAsString(response);
+ final ResponseMessage deserialized = SERIALIZER.deserializeResponse(results);
+
+ assertEquals(id, deserialized.getRequestId());
+ assertEquals("this", deserialized.getResult().getMeta().get("test"));
+ assertEquals(1, deserialized.getResult().getMeta().get("one"));
+ assertEquals("some-result", deserialized.getResult().getData());
+ assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+ assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+ assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+ assertEquals("worked", deserialized.getStatus().getMessage());
+ }
+
+ @Test
+ public void shouldSerializeToJsonTree() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Tree t = g.V(1).out().properties("name").tree().next();
+
+
+ final String results = SERIALIZER.serializeResponseAsString(ResponseMessage.build(msg).result(t).create());
+
+ final JsonNode json = mapper.readTree(results);
+
+ assertNotNull(json);
+ assertEquals(msg.getRequestId().toString(), json.get(SerTokens.TOKEN_REQUEST).asText());
+ final JsonNode converted = json.get(SerTokens.TOKEN_RESULT).get(SerTokens.TOKEN_DATA);
+ assertNotNull(converted);
+
+ //check the first object and it's properties
+ assertEquals(1, converted.get("1").get("key").get("id").asInt());
+ assertEquals("marko", converted.get("1").get("key").get("properties").get("name").get(0).get("value").asText());
+
+ //check objects tree structure
+ //check Vertex property
+ assertEquals("vadas", converted.get("1")
+ .get("value")
+ .get("2")
+ .get("value")
+ .get("3").get("key").get("value").asText());
+ assertEquals("name", converted.get("1")
+ .get("value")
+ .get("2")
+ .get("value")
+ .get("3").get("key").get("label").asText());
+
+ // check subitem
+ assertEquals("lop", converted.get("1")
+ .get("value")
+ .get("3")
+ .get("key")
+ .get("properties").get("name").get(0).get("value").asText());
+ }
+
+ private static class FunObject {
+ private String val;
+
+ public FunObject(String val) {
+ this.val = val;
+ }
+
+ public String toString() {
+ return this.val;
+ }
+ }
+
+ public static class ColorIoRegistry extends AbstractIoRegistry {
+ public ColorIoRegistry() {
+ register(GraphSONIo.class, null, new ColorSimpleModule());
+ }
+ }
+
+ public static class ColorSimpleModule extends SimpleModule {
+ public ColorSimpleModule() {
+ super("color-fun");
+ addSerializer(Color.class, new ColorSerializer());
+
+ }
+ }
+
+ public static class ColorSerializer extends StdSerializer<Color> {
+ public ColorSerializer() {
+ super(Color.class);
+ }
+
+ @Override
+ public void serialize(final Color color, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ jsonGenerator.writeBoolean(color.equals(Color.RED));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
new file mode 100644
index 0000000..9923905
--- /dev/null
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
@@ -0,0 +1,227 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TinkerPopJacksonModule;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+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.StdSerializer;
+import org.apache.tinkerpop.shaded.kryo.Kryo;
+import org.apache.tinkerpop.shaded.kryo.Serializer;
+import org.apache.tinkerpop.shaded.kryo.io.Input;
+import org.apache.tinkerpop.shaded.kryo.io.Output;
+import org.javatuples.Pair;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An implementation of the {@link org.apache.tinkerpop.gremlin.structure.io.IoRegistry} interface that provides serializers with custom configurations for
+ * implementation specific classes that might need to be serialized. This registry allows a {@link org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph} to
+ * be serialized directly which is useful for moving small graphs around on the network.
+ * <p/>
+ * Most providers need not implement this kind of custom serializer as they will deal with much larger graphs that
+ * wouldn't be practical to serialize in this fashion. This is a bit of a special case for TinkerGraph given its
+ * in-memory status. Typical implementations would create serializers for a complex vertex identifier or a
+ * custom data class like a "geographic point".
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class TinkerIoRegistryV2d0 extends AbstractIoRegistry {
+
+ private static final TinkerIoRegistryV2d0 INSTANCE = new TinkerIoRegistryV2d0();
+
+ private TinkerIoRegistryV2d0() {
+ register(GryoIo.class, TinkerGraph.class, new TinkerGraphGryoSerializer());
+ register(GraphSONIo.class, null, new TinkerModuleV2d0());
+ }
+
+ public static TinkerIoRegistryV2d0 getInstance() {
+ return INSTANCE;
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph} into itself for Gryo. This is useful when
+ * shipping small graphs around through Gremlin Server. Reuses the existing Kryo instance for serialization.
+ */
+ final static class TinkerGraphGryoSerializer extends Serializer<TinkerGraph> {
+ @Override
+ public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ GryoWriter.build().mapper(() -> kryo).create().writeGraph(stream, graph);
+ final byte[] bytes = stream.toByteArray();
+ output.writeInt(bytes.length);
+ output.write(bytes);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+ }
+
+ @Override
+ public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
+ final TinkerGraph graph = TinkerGraph.open();
+ final int len = input.readInt();
+ final byte[] bytes = input.readBytes(len);
+ try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
+ GryoReader.build().mapper(() -> kryo).create().readGraph(stream, graph);
+ } catch (Exception io) {
+ throw new RuntimeException(io);
+ }
+
+ return graph;
+ }
+ }
+
+ /**
+ * Provides a method to serialize an entire {@link org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph} into itself for GraphSON. This is useful when
+ * shipping small graphs around through Gremlin Server.
+ */
+ final static class TinkerModuleV2d0 extends TinkerPopJacksonModule {
+ public TinkerModuleV2d0() {
+ super("tinkergraph-2.0");
+ addSerializer(TinkerGraph.class, new TinkerGraphJacksonSerializer());
+ addDeserializer(TinkerGraph.class, new TinkerGraphJacksonDeserializer());
+ }
+ }
+
+ /**
+ * Serializes the graph into an edge list format. Edge list is a better choices than adjacency list (which is
+ * typically standard from the {@link org.apache.tinkerpop.gremlin.structure.io.GraphReader} and {@link org.apache.tinkerpop.gremlin.structure.io.GraphWriter} perspective) in this case because
+ * the use case for this isn't around massive graphs. The use case is for "small" subgraphs that are being
+ * shipped over the wire from Gremlin Server. Edge list format is a bit easier for non-JVM languages to work
+ * with as a format and doesn't require a cache for loading (as vertex labels are not serialized in adjacency
+ * list).
+ */
+ final static class TinkerGraphJacksonSerializer extends StdSerializer<TinkerGraph> {
+
+ public TinkerGraphJacksonSerializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public void serialize(final TinkerGraph graph, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(graph, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final TinkerGraph graph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(graph, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final TinkerGraph graph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ GraphSONUtil.writeStartObject(graph, jsonGenerator, typeSerializer);
+ jsonGenerator.writeFieldName(GraphSONTokens.VERTICES);
+ GraphSONUtil.writeStartArray(graph, jsonGenerator, typeSerializer);
+
+ final Iterator<Vertex> vertices = graph.vertices();
+ while (vertices.hasNext()) {
+ serializerProvider.defaultSerializeValue(vertices.next(), jsonGenerator);
+ }
+
+ GraphSONUtil.writeEndArray(graph, jsonGenerator, typeSerializer);
+ jsonGenerator.writeFieldName(GraphSONTokens.EDGES);
+ GraphSONUtil.writeStartArray(graph, jsonGenerator, typeSerializer);
+
+ final Iterator<Edge> edges = graph.edges();
+ while (edges.hasNext()) {
+ serializerProvider.defaultSerializeValue(edges.next(), jsonGenerator);
+ }
+
+ GraphSONUtil.writeEndArray(graph, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeEndObject(graph, jsonGenerator, typeSerializer);
+ }
+ }
+
+ /**
+ * Deserializes the edge list format.
+ */
+ static class TinkerGraphJacksonDeserializer extends StdDeserializer<TinkerGraph> {
+ public TinkerGraphJacksonDeserializer() {
+ super(TinkerGraph.class);
+ }
+
+ @Override
+ public TinkerGraph deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+ final TinkerGraph graph = TinkerGraph.open();
+
+ final List<Map<String, Object>> edges;
+ final List<Map<String, Object>> vertices;
+ if (!jsonParser.getCurrentToken().isStructStart()) {
+ if (!jsonParser.getCurrentName().equals(GraphSONTokens.VERTICES))
+ throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.VERTICES));
+
+ jsonParser.nextToken();
+
+ vertices = deserializationContext.readValue(jsonParser, List.class);
+ jsonParser.nextToken();
+
+ if (!jsonParser.getCurrentName().equals(GraphSONTokens.EDGES))
+ throw new IOException(String.format("Expected a '%s' key", GraphSONTokens.EDGES));
+
+ jsonParser.nextToken();
+ edges = (List<Map<String, Object>>) deserializationContext.readValue(jsonParser, List.class);
+
+ } else {
+ final Map<String, Object> graphData = deserializationContext.readValue(jsonParser, Map.class);
+ vertices = (List<Map<String,Object>>) graphData.get(GraphSONTokens.VERTICES);
+ edges = (List<Map<String,Object>>) graphData.get(GraphSONTokens.EDGES);
+ }
+
+ for (Map<String, Object> vertexData : vertices) {
+ final DetachedVertex detached = new DetachedVertex(vertexData.get(GraphSONTokens.ID),
+ vertexData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) vertexData.get(GraphSONTokens.PROPERTIES));
+ detached.attach(Attachable.Method.getOrCreate(graph));
+ }
+
+ for (Map<String, Object> edgeData : edges) {
+ final DetachedEdge detached = new DetachedEdge(edgeData.get(GraphSONTokens.ID),
+ edgeData.get(GraphSONTokens.LABEL).toString(), (Map<String,Object>) edgeData.get(GraphSONTokens.PROPERTIES),
+ Pair.with(edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString()),
+ Pair.with(edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString()));
+ detached.attach(Attachable.Method.getOrCreate(graph));
+ }
+
+ return graph;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index 86fc733..b4356b6 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -23,33 +23,31 @@ import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.util.Iterator;
import java.util.stream.IntStream;
+import static org.junit.Assert.assertEquals;
+
/**
* Less of a test of functionality and more of a tool to help generate data files for TinkerPop.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class IoDataGenerationTest {
- private static String tempPath;
+ private static final String tempPath;
static {
tempPath = TestHelper.makeTestDataPath(TinkerGraphTest.class, "tinkerpop-io").getPath() + File.separator;
@@ -173,6 +171,23 @@ public class IoDataGenerationTest {
os.close();
}
+ @Test
+ public void shouldWriteAndReadClassicGraphAsGraphSONV2d0WithTypes() throws IOException {
+ Graph g = TinkerFactory.createClassic();
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-V2d0-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create())
+ .create().writeGraph(os, g);
+ os.close();
+
+ Graph readG = TinkerGraph.open();
+ final InputStream is = new FileInputStream(tempPath + "tinkerpop-classic-V2d0-typed.json");
+ GraphSONReader.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().readGraph(is, readG);
+ is.close();
+
+ assertEquals(approximateGraphsCheck(g, readG), true);
+ }
+
+
/**
* No assertions. Just write out the graph for convenience.
*/
@@ -275,4 +290,78 @@ public class IoDataGenerationTest {
GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create()).create().writeGraph(os4, g);
os4.close();
}
+
+ @Test
+ public void shouldWriteGratefulDeadGraphSONV2d0() throws IOException {
+ final TinkerGraph g = TinkerGraph.open();
+ final TinkerGraph readG = TinkerGraph.open();
+
+ final GraphReader reader = GryoReader.build().create();
+ try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo")) {
+ reader.readGraph(stream, g);
+ }
+ final OutputStream os2 = new FileOutputStream(tempPath + "grateful-dead-V2d0-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os2, g);
+ os2.close();
+
+ final InputStream is = new FileInputStream(tempPath + "grateful-dead-V2d0-typed.json");
+ GraphSONReader.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().readGraph(is, readG);
+ is.close();
+
+ assertEquals(approximateGraphsCheck(g, readG), true);
+ }
+
+ /**
+ * Checks sequentially vertices and egdes of both graphs. Will check sequentially Vertex IDs, Vertex Properties IDs
+ * and values and classes. Then same for edges. To use when serializing a Graph and deserializing the supposedly
+ * same Graph.
+ */
+ private boolean approximateGraphsCheck(Graph g1, Graph g2) {
+ Iterator<Vertex> itV = g1.vertices();
+ Iterator<Vertex> itVRead = g2.vertices();
+
+ while (itV.hasNext()) {
+ Vertex v = itV.next();
+ Vertex vRead = itVRead.next();
+ // Will only check IDs but that's 'good' enough.
+ if (!v.equals(vRead)) {
+ return false;
+ }
+
+ Iterator itVP = v.properties();
+ Iterator itVPRead = vRead.properties();
+ while (itVP.hasNext()) {
+ VertexProperty vp = (VertexProperty) itVP.next();
+ VertexProperty vpRead = (VertexProperty) itVPRead.next();
+ if (!vp.value().equals(vpRead.value())) {
+ return false;
+ }
+ }
+ }
+
+
+ Iterator<Edge> itE = g1.edges();
+ Iterator<Edge> itERead = g2.edges();
+
+ while (itE.hasNext()) {
+ Edge e = itE.next();
+ Edge eRead = itERead.next();
+ // Will only check IDs but that's good enough.
+ if (!e.equals(eRead)) {
+ return false;
+ }
+
+ Iterator itEP = e.properties();
+ Iterator itEPRead = eRead.properties();
+ while (itEP.hasNext()) {
+ Property ep = (Property) itEP.next();
+ Property epRead = (Property) itEPRead.next();
+ if (!ep.value().equals(epRead.value())
+ || !ep.equals(epRead)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
}
[24/50] [abbrv] tinkerpop git commit: removed NOTE: Neo4jGraph
currently does not support HA and added an image for the HA section. CTR.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da26cf18/docs/static/images/tinkerpop3.graffle
----------------------------------------------------------------------
diff --git a/docs/static/images/tinkerpop3.graffle b/docs/static/images/tinkerpop3.graffle
index de98d34..11a1a94 100644
--- a/docs/static/images/tinkerpop3.graffle
+++ b/docs/static/images/tinkerpop3.graffle
@@ -4,8 +4,8 @@
<dict>
<key>ApplicationVersion</key>
<array>
- <string>com.omnigroup.OmniGrafflePro</string>
- <string>139.18.0.187838</string>
+ <string>com.omnigroup.OmniGraffle6</string>
+ <string>169.14.0.260934</string>
</array>
<key>CreationDate</key>
<string>2014-05-12 16:00:33 +0000</string>
@@ -14,19 +14,557 @@
<key>FileType</key>
<string>flat</string>
<key>GraphDocumentVersion</key>
- <integer>8</integer>
+ <integer>12</integer>
<key>GuidesLocked</key>
<string>NO</string>
<key>GuidesVisible</key>
<string>YES</string>
<key>ImageCounter</key>
- <integer>120</integer>
+ <integer>121</integer>
<key>Images</key>
<array>
<dict>
<key>Extension</key>
<string>tiff</string>
<key>ID</key>
+ <integer>120</integer>
+ <key>RawData</key>
+ <data>
+ TU0AKgAAQriAACBQOCQWDQeEQmFQuGQ2HQ+IRGJREFxUFj+MD8Ux
+ sUhuPBsPSEPA6SA5+yd+u6VO5xS1xOyYOxnTNnMObMN+Tl+ROeT2
+ fT+gUGhUOiUWjUekUmlUumU2nU+oVGpA2qA2Mj8j1kjjuuDsTV8T
+ AexAcCWUCQR7vx6gB9P18AAAgEBAAEAMEgADAMEQV9319vTAPRkY
+ NkMbDMZeYleM3GM2/PupZHJZPKZXLZfMZnNZvOZ2igjQAg26M2nD
+ THAM6kM3G4vR9PEANx3NQAN54NcANh1s8Aa55AB9v58gB+v5+wUC
+ AICgACAPlg4DhEACwLDYACgJjAACIIikAAIAgMATp+MvzMtCelCL
+ r2LryZ74fH5fP6fX7ff8fme1UGlP/CmNkAjYGMCBidx8HSARqHUZ
+ QAGgdBjAAch5G+AB5n0eCBH+f6BLiosNw4AoBgMADoOkEwJhcAAY
+ gyHYABMCUVOWBB9mPGxjkjHJIltHhbHxH63v1IUhyJIsjSPJEkqg
+ EUmBET8nk+H0pB8tK1lobRRgAYZwluAB8n4e0OgC+kQAAC4GA4AA
+ lhKLQABkDQfLwAQDgAV07FcMU8jEeM+NhJU/0BQNBUHQlCqOswCD
+ NRQzD9Ro/AmCoIguZhzGCABdG8VgAHKeJvTFQYRgiFQACSEosgAF
+ QKhmABkmOZRjDlWI5GVWhlRBDlDVzXVd15XtfMo0IEEPYZDjdYw3
+ H4f59AETpnkQABnnOYq4Q9X4ATKIAQCaAAsBYNYAHuex8HqLlyi4
+ WF0FhI7nRIAwDgUAACgReACALOl6zoAwEgWvAEX5ey7gHetqTG4z
+ jn2fJ7rZceFrXhGFOMneH4a4B9Lef5/H9a2N45juPKMBWQgUTGSE
+ wLuTi6bJ2mgABTGmSYAHQehx4+hgag0H9uBaNjxnqf54DzoI8k1o
+ hNYzjKkgEATxAIAy9geCoNgADQSBeAAG0kAAIAsDoAAsD4ULoBYH
+ 7EBwAAYCAK7PrYAXYy57HkdzengdQAHseZ3gAfB6Ngdhym4AB2nN
+ T24HaABzm6aXAnNCp9n1hR+8dmvJ8pysiA7zAOlbzZWhoGvPF6b5
+ XgAWJsFAti3csh4IgQCgADKGY+O2CAUn+RPbkSPXdD1W6ErkuYFA
+ Y6QOhU6wLg+7wPBUG4AAkDAQAADAQhZeIDru1nVINMqCHedBwAAd
+ RxGzmJwGqABwmoY4AHEa8GnkdpzgBiPs/p+v7J8Af8gHzhWif/wT
+ 3QiuAAKsaomVrwHfuRAB4BwJAADsDsR4AAIgHAsP0NUFw1Cbg0Js
+ f4CG0AABwE0MoAAVg7CcAADoJ1VnOTo9iBJkR+MIcWp4aYwYBDTG
+ G6Mco2zeMYY1C+IEQWahhiIGETsRxOjMHOMAAIoxowRHy6mIREwJ
+ gJAuAANoNxCgAAmAYDA+gniVFgM4XA+QIgtX6vyKZ+XIj6AAPFwR
+ sRmi+ABDh0Y3hojDb0PVP0a4/R/PyR8DYyZCDJH+A4fIGxDjDDae
+ MfxkJAE+BWBUGgAA3A3EMAAao7Uwg3FKyweo/DjyRSQmUeg7x0gA
+ GlDZVgtBNqbG2yyUks5aFQATLcBIppdCmCaE8JgUBIDIDwAAbQ7X
+ FS1J6XMuYSgTJtCaCYLwABHjOHMAAOQvxuodMyrhDRA0xlwmQQ9i
+ xaxyDaGdJoYYsY6jEXUO0cs2ZwzxnkQ0KU9QpP8GiOl9Qlhlh/nm
+ UEAZ4QAB3B4JEAAHgHgmAAA8SaER5j7lGUxXADi8gABoBcBp1wKL
+ wAYiKYg70wjHHKb8dI9pITfn+QxuDchqjFFkAAYAqBGMxG++alNN
+ 5AGsACL6ngvgeA/B2EASAx5hjbHcNOnBQQaM4AAGQGQegAB5S2AA
+ RIy2aFIAdR4MoLgMgADGC0DAAAUgSLuQwco9Y3CpN0AARozByAAH
+ Ma6bVSSErjNgM4Xgp1WCzleOcb1SB+wxrpYNyYRLDBEFrYkWo1R3
+ DLAMJgZggbCUAoEHsHwli6AFa6C0UAzXDj2jcUAAiHhQhJBOAALQ
+ KG1FEGOOceYAAlCuNoPBL9kyGw+QcL8VQABbCaqg917727bXDT/T
+ pHotghBFCAEgRIxQ4ISHkp64hQAYAYB0AANINBAAADCLkbQABQDV
+ lSTwuZAhGBABGAAN6bzvlLF2OJDIUhYjWN7RC6ZDR8t3WgL0VAAB
+ hCrEg+AcQ2FrtIvvgc+oNcFA1GJg0YljBlWPsjN7BBQRJBJnUMgc
+ 5kAgipGitelBDwjggOkLUKL1KAlSDdNgAAkxnzVwqTyloswAC+FK
+ s8cI1hkYFh/jHHxkw55BDmIzIgjBSDTwClsW2PygwPgiBEBVpwaC
+ jN4N8eSQSHiZCICUAAZgXVhMle9DIRhV1InBkwiNuBki0E4nUSMj
+ Y25ozkUsVmdRWH/CmH0X4YXwD1HLnMnoOwOhHAAF4F4c7UC2fGKc
+ a7dczkMFpidNQITpGSHOPUyAGxMY7H/iEiauKyFnBkBYBjWgEFnH
+ 4P5Dg6K0AAGcOkehbNVS0G+NNaYuxQCCmIM0XmPNAa/Ii0ppRLhx
+ IlH2BsRIxA3JeilsAiAFgFtSD0D0SgABeDiOGE62RAjwENGCFdqw
+ PgNtmMlSXTImRknEQ2REupcw0Avq6HQGiaQNgMRIQhZJAhpDrLWH
+ IYE2RhDkNhNyP7GTjjGFgJcAAsxKh0PHDLZ3ESDAV4oBUcPF8cjw
+ GUAkTQzYt8SIkmNMYhgiJZHMPXUoMxRznH1rMhgqwmneCoCV1xks
+ rHDBEJvdK1CGgUAQcu0tpwkaUvaT6KKHA/jGHCAARlVjiTIHINmz
+ wtxOOyGyMoXK1918gzmEHrwQT2i6FmNwUQBBcDbr1zzrhDENsayc
+ iUBJ3gZCis9We0JCw/A4A+AAQIOgPGTFENZuoXxbvj0eQcA23RbB
+ SjQEOhBSTgkCDKLsbYABQjUHRXOWbFkwi/FOIrGopREnjYt2vHwb
+ /UBvEh6v1YyA7gAGuOw3npiH7rC+DHhwOQOaE5VOcZ+/CGgsAovw
+ YwWTtANALeUpfLgo3zAALIbzhiGBZBQBYAApAlWn+UUwdhaQAA2F
+ LlXK9KRqDDXUK0RwagAPvfj7S4geP4B4WIIcQQwQzqbHmhX9xEAq
+ grDQAACIBCCk++FIN4GWHU1ituIEDuBsa6EOB6eg08KMFIGuHWu4
+ FwfGWS4IISFiCeBWAACcBGgaMk38U8mmz+Y3A2IHBUJ6m+HGGwGY
+ AAFED6CmAAlQ2K/2ro/i/kWIz0z4HUz9ByIeCkBSDIAACOBGCtAJ
+ ANAQIkVwC+BYiuE0CKoU8SJ8H6VwEKGSZo6Se+IgtGTGHeDYuuo6
+ +2Ki8C8G8K80PuVwAG27DKea5/AAA+OkBkTOoWAOPEBEAeL2BAAc
+ L2AuAUOWIg0wY0HAHmOGG2pAZiNcH+G2FqFMEsF4FSFEE02IMCHo
+ PfCEj9B2/mD+GADHEYqvE2IWCmBUhGCMBECrCWABAPASJ+Ba+GAA
+ 3eq6CNDoAABBD4IKNcOOFsG+bkE+vEAAF+HEbzCwIkASOSAAHWDU
+ ByAAAXGUMk+gbkCeFeNo7UMy26i5DkB6A4bICLFuBOrIAABgAq1K
+ gmPEIIY0Y07aQsHyQyHiHybkHkHybyiiYUIQoCOeAOAgbOAMbIAm
+ AUiuPAmU6KnAHtIQHsGlIWGkGxIcGwGLIiGKkKGSGtIsGsJQojFI
+ Y9E6WIEQGIkaG+Hg8NI2ISCyBYZ4WyhOBtALFbCaKQ8STG1OLnDc
+ LmHwlEb01SgQsoTGHhDGbO+SMmFA8Eu5DU8OKlDyLmCWBEgaDGBY
+ rDHBH6+S08Q4Y0NkNpJEfGHCHgu+NkfMpMN+1VKqYw61HZJ2IM5E
+ WpIKTG2EOYTmAAVCO8BIAkeoA0AcegkmkqoCLOIIPIGZL+GYFDME
+ FCFLMKFKHnMQtfJKV4C3MaC2FFMgFEFAGiEUAEGSHIF6U/MWTKDS
+ Bqu2BQAouuBi7oAAGyHhHwUKF4CoRU8cbIMkqke+EQ6cKY+UB4A2
+ bICoBObUCeBGAmAAA4AaRIOKjcHEHi8qG2HaqQGsHWs9OKcALaOH
+ CwJ2PuPAaYOUAAA2AaegA+AgoVNAO0BOAoO0ASAGAWH+HXPQHWFz
+ PWFyFTPcFSF3PiF2H1Po7vMWSOBRPyBQGhP4GhAOF8AOFEGgEcYJ
+ Pu1UY0EICEdPEydc96jeLaVyDUBgA0AAEqCEvSKgLSQ4BoFKnOGs
+ k4KMVwB9G8AAEOB8BCAABqowXivKHaHu8yUoGEAAGCHAxoHcHvAt
+ KqcqgXDqAyB6AAB6A+CXOwAbRRIyG/SQG+D3SWD2zsFYaOx7PuPu
+ WCHVSqHUHGHyG0AaEoGSdlCxI1FJGSXgEECCE89gHeOWByk+xAV0
+ gmLOFyCojRRU1KKQ3yAAEEGO6WEKGQ2LSiIm+UBi1IAADWBjQoCw
+ +qbaS8ABOWs8GUHMF+NyN2AArQN/GwiCQ5DyXhO4y40E0IBaAuBw
+ LwLoH3IYGkR0EiFRVSFQMfSkPip0GFVgGEBuB0BsB4D0F6C4/XHf
+ PuVSVWkukyD+GO2KEGGNBxAkUMAwAURIF+CuRUBQAirKKGEsGifi
+ DcF8cBGPCcIEo6PEECB272DXQmABDyIEnyfUdKdOHKHnC8uI3WAl
+ IEtgTYAAB2A8CQLg06H+l2FMDrX4DqHPX+/bVaM6EnYIEmQEDYEe
+ GQDsNyHYllJKCs/8AAB+BBAGCCFQw+GIHPUqY6BCOgmsBoa6CoBM
+ ddWTEGIPTsG0HeYUEzWoAAE6GmfilDT8IZDAAACk5oAAEAB072BM
+ gnEY6WFwG4v6GaHMj1Ok0BLSA6AevSCIBFBqqWZyHOHKHQHIEXas
+ EWE5ayE5ISTDYEMqCNbACMFvbGFuGIHGFsAEFLVNM0/2Q4EazINq
+ HkRIymnOH262coVwgWPEBWAmX4Ag1OOA1m34jck2TDbtBYIcBwAy
+ bNAeehRGbNCAreFkdMWgWkflcvMWBORSAACYBMC6AABLc2GyGxdH
+ X6DqsUFqd7a8KcZEAUG3deG2AMAgACA0EEGE/+S/NQ9Nb/N8ESCI
+ r1NkreDyGE/1WOwPG6bIFkChA+AfCsGMHG6yZcZg1SkhdWILLSCQ
+ BKCxBAmgQ0ACH8UcD9auEXPrPtesKSD5fSD4EHfYEGFOGo2qGAG+
+ pfKPaQIGW6Z5YmhOB0FMZYGQHRMUwPJiu5KeqpROwKbyFWGsgMWi
+ GI3VTBfOIRLSRQRUCoBUDMoOAey4f4iKDDMTgDgiKIJKAddgG2AI
+ bMAsEKGEW+Ncj61+2gakD6B+4UGGHKOGCSFYqRcOumpQEUB8BEAA
+ 3kakHgHwHYAAEcGODqAAHTCDhCKEAWAKoyDVM8ABLmjRScXMC4Hz
+ i2OHicKI/nB2FcGuzaFyG6t2znLSCuBYDSAACCBACgos/CAAGaZl
+ DWrpTcAAEoCGBIAA+obUpGmyE8Ge9BXU/1i8IAAIFA4JBYNB4GBQ
+ EBgATROXQARhEVX+u12vF2ZY0ZXFHXFCJBIZFI5JJZNJ5RKZVK5Z
+ BQ/Lw+zZkzQKDAEEz8vzEAHu/HrLaBQaFQ6JAg2DRAADyPUmAHE8
+ 3+ABInGXAgDRaxWa1KwEAKuqCYKAAVRMFAA3He1AAk2SewA+H496
+ 3c7pdbtd5SAgDXS0LTaAB6HiWAGJhWITMQTHji3jeMdj8hkYKBgQ
+ Cy+k1Qvk2ZCcNl631UAFe107ktNp5IDgOEQAcBwiAAEQSHwASFba
+ mG5cbqN5kgeBgGAEwRRMACsJ7M1nWygAomgjgA8Xy7t71et17qBw
+ GCAAUBTOyAICaAGGwWIwS56S45PY5Ox7/hkR8VTgASebUepiWKQA
+ VBMB4AEqZQ/AA5RmvjBChquq4tBcv4fA8JgAEaZpygAOpgm8ACow
+ TDqVw4SghhIAA1hgDIAGwdhnrWZQ+AAfh/H3D0ZxpGkFgAK4WDUA
+ AghAJ4AFhIJYCtIgrH3I8ZRrJUloGDwVBuAAxkOWQAAYCILBGB7u
+ GCLAXgAB4CrkTBmECABtnctUmSUAYAuCIQRCi7oUJ2ZBznsAApFi
+ awAHWe8kzVJk2IENgYg2ABEh8EIAHSehuAAS5lzKdx7nVQFLUu04
+ EAIBQACyFg1gAGwNCEfxQlCURQjXVQ1nvVq5UxWDJAuD7+DQSBeg
+ ABwJxOgkOB6DkAFcJ4VAABQBrkUZpEeABoHOYwAH9aFYtOhQCgAK
+ YVDLHgQCgABbG+d4ACwWhrgAeZ9n7acljiGYOQmH9FGudcDkyZpB
+ LeuN1X1fatr04IuBcN4AB2DokAASmEEoN+Fjef2HWjfmIpYAOKAA
+ LhAFQAAYCCKySQ4HINAdbwpBYAAIO0ABQGgRYAGOchd4kujtASAA
+ thcNwABuDYhgAap2zuIRVmkAB1HtP+YvgDwGgOABpi+GgAAQAZ9A
+ AQRgjPPh7HPpGua6lQEgIBYADoHRGAADQGBCfwxbYMVTVNr24oQG
+ gkC9HA8E8AABAE4KVCID7WE8I7igwBSomEcJa28bRTAAeh9nluST
+ AkBIKgAL4XjoAAUAoGIAFkbzqDIXJtT5P3JOshSrlKJaxCaENOEs
+ Zg/gAbR2GjDfUd13aCAoBQMbGHRGq8fACngIfkCGZ3lmd3mIgmDQ
+ RAAOxRz2AgC6YogNgZphcioFoABXygAHIeRugATpntgc55nD3O5R
+ uEwJhcAAvBeOQAd9E5QmtSo1C8G2AAeyMHnGoQ4GQFyJxNhFRGLg
+ boqUgDXbyVFDkBYLOoBsBsIKUQYh5AALmEAuQlQjCUw9iEF0ll7K
+ 6FkPIoAAAzCORAurhSGB6BwB5KILHgAEACPkAAxRxi5g+NyCA7x8
+ DsWmV0q4HgIHFR6j8GoGwgLmH0VcOaGTmjVHSi8f8FYUGRBWBNTg
+ wQrpeKudQQgwQ0AAHqPsekX44NyAIAJawYgYh3AADIDAPR/hIj8E
+ gXUgRdRxRqCMGAPwABoEeLxvQAwCGmCAsAAAlgiAlAACl8cbXIi/
+ HAlQYg4RbAAHePcdZViroIBEBEsQRgRhXAAC4C6UE2SPGSOgeYAA
+ zi6gCNEdhP5CGnQ4KMJRYguApcsKUaYkQAOIcVL+ZzcVNKcECEAT
+ gABrjPG2McIE2wgD6m81SZ51YVAADuKNcoFQOnFN6hw1RwTjuWXY
+ u4FT4yek/G4mhMw7RppmHdPseA+B2nRoAi9GJA5TkggoQM4BDAIA
+ ILMBoBptASgSfACgCoMgAAZAZDgfg/1rDHHM5ETI0Wti0G9QFozE
+ KDzhLshwHgG2RC3Cm+BRi5RIjID0AAfI/VX0sp8zEH4H0JBYBWGw
+ fwaakBpE1UsTVPzUAeBSDYAAbxMjJRohwBpwCIuAqmDNQzIGRQ8I
+ M0aW8RokD6H6PgAA7B7DoioY2WbJgEATS+AcCQADgNMAkAoCzUQB
+ qcIIOwnoABfjkHghMZZ7hlPsfeVapxkQFRzsJGVjQFJHiJGKHB8g
+ 8kNWPs8vwhRDBChDFCAAfo9QAjuBbasFo5rXDms+XQBYDyzBzE8i
+ sB4FV3KxgrF1zcYgAAsAo2IJYIq6AwAs2IBYBTggMuZXhQVvi3j9
+ Wi49dJcFojFHK5EWg3KAjMHVG+wU4GK2xOwGkF6JxLIiAALsbwqw
+ ACsGsJu819WIg9A+EpiwLbNCSv8JJhjAr7FYCCFkOoAAmBpEU7qL
+ yHEOAKq0A2552iurRKjdiKi6R8wEK9KeleAz4Oqh+FkGAAAWgTK6
+ IcYhfx0D0HHiDGCmLlgNAAHwHwl6dDwH6OcGmPQaWvthjElABwEg
+ MAAHMT7uHoPSyFk1NQTwR10FaE5YgxxxyhFGNFZeHcnZdSWDoDoR
+ nLuZAAIHMwgRAZpEBl4kgRQvh9NqGNe+bM6IIxEMQLGJQWATKjio
+ v46h65BzroNBFC8ag+EwtAeQAxzgz0cDMc+kWt6DAgBYDoAA5Cde
+ bbMs2hNPG9ByBlkQwkuoFHWMdg4yc4MUK7p/Vx7wpgpDIREEbHQt
+ a3C0KfXQp9CHzs0ffLer9hGSEIDspIewb6XfSbAZQ5RfbD2gdYEI
+ ECxB2B4JAAArRV7aSKx3LzFIrCeGhRkEb9LeECBiBfIwNgMY0AVc
+ 8elaAADJHO5EaY6yfj/w/tGFJAxmhdoxPMrpOSdz/oDvzhBko5rW
+ DuDyZQCB8AOHUCLigIh68Xl9jEFYOwnOXEGKwAEjlrKABxu16YNt
+ LhIBBXdsG+yBj1gIM1RihxlYvFuN86kXuEnxBMbIAA0QvAzZ6OoY
+ QABNjNEM7nnXO+mF0t8EMEYUj+goDOP4LfVwtio60xnAeRMjW23G
+ BMDYI0mIcDkDRdwiAeqKIUUOjpAhJjPQsHIX9neXdNNN2pRQdwar
+ uswwIbw71y948IY6htdA+6IAANIZg1RjA88gDyLt0rPgoBuwYMgi
+ pQ7gSWDQC+NIyP0sjq0uoKxQIHGsO5O/hTUDkDODgAABwBUBEHGp
+ fHq/We5K3F1aJSxKMmH+Bcd4KviAqHR8et1sQrh3NKDYJZO0lYij
+ Il7UONDHi3HAuEJwrxqxc6X7orKbCrj2DeDufIzAACSGTTmx34P3
+ FYKiFIFK2iJEUCT/cJMIYhVOeu0wPoVrF4BgCByxJTdjGgYrEgAC
+ sQyCnYqIGgUZ5oaj1T94uYBYAg4IegNwHQAAWYbQUQAAWgbQUkCk
+ EgrLMDMRzBzQOUFYOQR8FzYKnxuhuwLAPAT4rxvZJYKIEgswVwJw
+ /g3oIYVafYXwcaw8EorAGQCzIwZoLhzwT4aDBYZAciRkI8KooCiA
+ 2gP4H6+gUULoUQL8MAL6lhvY4INoS5Z6qCqRQALIFCvoUwJQE46o
+ Jj7gAAWrnEKwogPLlAAAQwHgpIQIYIMwAAcweYcEPEQ4lKrICAAA
+ RAIoUqZYX4YYXwIkSgIjyb76CxWY/jJB3DkRSwJi40DgKBYg3oH4
+ VJoYYQ3URAlag4SoIaSy9B4AOQXIKaNgfaW8VcXIkS0LTAHRlgBY
+ fICQdIDcYgDYfsY5dKQgHIJxrAKgOjRJWAEABw7gaQL7oTCT0gvA
+ dJowAAGIUR5pOycEXQkyOYq4WwKJkrdhdIPgXwMAACtCH0cceQgq
+ g4MoGZFwFYCIGwfACsfoCoekgCN6QgL7j6V4H8WpWCg4T4JEOIL4
+ FSvox5ChCwOgYDu0eYkxqQrocAMxKAdoejcYSgZTOAfof8ZMi8eb
+ yZ+oGB/AGwC4IYfT4oFQbsmZ86FAyhsQPoVgj4BQByu5fQBkC4AA
+ V0UYAAIqJguYbCUcbsb66aE8k4kj0ZcwNr8xlwXAADLJZahMp8lA
+ qJeDjoK4FINQfoxIJgXEs0qyFADgEyjAOIThA5roDYBYhgVoJ4FZ
+ nIDDIwoIaatghsOgcIeatUrYlEqIecqYAAYIcIWAAAVAagS0wUx6
+ WBKANQGgQQf4M8y4M4TczS+iFAHgKQNgAAKIOAppryrCrQL4FYC4
+ AAMqBIAADhpbkKU66gqIb4eSHwWAbaJAToaitwc7eL9sx4k0wkww
+ XwcAVwAAVYasaE4Mk6iZkpsg6APM6QPIRE6o2CFALpjBjQISVyC4
+ AKdhTRXKrQ6QfgAE20ZLu85glU4b8wXwb4Vs5AawTM9Uk7aYsQPA
+ HgSTGoPk/gQs/wQqAoAYAohgN4TAZAAADYEpz0+jpk9gAE90+AVc
+ +VBkeaVI/gO4HaZU/k/s/6ArSrS4PQVB88T1CjhNB04s485M5dEs
+ VYE4CZLwOQHJlgO9GgO4RVG7BZ5wFIHC/TzKZtFjndBwYQcRKgVA
+ ab38TFIECgGQDIHk1YGIPgfwMNKYMML0D55wLAPMGwGoJMdypzyg
+ hDD1JU4SyUwr8wZIcqQYUIaB4crVMb963yBgKo7oEoMQfgItPAIo
+ YFPYYB3QAgygAANISLZ4EAFYHKFBvoACBBE4PEPYDEuSvwq8kggQ
+ dAexqgVp2wAAQYY59wdguFN4gjChnoMDoQfwfqAISAZCPBGE8tUD
+ 9y3wMQGSPAGACgHofIElXAEg9o9x1BXRE4PYVJDVP47h3jCQ4ISQ
+ ITsgLoFU1RQQlgbweKtQJsOgaxn84FCj8S+MHw2oEA7gOwXQLKnS
+ tNVz8CJSRIGp2gEwBwGIe4CVdwCQfFeMwJyQC4EBYgOwUT7p3gAw
+ vQAAVQJpYjKEnwrQb02wAAH4VDcYck39MYRwIDsgOIGQDRsYXVOY
+ eYfQ3dcj1g7Q7jhqZQfYdoAIcAEdkgEaEx3QF0g7jzkB3gLcNo5s
+ OBvQxwS6kgAB/5Rwr1IE1hE4TQIhEazCzTwJPdjT1ihqu4RAIhxo
+ WwWoW4WssiAoIILQOzBANARLBggQXIKp8AI0o4x4d6nYAADwTSqy
+ 61FgERLQAAboMYGoACZE/RxAWloj1gD6JoAAPQHj34TtvQToMlvr
+ WZ5wJQMtAAIYLr9huS5Y4Ib4MiqQCpsAyCE4KwWZcoVs3NFkjKAT
+ 8tB899f05Sg1uTphHrjoLAFk0AjYMoTl1Cap5wLQPcD6GCGRuQEw
+ CBmgZjgAAEbA04NoXx84SgaDQVBig78lJx8r7oRYYp/Fz7hMlJmx
+ nAHoDoJYfwIN6QIIYV6rop5wNoSwYoAAEAFkDZyQEABo7gaAL6jA
+ 39RIyINYXp84SwaN39FgZALRzzPZaIP4X4Mat95LaAvQrrG0xwAw
+ fABoddXIEgeWAxyJ5wOjJLcjcxuVRIbQMaqVs57Ixwe9SYHgU7cY
+ Zy8NN9nYAATNn1toaTbAYZxKU1/TT4D4B6S1jwAATgTQToTINGGa
+ NZ5z/rI+BYCwD0OJ1BDgSNZIAANwGNiYx4aDfEbsCFjRk6R4coM5
+ KAcQeB3D9SnMkkk2FDLslILAFpHYHwDgJofksj/SAoBIBo1gOZ9I
+ 2IDA2h3ieZTgX6ygC1xwrbt5y4W4bIAAUwbBStz4XR74AAIYDxkQ
+ QIYDWbFtXmK7LrGduwHwSs8xOwbwFGSIFBJBo53VD4AEtpA8AUAh
+ 3hDgJQESu4VIJg/i50bIoQQYZAj4QIYx92K1uQN4GRQwSAIB6VCU
+ +YXgb0+GRDLoFYCpqANwG7pISuYYSoNmY00CFGHQsQOATQ5gA4BT
+ 6yC5DmQERYSuELnpmk9Ig1SpGQUAaiLYPoYob6LmXYE7nwZgLijC
+ WxPYRoY4OZaFMGXa8wqIL4GBzQHIDYIwf7/D/KEKL9BJzyqiq1Ei
+ Z0CwroJoEYswIIDxAAFq4YAAcYeaHwYYcgxoV1yoc1hmbV5JDhYR
+ YgJxLIAARgY2d7wLweeS2IBgAxkQQAIA0ocQbYcgaoG2mgGwe2m7
+ 3CCwD4Fb2ANwS7VDAdJNa+lAkoGcJUw7UocId55skMkckuoipzWL
+ WYIoiYf901vY0qQgEIFr8wNgSoYmqD1hDgWwKZkoJIEA1mked5M6
+ fesKX4CYBM1QPoH7HAcYbwcwbQF+vQF9eVeaOGrerur+tz3MHUHl
+ bYaAdF7YS5MmwaQghxuwJgEoLhC4OuyoRmy5sycJJxKGnzVDzmxr
+ naHgq8hcOMNg1gT4Z7BYZYc1Pu0B3RyivulqaobQawbYaYH23AHw
+ eG3cIyZ9BLEtAugdAe1zvADh7gAGdBzwBIAaW4QYYQNM8wfJcO4h
+ iRG4KI75HgDoKIfQIW7oIQYu8F7apydA4uZgqoypkTGO0QAAFS4A
+ GrkwEttAfIfwqKWqW4ZwdKW4dCNuod/RDgQAHULIHKHAXS97bK+e
+ 6hiQDgBx6Rsh4YVwVIWAUoL3CgL1k6py3JQ2TN24CM1S+wCYA6R4
+ R2IFlyvtZwkYcwepqgPiT5lIaqt2oVjQCXELeYLZzxpQgUQEQStj
+ 5PBJSxmduwpg2IAoC4fIGHI4GAbHJQbC8zIsRYOS24AACQDApKz8
+ A2PB1oABLNYgoEBrowaatwOwYRDQnsp1ohXySQWYKMuwbYdoYYAA
+ TwZ1q2KvHxG1nIJ4FEdwJIElcISwTYTgToNgM4MwMsS680TwOgUB
+ oeZSpxsArrPDEsJJsQuwN7ur9LuWXZDgQ7tYAFRpd2WwAAXob049
+ N3Oo94EgCUuw1w2FTwroFwJAKQL4dgYYWlK7GOBR3ADLcqcKg4Ob
+ tAAARZRIyAp5qgF4URA4eDDeRGJfGpzwEIBwruxbNYaodT9HUw63
+ BZ6QOIHFq2CxsQJQVwtQZgRgOSVwaAX40LIWgVsKqKcN85FAMVth
+ wrkYyQLQW2O4U4a+PejdV2agAAXCmaNgfQ6gQ4Yc0Cs3a4yKvKqY
+ G4Q4qQCRkoN8ir9IZocZaISgNdJwcAauoDGL5b5r56cOcxmgbAMJ
+ qA3oU4bKUoLYWvJnGNz4HDUSwgKx+gq6HwRukgAAcIeKAPhIrYCK
+ hx6ba924AyvoNCAHOE3ggQfofhGQQgKo2geQdrSbGII4MRMoIwMB
+ AiZ4GACpsQZ92w3tyigNyJPfM2qAMYFp4AS69itgj4TQZoQkQZ9v
+ nwoI1Q1gNNdAADaZYgQoZLF4P4YsQ0pwfoffFYJY1gfQfGnLEDAr
+ A7BNHKZwD41QAAcFxY6qcxSoL3e+/ulCg4MgFpE5ELshPw6im6Dw
+ csQvuokwB6uxsYHZ4YCwBRQwTyLSRIXaAIfe+ggwdYcZ0oRYL5kv
+ pmSrAYFQHRCQMYRAWacK5w4IZfGxzZ8Y0wJgWBPYWobrg/fmXb0h
+ QhQwRReA6Ie5CxZLbAbQdpof1Ygvu9mwGrNbaY/gTAaKtwOAX5R2
+ +eoQZYXC0oVIQ4gBhAD/ggAg0HhEJhULhkNh0PiERiUTAAVDomAB
+ 4UrZikdj0fkETf8GMQtDAATpGEshkDXdz3AA0UjOAD2fj+lk5nU7
+ nk9n0/iIBg5fFYXACXIkrAoCfsoZ6IADNczCoFVq1XrFZlgLAoNA
+ BoGh+AAjCQvACRZzlAB5YbfAD6f0jiK6UCCAC5Tx/rV7vkSBoRox
+ 5VDcAAHBIMvuJnYHAYCACuJ4qABKEARq9wkZfW7aACobDqg1CxWj
+ 0ml00LuRbFIWACOIIjAAOAr6ACnaiUADKcq+AFxnGn4HB4USFIUG
+ QALYuN4ACAIk53YVuSbPtT8uURfz+pqePBOADXZC24fjnQDAoGAB
+ nRq6sYwH/k+EHDYM9C0KIsAAwCoLnb3fqRjgXxugAThpnO3r4wTB
+ UFocuQUgkBQAFgKAVgAEwIgQABem+VwAFibBQgAfJ+phBkTROibG
+ gIAAgA+JoACeFCBAEAUMj+YpwAARBlHGgaQH4fZ8gAQIog0mp5Hd
+ FElIUK47k6AAbCWMUluEBwDAGAA3hmDgADCooAPm9ACAEoSCgAfB
+ +pwX5xHgABJGecwAF2cJ3ypO07uGEYHwyTwkBOAAfA2BwAG8d5rA
+ AV5sE8ABuHcajen+388UmxKhKEDAGA7GEZAAGIMB2ABtngfAADcX
+ zCFycE6uukJ3HRHJDiwEjeu1SkThGGIgAANRIl/WzhzIgwNAWA4A
+ A+B1inofamm7UYAWUptf2labEsYxwwS+PYcA8AAOvoABpnUZIAFq
+ bZSgBOjOJxSVqXahrROYBAKAAJwUC+AAbg2IYAHifShEgZq1EktN
+ +H0figGgX5VAAUY/ivd0FgeCoNrWUxtgAArDYhjeOY7jyG2G9BMi
+ KjAmBEyyRpGYxxlwzpqEst5+yFj9bAGAMsBoDT3ikFQyuYA4JgAZ
+ 51nrLpcI4aOiL4WxNj3DRRkNmlgAHFY3EuY1uhQGupa5ruvTuAoA
+ qEJgR6COYaS4HIMq8dh7rUYpxFyABlnLXx2nudOvuE+gHgAF4Lhz
+ QAQCVYwHz+c56n2ABBmQcQAFCau8num7Rk4Owlu+8O9ODJsnyjKf
+ NzvM1WIPeGxdD1EErlK6hCwFDWEcIARAACYERWmx6AAY5xvYYRwF
+ oABznpHuxXh1KOoIkbm6CHQOiMAAhBCKDYgOCSa8pyG8kJxoAHMe
+ jaAB4y+nwep4gARQvQqeJ1rV47RhwJwzAAKo6Ez9zhrkDNviuE4K
+ gAD8DrfQZAWK8QgaY7GijCHG+YU5nwADjHmzN8T94KF7LkB8B6xQ
+ sAnNYFcFD/gYn7TOP0eyhFDLgHSMoAA2R2DRAAOkeo5AAD8H6+B0
+ 7H3SIYf9B8GIAAWgWBsAAE4FIegMAKoMb48khCrGyOthg1m8jVHb
+ CV0hwByjbGeAAR4ZAZkDTNBUvYFgPAoAAHcUg14wGmBoBcrwqwmg
+ pAACBZBIRyPfAAFgWkaBjDmHkj6NMfy+FyASmMAAQQOgQAAHAGbF
+ AggekQAQ0ROCmjlHkW4ZA5BegAG0O2Fw6R6QycnCVSz4YbnCJGXE
+ kZSz0KYS4B8CBGHmvPA0A0EAACuKDUkM8dTRRGDLR6Lkb6dR3j5Y
+ O+FEwsxKh0AAMAVIjZAF9YyAkAAexVFuL+UaZ5VgigfMsKkJkcAI
+ mMJ+v0poWhajYAALYb6SZsztK0XJMZQgUASmkEIDxloAN9BwBlQY
+ GCuEHJxFNvL302jgHgZwl5oB7D7dy0ROI8B8jtREPxEpH4dAAAuA
+ xLiyJELIesCCV4AAGgHMsBQBJJ0xgFAAO5EajB3kwFgNsdichxJ1
+ GqOyErkzfwTQWPp8ibg0g6eCN0aU7i+hiEOLEAAKwdneqMToBUhB
+ lBcOOCuehexsjvVIDMmYAHErRqfWEvpcqomOCMZVQEAQABLBC0EC
+ cgwAIYRWY4+NECmjyH0U0XybAAC8ToAAX4402vCNoP+ni0h1DiI4
+ IkLkZKxF8B4FINgAAohwEnY8jxcgzgvAyAATARFZmlDYgIAAlU4G
+ hsxak0cVQLT/BKBCaSyEVgepGAAESewAT0pVYcidOpNUvAAs2Er3
+ ycRJVIOaCIAD/uldCMQVxuBXiQDbaorIEQMAfIyRsAABGM3UIaAg
+ xsywrAuXw2s0wy5PP/FRC4/y7LvXvvg14Swbwg3BGeMC+JQAAo0A
+ AGMRAswAApBw4S/JB3aorHKGgHBhVgmlMwAADgmFxjrHw4rAuF8M
+ K/HYORi4jgxnHHyPd3OGSfAsB4E8AAXxCCtAAjRLF8QJAHRWN4Ms
+ QQHpXNNXgpoIhNwqHbMTEmQchInF2KEQYABcCdLFkMnwAmqAAD4K
+ pHLEmKXxAMsEWoUj8BEkcaYX0CwABJFaNMt5ccmZnzQaUe4806iQ
+ DODcAGG2L5pJ8FANwkAAA9Cocu/Jcg0gwSMJYIZsDShttIJS08xs
+ 6aLJ7PBYM8WYrrOvbysQ2BkC3AAJsO2BNGE+VwroNIj5M37rpfCs
+ oABkhbh6CwCaEStDWJelAUkWR6w007rcigAS5TzQiGgGFnQeAbb6
+ UsoWtScCwG5TMU41jQDiuToqsIqhFM+GSLQTmuCe3cWKG0SwxcIA
+ ni7n0gwSAQvWFVG+kRSyfjzH2TiPEaBbDenZpTbGtwG44EKDuWoY
+ AWEnAbuoig56FvnR4AATI0UD3tkBmxvIjgxQ9HkO1A+9SfAkBkEI
+ AAZRFC1u2AZDOGLXzSEWD92YSK0GM3oQZEZIxcKqAAHYYQ3rf0Vr
+ GQYxpQtT5XKFjIxx81i1yltIR4oALfUQYOOse7ilRuK3aSNxJOCb
+ xV5TxQndtFii3CmC0AAKqrlWFANU0AZRdGcOtFV1F0bp3ONx1QrA
+ bWrxxBW4HNANgMFeCgCRechm+9NAAMSSiHtk6oHQPMxQC5CKYWKG
+ QkyFgIzSjWV62h6CtTDKaMcc8fRvjxVIK0bVMxmjp8IPOvMfu2E8
+ EmEJWYbNfmKCCKqoowByPmdSq5HPDoe4iTb6UqznwAOd3rTzs2TT
+ Rc+AByZ61ZzLRrMRHJYrKblD/YPLtONOEDsGVJQt3Pok215SF86V
+ UtgDKD3vIgpdKvGv+bWtz75QjHDqcmVH0Ey8wJzTqNSBAAO+e6IW
+ BJ20mgxGtsDjFBShsInAuBao0JSHNhghUhHAABZBKg5v9CsgFAHH
+ rA4hNhmLcgMgQwJCdsGp9lBg8AbFNPjGMNSiDm7h0IUIVBlBzDeP
+ YuZCbmDi4imvnCfJRmxDHExkVgKAFCTm/nAgZgNAfFugHLQiDrli
+ oh1HcpeoZBYhuqJK8r3N6gxN+kCCVNoDEhuvNAAAUBPQMuynNhDg
+ siVh2ByjCQOitAbgmAyAAAqA6BMMWsnQ0iHpIChAlgRHrA6AalNJ
+ 9oCv8ITI0BqB1IVOwQMpPIZCbnFQbElqUl4nrAVgKmtgWgLs4ASA
+ JEKsZDEBsNYhSIoAADpk4nvloupsChBAdJag+gcFNDSv3GDgYhQh
+ mnuh7HwGpBsBkmWhOA7nMFIwpw6CfjzD0A3hMBkEwASoexfo/AYq
+ MrSghlZu6CvCCHFBnBzhhskBuBUnuh5kcxGHjkMF5giARApgAAdg
+ PAjgAJBjEBxo7A1heDCBaQoCBxSrvBBAdrsA+gbluRWuBgYhRiaB
+ zB6xamOHkgABQA9gogABqBiKlRkjEvePfPSi5AQIMuXw+DkAUijJ
+ BmDhpB0hjp0hthTAAJKRuPSKxJ6DWAcgOgigAAiAQgpAAABgBjEB
+ cJggAHthwgABmB0MRx5qjAuSMAABRAkiMSeiehuFnAVBPwMh9ovm
+ OBwBqGsBLg3uMEgGZyGi+ADgFCvGrSPAMAQkKtGNSgiJuAABPgkC
+ MGQoHh5EBhTBphJRAszi5D9rOgqgVg0G/HAAAMdJphiEchNOEC3y
+ mrUt7ksBwgys4JwsXi+uvjQAwmjrUGNyqizs3nuhuIXSrjTgTgan
+ ngzBGm5Mhi5TCAAA/gdLsA1NALlB+o+hchumFm4GWnEvCN6vvtfl
+ QAmATAuCKgFFNBXhuKJA5BfjCIIIbLVBGuSAAA5JFi9wkgiBVvXv
+ YmPhlBbBPgABUhEHQTMDySuFjAVsFsMAhJDxQRnIhAIqVRqBiDHh
+ rhNqVh7onTsqoj+AigSAqpCgQMUNalijoC3BPhqQVPgpnsbksShI
+ yAnCyCfwkg/BjScBDhknHT/lfh6B4InMPDjn1oZTsjyALgQDJA5h
+ PBoSYLuLvAXoRBiAsAYAAIjChBWBrhNE5BuMWQs0MCFC5AXgMHAg
+ zgaA+pjEVgoBZFDhZx4rMMGhHAfjYA1gYkjJICPFlCcA5BguZBPE
+ DPnmODtGDhTBCAumhBehUUZEEuhgnA2QGgfAqg4LMPHzqpviKgEi
+ YBVBqhLychyr8CcUH0uiEF4APAHiMAvAYA5AAAFADLsA0heGLhWB
+ tInMzKwsGgZo2EYASGggXAKD+FrAAPRCmhkPLgAUgKJKsuaGPhrh
+ juOBOg8jvRe06kFgGAIH/A7BRlDgFgHl5pnoBjEBggrizLwGDhIh
+ kg9JNB2qi1TCeq3jAgerLgFgDJEArBZo0BWqZE7GbChAQrcAfgOG
+ +zRBlPBjc1ruoifnTJI06GpKfIShKg2AegAByBtCaVfklAUAbgkE
+ uhChXuOuPnjrbppBcApj8LbkVhThprLhhhxNMV0irgTgJizAzAZg
+ +Ezh/D+JzJ0P6D4LwDHAvAVCjLNrOgWQewTJRiDDrCDFmiYECwVB
+ NBpEDy9sC0qskMlENBSBD2AlKApg5GYAdAoA0nUP+EVhh0TOtqrh
+ VhrQ4hehvV4Ru2WirGTo4A3gcWWCCEMgdBTUPhoP7jS1nAABKTxg
+ 0AXCTifBdBwk2gmBXlHv8rvBuBnlfBMg4yVjsqwWhkqGJEuA1BJF
+ fAKANwjmPQ7NMgjCMFsDWBeBvsWBWhrT1jfW1DRgfgPgmI7gWg1g
+ ABihymignBXhqgAB4GDC926zSLsA8wRyYSiiOwBonAxTHsHqw1wL
+ Sg2wiByBsxZXBFpAOgUAaAAA0lejCjDl3F4CiCjBPgjiMBvB4I0B
+ Hhjg7GYyrXVDFJRgpmegAAigRAqSgtmL+hciOWOCrvlG5tVDTAmB
+ YXIBat5KxBhBVBHkPBKU+3hmNghgu1dgkgyBCJSXNj41FjEBgArC
+ zKFwVXfXgKE3xjhvvg2Ab31RL0TgwTHhS3m0YiWC5BDgewOQREuD
+ ShRXmjNCOYCIKVzCaBOA6nCOGX8GIGqKVAmg1BGAAAeAprpuhklg
+ GACEsBeLxgAAZgLFihJhlWEBsB2Is4MkEgKgFLOg6AdwGibCvAfL
+ 1rgwuCdi5BiAs0TgdpZjTBoGlAcBS0Ph8jsoKhzTLLPA4giKvB4q
+ Z4amPsnEVgxBDBYMAgcnMElg8x8gABDR7ENBv14U2034tkUAYgMg
+ eCvgZixBeBxHzAjhWqi1ECdBkgtIeu6DEDSyjlSR+iaFoHjzJBLA
+ 3FdBwhqxi44GvgKAOCVmrGsVXVYD4gDlgh0g1HAukk4hDhhrph8B
+ +IS5JkTEyDHCwC9AVgLHAgohY3IBaXtiQi5BggsCzFAlBjShmL0g
+ dhT0P3Qmvh+KfDahCl7hohgBVovVvZVGOAYgiAsgAAuA/SQjyC5H
+ XH/BTgloyDbDcBgBwBZZok7xLkKg6gdXv2tE2gkMxySiKYDAfYEg
+ a4FjSBUoWI7o8zIG9BdhRX1BcBOUdZzH7sXFAUyDJgz2WYNjSsYk
+ VqpoegIADE2hDBhrJnvo+6CklmbEVouA8gAAWALY6AXhRCaROZUi
+ P4kFBhhVasW32CcgnBY0f0gmpVSzpFFhXhIg3P8MQ6NowOhrKjcA
+ dgog1DSgqASl5o3I4BRBpQGzX6flbFMFNA+gfw4hE1rMoEcCQmbC
+ DBEgfHZg5zlCtBY3tgq0fP8Y/GaSFKlBQg+3l2T6opsysivQ3w4g
+ Ygh5q4SCqi5BXgoDJUCpEA4BbyXkR1O65Elv2AAA2AbC7GqOtZEE
+ RE0iQpBjHBIDXgAAzPFifBbuXAtpzgAJhpimpZIRihQg/T6ULbEL
+ HtSAAAjgwhAAAXy1d6DieuuEItUoeqDQMhJhk2EbVlp0anAg0gaB
+ AgAAxBcjOOvm8idW6ggK1M/kjAbu6gAALU/wTCDB2ZTgABnL0hN2
+ R1Mx44oZoFphnheBTgANpQ23R7gLvaDgkgyhCkWAsplbaiWRTxUx
+ VgABIBkXgBrh2UP72lfpBkIhGAjZnPLCYAhzna07yZ5CRpwqVJ5p
+ pbK4glSBwolZ+mvor0PhKA146KfGi8BML6DgjAxbYgiAuVd7WiJ1
+ JhsAw3XPDEkhCBhS75T7D8RkqJR2j2WAUDjCxhOBlgALjOqcOSgg
+ /grM4sOccsmbWgigvWEAjAwC9cWCHQQAAWcCzBoBzr8BNBm75a98
+ mFKAjgR8kgpAUw27kGLhPhqwVNb7SuDA5SVsQsR8xM6Ohge6EgmA
+ 0BE0QKVCFgxwrBOQsBUhqmYBfBv4w87Fpjioeg4AcCoBLBowVR2w
+ 0aYKjVShphh14O0S9OJdFvdAgAsJlYOhFiGBPXckukvhChh3E48s
+ 59QFbT4AABFgjmF1LiYAf4gRfMChjhZH7BXBHXE20dYwJaDgYAhG
+ HgoA4BJAAgFgHAJheAqryFAppA8hezcolPc9ilJkyEsA9VhrtgBr
+ sAWBQQMqWbRrqcQplhUJnBe2VoZ5kduTsgPzugCAwsVh1A8AmgNI
+ p3ehjg7oZh/MLd5k73i3j3k3lgShO8hBuYhLMd1hShBzchqBh9Fe
+ C2AgJARAUAXBzBrhohlhpB2BjADBOBnGo+MFpnonpgrgV6jAjBWl
+ HhduXYIo084adaeXTwMyCeU10gdefgdBg+hBghbhvBTACBaBshRj
+ Q9L+ejgAQgIE/g6gd3vhFSdAAA9OY+mIKzJNqknhahMeA86enXhg
+ w+zAwhO+0hOhMhmhAgAhnh0GseyFKIMnrBCghhRAABVhtHzbPwEJ
+ SnQh7Ekb0tpyEhiYw1S+53xg9fGA9BC/HhChEhijllCwEfFE7jGE
+ MhGgj5ne9o++/etmuB+kgJNBlj2BaBMA8AAB0BvlH/L5Jg9/Yg9h
+ CfaBCBBhggz1yh5i3fXk7RHBHgkEO1C/PwD/QmO+x+weAhihXmYf
+ e6f/ZfZ/ahAhgmfLkScfnaOAAkVhIAk14fhjkfiwElp1S5mZnBdB
+ P7jB0hw/LfsCDiAggAAgUDgkFg0HhEJhULhkNh0PiERiUJPcVPaE
+ jCEQbCNAAcjyb0TkUjkklk0nlEplUrhoEAQFACPJCuACsbTyABbW
+ rXgQBAMsoEJfL3egAWiXOwAY6xTAAf9PoNRqVTqlVq1XrFZq54rh
+ 4Q9fQ6LYxyADcdzUrVptVrtlthQIAgKACMIypACrm85nc9n9uhr4
+ es4Zi5UQAYCoRgAd7ocN+x2PyGRyWTtxayxaUeZUadaCHATMczBy
+ mj0mltoRBAVACEISgACqbTwvU8AE+0jSYKtACySpzxWM03B4XD4n
+ FtYz5AzY/LY6+cSuAquaycvnG63X7EDEoSFgAOQ5RYAQDHcoAQbH
+ cHVtb6wAAarFWYAYyvSwAcLXZIAfr7fXZ/z/wBALiAdAgHHTA50m
+ qd5lAQTZmkIp0BQlCa2iOEYrAAKQUjIAAflUaQAGEcZ4p6q53HOb
+ 4AGK+gAGeXpUAAeJ1nJCkaxtG8cKoAcdgGccfHGfQFHoDJGLGAB9
+ H6fMcyXJiIp+n4sBaNQACAD4ngAEROGWABvnkfCpHWcZtAAYhWkn
+ FsXgAep4nZJs3TfOE4oQW06FsI4kiMJI8F4LcYnwd05UDJoBgCAb
+ xCC6h6n4CgABgURmgAeUkIkf5/H8AB7HnQBsGQW4AGiYBVgAbxom
+ GACiNlQVVVXVkJkrV5KjVWQ1LEsizLRVtcwABoDAeABECKU0yHKe
+ wACFD8IoWfj2ABGZtgAYZVkiABoF8uyhqLXVtW3bjisuLRS3CUpX
+ Gu6hcm6VVu3U4QXguHAADUGpBAARZmPKOxgG5S59vacBqmPUZomE
+ 9z4AAdBvGmpyoXXhmG4cvwW4iFplYoZRunmagEEiZA8NqAIBYfkK
+ 2CcE4vgAJYSz6LJGE+WpUFPmAAGsYxaAAfJ7Jwp5/5Fnme58q0eA
+ GaehmmDIRAqFJBmCjp6H0nGf6glYBY+AA5h0xIPgYE59g8D+vHQc
+ +w6jseybKlgw7QMJObWThWmwTQBF4byabNuqIgoBQMNWIRQgAUBP
+ 7+MnBDJS1Lbtw/EcSgwF8YBZv8eb59gQeoKkAYAy48vvFc2IIQyu
+ KoUDQfoa9IGpn9OZ/N9V1fEE/1xPjB2IwDoXQqgAeZ9RJ1mzUJQ2
+ rMSdptnqZQd+KHZ+eQfnd+X5meiH54hl56ReFibLXFsbRSvV5ueB
+ GCIVAAOodkeAA6Dn8xHfSR3ufZ9t1gV+AFF7+ZehYGYUhwQxhDWA
+ B2nuOp9zDADADAOAANwNxDAAA0AcEQ9QUwPBSj8ccAYKQVVaEKDA
+ Qn6C9FmNowotBtCkgstxdoOV4A1ECAAVEKxUBZhcFmEcMYZJwAFD
+ UAQ4YcDhAWBQA4HBEDEDcAAeA+B2wzTiS4mAcQciJAABwBIJB8BE
+ ikEQYsVRixGixFlG631xClGmOoZAABKjKD+hFncWkbhCBCFAAAVw
+ VpTFBHEUDaQwxojtHdAABY9AFFhH0WASAlSAE+M+Jgyhyi/jwgED
+ 4DwSnePAfYbo4xsg8koDwdkl02yJk1Js4gIpPAiisMUBYEgEAYY2
+ HkAA4x5Ddk4cIBgBgHAADiDiJgEgCAZHsE+XQT3pi8lbL+YBwQgT
+ DCALiYwuB7D/HkAcQowkpu4d1MEtwBAAgEAAGYGgfAALtB0AAPs3
+ w+kZQhNKck5TIE+J8IWdQhQ8ztDyMsc0iBQDQMSPwfw+5zFWSeAB
+ kjJglAlhgKsVYrBVheoMF4fFCUvz5oZQ0tQCKIAIoFQIJlFQmDEH
+ Gp4Uw0kzj9H+8qhxKwdgeCQAALoLg4AAHEOEcY4XjA7HLTE8tIaa
+ U1KwBGnAERY07FiD2nwPRdLoAAK8a4ngAKXUvTYiIOAOBEAAFylE
+ qRwDkG8FCqwUGiMJqVVurhVAPVfA8cwY4GqyAai8tMYQ4Ra1dIU9
+ 58ESomL8H6PaKYRKxVsrxXkqLXmvCur8K4FoMAWAyg6YUXw3hXgA
+ H3PemjU2QAxAwDsACUQ2GKHOPIcK3xjWbGNXqz1nyggYtEBiUMnw
+ RDDHFWsU40xKn6o/OSfcao2BWBWGlTA9rcU/B6M63gzrQW/uAUAE
+ 1wwTCXuMJeDIQhwDxGwAC1YlD7DwTHGeOwEwEgXQyCpDgMgMg8AA
+ NsbI3BshovIGgYF5xgXBvVeslgBL3AEcGGSdYhQHgRAaBIYw4xdg
+ AqCukdQ9RzQUV4BAAAPgPhKAAEUEYVDaj8AIPgSeERJiBwoIEeuF
+ x63sw1hsqNphRYfFFS8eo+x51DGwJ0pV+gAT2nw4gqAKQLAzAAFk
+ Fj/ALgLA6AAbuOxu3xGDj8YLOrqYcyJkUlYEMkAQC7ksLoc8nBza
+ 610cA8Lmi2G2KcAA1x12+H2P0/ptWGWOAACACAJ8CgfCWAAGoGwg
+ oxHcPIdons5CeElnUSQ5M8I0yNnvPhVgM5/AyHzQQfMmBdAYA3Q4
+ 5R5khF0NwVi1B0RXHwPwe7mU3M7amoYE4EwXgACQCQLAAASgTBaA
+ BQk1haapFoHbVgdhr6vNpn3WWsy1Au1sC7J4cwm67CbTkCI6x7YB
+ GyO0aOWct46HcNVSI+R3n6H9SA2xkmdk/ZBK9XwHAHAhAACkCoMg
+ AAsAsDYAAGQGAeVOPYwF6BgCd3YJ2ngsXC1J1pvPehbbRgYDPvkM
+ 4ad+BpApv8CjQcWFlHcwkao61IDVHUlseQ+TZaTWKkhJRKgCgDJg
+ AcAZcgFAFAXqICYLgAAtAvuIFIFNvAJAJx3IQ7uWDuFZy8VisBK1
+ Z3rzXmxpgE85ASDrngOgi8/CKDToQNAcdFBxREBDQR9D+S+Oweo6
+ NlqAIJ0s/o+dKRmABAOAvGAE5gIEAqWAALrXYAWAUBtR3Cj67UPo
+ aXbRpDM7gMwXXcxdDE7sMQdveYi837531AMewCgx8EDEEnhQSTEC
+ BLsJ4FvGAWJUPTyA9Jji4TqLYcXlxxDN80M0ePnR45C793wgIAAP
+ AQAAAwAAAAEAyAAAAQEAAwAAAAEAyAAAAQIAAwAAAAQAAENyAQMA
+ AwAAAAEABQAAAQYAAwAAAAEAAgAAAREABAAAAAIAAEOCARIAAwAA
+ AAEAAQAAARUAAwAAAAEABAAAARYAAwAAAAEAowAAARcABAAAAAIA
+ AEN6ARwAAwAAAAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAA
+ AVMAAwAAAAQAAEOKh3MABwAADOgAAEOSAAAAAAAIAAgACAAIAAA6
+ DwAACKEAAAAIAAA6FwABAAEAAQABAAAM6GFwcGwCEAAAbW50clJH
+ QiBYWVogB+AABgAGAAYAJAAtYWNzcEFQUEwAAAAAQVBQTAAAAAAA
+ AAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARZGVz
+ YwAAAVAAAABiZHNjbQAAAbQAAAHOY3BydAAAA4QAAAAjd3RwdAAA
+ A6gAAAAUclhZWgAAA7wAAAAUZ1hZWgAAA9AAAAAUYlhZWgAAA+QA
+ AAAUclRSQwAAA/gAAAgMYWFyZwAADAQAAAAgdmNndAAADCQAAAAw
+ bmRpbgAADFQAAAA+Y2hhZAAADJQAAAAsbW1vZAAADMAAAAAoYlRS
+ QwAAA/gAAAgMZ1RSQwAAA/gAAAgMYWFiZwAADAQAAAAgYWFnZwAA
+ DAQAAAAgZGVzYwAAAAAAAAAIRGlzcGxheQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1sdWMAAAAAAAAA
+ IgAAAAxockhSAAAAJgAAAahrb0tSAAAAJgAAAahuYk5PAAAAJgAA
+ AahpZAAAAAAAJgAAAahodUhVAAAAJgAAAahjc0NaAAAAJgAAAahk
+ YURLAAAAJgAAAah1a1VBAAAAJgAAAahhcgAAAAAAJgAAAahpdElU
+ AAAAJgAAAahyb1JPAAAAJgAAAahubE5MAAAAJgAAAahoZUlMAAAA
+ JgAAAahlc0VTAAAAJgAAAahmaUZJAAAAJgAAAah6aFRXAAAAJgAA
+ Aah2aVZOAAAAJgAAAahza1NLAAAAJgAAAah6aENOAAAAJgAAAahy
+ dVJVAAAAJgAAAahmckZSAAAAJgAAAahtcwAAAAAAJgAAAahjYUVT
+ AAAAJgAAAah0aFRIAAAAJgAAAahlc1hMAAAAJgAAAahkZURFAAAA
+ JgAAAahlblVTAAAAJgAAAahwdEJSAAAAJgAAAahwbFBMAAAAJgAA
+ AahlbEdSAAAAJgAAAahzdlNFAAAAJgAAAah0clRSAAAAJgAAAahq
+ YUpQAAAAJgAAAahwdFBUAAAAJgAAAagAVABoAHUAbgBkAGUAcgBi
+ AG8AbAB0ACAARABpAHMAcABsAGEAeQAAdGV4dAAAAABDb3B5cmln
+ aHQgQXBwbGUgSW5jLiwgMjAxNgAAWFlaIAAAAAAAAPMWAAEAAAAB
+ FspYWVogAAAAAAAAccAAADmKAAABZ1hZWiAAAAAAAABhIwAAueYA
+ ABP2WFlaIAAAAAAAACPyAAAMkAAAvdBjdXJ2AAAAAAAABAAAAAAF
+ AAoADwAUABkAHgAjACgALQAyADYAOwBAAEUASgBPAFQAWQBeAGMA
+ aABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8AowCoAK0AsgC3ALwAwQDG
+ AMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIB
+ OAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHB
+ AckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcC
+ cQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4
+ A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAE
+ LQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6
+ BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoG
+ ewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfS
+ B+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8J
+ ZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsL
+ CyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM
+ 8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7u
+ DwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMR
+ MRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxOD
+ E6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMW
+ JhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjV
+ GPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib
+ 2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7p
+ HxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7Iici
+ VSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXH
+ JfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWsp
+ nSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12
+ Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIx
+ ujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9
+ Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6
+ sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9h
+ P6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdE
+ ikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mp
+ SfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBP
+ SU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1Tb
+ VShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa
+ 9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8
+ YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1n
+ k2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4S
+ bmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1
+ KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwh
+ fIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eD
+ uoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyosw
+ i5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOT
+ TZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtC
+ m6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj
+ 5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axc
+ rNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1
+ irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6E
+ vv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/I
+ Pci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+
+ 0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724Dc
+ BdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN
+ 5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw
+ 5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3
+ /Af8mP0p/br+S/7c/23//3BhcmEAAAAAAAMAAAACZmYAAPKnAAAN
+ WQAAE9AAAAoOdmNndAAAAAAAAAABAAEAAAAAAAAAAQAAAAEAAAAA
+ AAAAAQAAAAEAAAAAAAAAAQAAbmRpbgAAAAAAAAA2AACnQAAAVYAA
+ AEzAAACewAAAJYAAAAzAAABQAAAAVEAAAjMzAAIzMwACMzMAAAAA
+ AAAAAHNmMzIAAAAAAAEMcgAABfj///MdAAAHugAA/XL///ud///9
+ pAAAA9kAAMBxbW1vZAAAAAAAAAYQAACSJxgxFZ/QpAMAAAAAAAAA
+ AAAAAAAAAAAAAA==
+ </data>
+ </dict>
+ <dict>
+ <key>Extension</key>
+ <string>tiff</string>
+ <key>ID</key>
<integer>119</integer>
<key>RawData</key>
<data>
@@ -189173,7 +189711,7 @@
<key>MasterSheets</key>
<array/>
<key>ModificationDate</key>
- <string>2016-04-21 13:16:16 +0000</string>
+ <string>2016-06-17 13:23:32 +0000</string>
<key>Modifier</key>
<string>Marko Rodriguez</string>
<key>NotesVisible</key>
@@ -189202,12 +189740,12 @@
<key>NSPaperSize</key>
<array>
<string>size</string>
- <string>{612.00001430511475, 792}</string>
+ <string>{611.99999046325684, 792}</string>
</array>
<key>NSPrintReverseOrientation</key>
<array>
- <string>int</string>
- <string>0</string>
+ <string>coded</string>
+ <string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string>
</array>
<key>NSRightMargin</key>
<array>
@@ -189232,7 +189770,7 @@
<key>BackgroundGraphic</key>
<dict>
<key>Bounds</key>
- <string>{{0, 0}, {576.00001430511475, 733}}</string>
+ <string>{{0, 0}, {575.99999046325684, 733}}</string>
<key>Class</key>
<string>SolidGraphic</string>
<key>FontInfo</key>
@@ -189246,11 +189784,6 @@
<integer>2</integer>
<key>Style</key>
<dict>
- <key>shadow</key>
- <dict>
- <key>Draws</key>
- <string>NO</string>
- </dict>
<key>stroke</key>
<dict>
<key>Draws</key>
@@ -189267,7 +189800,7 @@
<key>ColumnSpacing</key>
<real>36</real>
<key>DisplayScale</key>
- <string>1 0/72 in = 1.0000 in</string>
+ <string>1 in = 1.00000 in</string>
<key>GraphicsList</key>
<array>
<dict>
@@ -189288,8 +189821,6 @@
</dict>
<key>ID</key>
<integer>58</integer>
- <key>Shape</key>
- <string>Rectangle</string>
<key>Style</key>
<dict>
<key>fill</key>
@@ -189311,14 +189842,14 @@
<key>Text</key>
<dict>
<key>Text</key>
- <string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
-\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;}
+ <string>{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;}
{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc\partightenfactor0
\f0\b\fs96 \cf0 TinkerPop}</string>
<key>VerticalPad</key>
- <integer>0</integer>
+ <real>0.0</real>
</dict>
<key>Wrap</key>
<string>NO</string>
@@ -189349,11 +189880,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -189376,13 +189907,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189432,11 +189963,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -189459,13 +189990,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189515,11 +190046,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -189542,13 +190073,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189595,11 +190126,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
</dict>
<key>shadow</key>
@@ -189661,13 +190192,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189679,11 +190210,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -189710,11 +190241,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
</dict>
<key>shadow</key>
@@ -189776,13 +190307,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189794,11 +190325,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -189840,11 +190371,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0208795</string>
+ <real>0.020879499999999999</real>
<key>r</key>
- <string>0.86621</string>
+ <real>0.86621000000000004</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -189867,13 +190398,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189885,11 +190416,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -189931,11 +190462,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -189958,13 +190489,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -189976,11 +190507,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190022,11 +190553,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190049,13 +190580,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190067,11 +190598,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190113,11 +190644,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0208795</string>
+ <real>0.020879499999999999</real>
<key>r</key>
- <string>0.86621</string>
+ <real>0.86621000000000004</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190140,13 +190671,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190158,11 +190689,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190204,11 +190735,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190231,13 +190762,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190249,11 +190780,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190295,11 +190826,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190322,13 +190853,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190340,11 +190871,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190386,11 +190917,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0208795</string>
+ <real>0.020879499999999999</real>
<key>r</key>
- <string>0.86621</string>
+ <real>0.86621000000000004</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190413,13 +190944,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190431,11 +190962,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190477,11 +191008,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190504,13 +191035,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190522,11 +191053,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190568,11 +191099,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190595,13 +191126,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190613,11 +191144,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190659,11 +191190,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0208795</string>
+ <real>0.020879499999999999</real>
<key>r</key>
- <string>0.86621</string>
+ <real>0.86621000000000004</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190686,13 +191217,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190704,11 +191235,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190750,11 +191281,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190777,13 +191308,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190795,11 +191326,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190841,11 +191372,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190868,13 +191399,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190886,11 +191417,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -190932,11 +191463,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0208795</string>
+ <real>0.020879499999999999</real>
<key>r</key>
- <string>0.86621</string>
+ <real>0.86621000000000004</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -190959,13 +191490,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -190977,11 +191508,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191023,11 +191554,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191050,13 +191581,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191068,11 +191599,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191114,11 +191645,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191141,13 +191672,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191159,11 +191690,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191205,11 +191736,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191232,13 +191763,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191250,11 +191781,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191296,11 +191827,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191323,13 +191854,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191341,11 +191872,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191387,11 +191918,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00868958</string>
+ <real>0.0086895800000000006</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0.0411741</string>
+ <real>0.041174099999999998</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191414,13 +191945,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191432,11 +191963,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191478,11 +192009,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.0111024</string>
+ <real>0.0111024</real>
<key>g</key>
- <string>0.0328073</string>
+ <real>0.032807299999999998</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>3</integer>
@@ -191505,13 +192036,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191523,11 +192054,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.023095</string>
+ <real>0.023095000000000001</real>
<key>g</key>
- <string>0.0396825</string>
+ <real>0.039682500000000002</real>
<key>r</key>
- <string>0.005354</string>
+ <real>0.0053540000000000003</real>
</dict>
<key>Join</key>
<integer>0</integer>
@@ -191559,11 +192090,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.000904381</string>
+ <real>0.000904381</real>
<key>g</key>
- <string>0.935545</string>
+ <real>0.93554499999999996</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -191586,13 +192117,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191642,11 +192173,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.000904381</string>
+ <real>0.000904381</real>
<key>g</key>
- <string>0.935545</string>
+ <real>0.93554499999999996</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -191669,13 +192200,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191725,11 +192256,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.000904381</string>
+ <real>0.000904381</real>
<key>g</key>
- <string>0.935545</string>
+ <real>0.93554499999999996</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -191752,13 +192283,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191810,11 +192341,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0950316</string>
+ <real>0.095031599999999994</real>
<key>r</key>
- <string>0.0196927</string>
+ <real>0.0196927</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -191837,13 +192368,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191893,11 +192424,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0950316</string>
+ <real>0.095031599999999994</real>
<key>r</key>
- <string>0.0196927</string>
+ <real>0.0196927</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -191920,13 +192451,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -191976,11 +192507,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>1</string>
+ <real>1</real>
<key>g</key>
- <string>0.0950316</string>
+ <real>0.095031599999999994</real>
<key>r</key>
- <string>0.0196927</string>
+ <real>0.0196927</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192003,13 +192534,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192061,11 +192592,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192088,13 +192619,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192144,11 +192675,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192171,13 +192702,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192227,11 +192758,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192254,13 +192785,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192312,11 +192843,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192339,13 +192870,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192395,11 +192926,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192422,13 +192953,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192478,11 +193009,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192505,13 +193036,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192563,11 +193094,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192590,13 +193121,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192646,11 +193177,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192673,13 +193204,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192729,11 +193260,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0</string>
+ <real>0.0</real>
<key>g</key>
- <string>0</string>
+ <real>0.0</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192756,13 +193287,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192814,11 +193345,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192841,13 +193372,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192897,11 +193428,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -192924,13 +193455,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -192980,11 +193511,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.00381666</string>
+ <real>0.0038166599999999999</real>
<key>g</key>
- <string>0.34765</string>
+ <real>0.34765000000000001</real>
<key>r</key>
- <string>1</string>
+ <real>1</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -193007,13 +193538,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -193065,11 +193596,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.12746</string>
+ <real>0.12745999999999999</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -193092,13 +193623,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -193148,11 +193679,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.12746</string>
+ <real>0.12745999999999999</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -193175,13 +193706,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -193231,11 +193762,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.12746</string>
+ <real>0.12745999999999999</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
<key>FillType</key>
<integer>2</integer>
@@ -193258,13 +193789,13 @@
<key>Color</key>
<dict>
<key>a</key>
- <string>0.5</string>
+ <real>0.5</real>
<key>b</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>g</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
<key>r</key>
- <string>0.333333</string>
+ <real>0.33333299999999999</real>
</dict>
<key>Draws</key>
<string>NO</string>
@@ -193316,11 +193847,11 @@
<key>Color</key>
<dict>
<key>b</key>
- <string>0.12746</string>
+ <real>0.12745999999999999</real>
<key>g</key>
- <string>1</string>
+ <real>1</real>
<key>r</key>
- <string>0</string>
+ <real>0.0</real>
</dict>
<key>FillType</key>
<TRUNCATED>
[49/50] [abbrv] tinkerpop git commit: Improved typed GraphSON deser
tests.
Posted by sp...@apache.org.
Improved typed GraphSON deser tests.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/16e26b51
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/16e26b51
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/16e26b51
Branch: refs/heads/TINKERPOP-1274
Commit: 16e26b515016f61b96375a334ae45536fb483b8d
Parents: a9bf7ea
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Thu Jun 30 12:02:47 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 12:02:47 2016 +0100
----------------------------------------------------------------------
.../TinkerGraphGraphSONSerializerV2d0Test.java | 167 +++++++++++++++++++
1 file changed, 167 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/16e26b51/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
index a4c03cb..be7429f 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
@@ -18,7 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.IoTest;
@@ -34,9 +39,12 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.Duration;
+import java.util.Iterator;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
public class TinkerGraphGraphSONSerializerV2d0Test {
@@ -55,6 +63,9 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
.addRegistry(TinkerIoRegistryV2d0.getInstance())
.create();
+ /**
+ * Checks that the graph has been fully ser/deser with types.
+ */
@Test
public void shouldDeserializeGraphSONIntoTinkerGraphWithPartialTypes() throws IOException {
GraphWriter writer = getWriter(defaultMapperV2d0);
@@ -68,6 +79,9 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
}
}
+ /**
+ * Checks that the graph has been fully ser/deser without types.
+ */
@Test
public void shouldDeserializeGraphSONIntoTinkerGraphWithoutTypes() throws IOException {
GraphWriter writer = getWriter(noTypesMapperV2d0);
@@ -81,6 +95,104 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
}
}
+ /**
+ * Thorough types verification for Vertex ids, Vertex props, Edge ids, Edge props
+ */
+ @Test
+ public void shouldDeserializeGraphSONIntoTinkerGraphKeepingTypes() throws IOException {
+ GraphWriter writer = getWriter(defaultMapperV2d0);
+ GraphReader reader = getReader(defaultMapperV2d0);
+ Vertex v1 = baseModern.addVertex(T.id, 100L, "name", "kevin", "uuid", UUID.randomUUID());
+ v1.addEdge("hello", baseModern.traversal().V().has("name", "marko").next(), T.id, 101L,
+ "uuid", UUID.randomUUID());
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ assertTrue(approximateGraphsCheck(baseModern, read));
+ }
+ }
+
+ /**
+ * Asserts the approximateGraphsChecks function fails when expected. Vertex ids.
+ */
+ @Test
+ public void shouldLooseTypesWithGraphSONNoTypesForVertexIds() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ GraphReader reader = getReader(noTypesMapperV2d0);
+ baseModern.addVertex(T.id, 100L, "name", "kevin");
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ // Should fail on deserialized vertex Id.
+ assertFalse(approximateGraphsCheck(baseModern, read));
+ }
+ }
+
+ /**
+ * Asserts the approximateGraphsChecks function fails when expected. Vertex props.
+ */
+ @Test
+ public void shouldLooseTypesWithGraphSONNoTypesForVertexProps() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ GraphReader reader = getReader(noTypesMapperV2d0);
+ baseModern.addVertex(T.id, 100, "name", "kevin", "uuid", UUID.randomUUID());
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ // Should fail on deserialized vertex prop.
+ assertFalse(approximateGraphsCheck(baseModern, read));
+ }
+ }
+
+ /**
+ * Asserts the approximateGraphsChecks function fails when expected. Edge ids.
+ */
+ @Test
+ public void shouldLooseTypesWithGraphSONNoTypesForEdgeIds() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ GraphReader reader = getReader(noTypesMapperV2d0);
+ Vertex v1 = baseModern.addVertex(T.id, 100, "name", "kevin");
+ v1.addEdge("hello", baseModern.traversal().V().has("name", "marko").next(), T.id, 101L);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ // Should fail on deserialized edge Id.
+ assertFalse(approximateGraphsCheck(baseModern, read));
+ }
+ }
+
+ /**
+ * Asserts the approximateGraphsChecks function fails when expected. Edge props.
+ */
+ @Test
+ public void shouldLooseTypesWithGraphSONNoTypesForEdgeProps() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ GraphReader reader = getReader(noTypesMapperV2d0);
+ Vertex v1 = baseModern.addVertex(T.id, 100, "name", "kevin");
+ v1.addEdge("hello", baseModern.traversal().V().has("name", "marko").next(), T.id, 101,
+ "uuid", UUID.randomUUID());
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ // Should fail on deserialized edge prop.
+ assertFalse(approximateGraphsCheck(baseModern, read));
+ }
+ }
+
+ /**
+ * Those kinds of types are declared differently in the GraphSON type deserializer, check that all are handled
+ * properly.
+ */
@Test
public void shouldKeepTypesWhenDeserializingSerializedTinkerGraph() throws IOException {
TinkerGraph tg = TinkerGraph.open();
@@ -122,4 +234,59 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
private GraphReader getReader(Mapper paramMapper) {
return GraphSONReader.build().mapper(paramMapper).create();
}
+
+ /**
+ * Checks sequentially vertices and egdes of both graphs. Will check sequentially Vertex IDs, Vertex Properties IDs
+ * and values and classes. Then same for edges. To use when serializing a Graph and deserializing the supposedly
+ * same Graph.
+ */
+ private boolean approximateGraphsCheck(Graph g1, Graph g2) {
+ Iterator<Vertex> itV = g1.vertices();
+ Iterator<Vertex> itVRead = g2.vertices();
+
+ while (itV.hasNext()) {
+ Vertex v = itV.next();
+ Vertex vRead = itVRead.next();
+
+ // Will only check IDs but that's 'good' enough.
+ if (!v.equals(vRead)) {
+ return false;
+ }
+
+ Iterator itVP = v.properties();
+ Iterator itVPRead = vRead.properties();
+ while (itVP.hasNext()) {
+ VertexProperty vp = (VertexProperty) itVP.next();
+ VertexProperty vpRead = (VertexProperty) itVPRead.next();
+ if (!vp.value().equals(vpRead.value())
+ || !vp.equals(vpRead)) {
+ return false;
+ }
+ }
+ }
+
+ Iterator<Edge> itE = g1.edges();
+ Iterator<Edge> itERead = g2.edges();
+
+ while (itE.hasNext()) {
+ Edge e = itE.next();
+ Edge eRead = itERead.next();
+ // Will only check IDs but that's good enough.
+ if (!e.equals(eRead)) {
+ return false;
+ }
+
+ Iterator itEP = e.properties();
+ Iterator itEPRead = eRead.properties();
+ while (itEP.hasNext()) {
+ Property ep = (Property) itEP.next();
+ Property epRead = (Property) itEPRead.next();
+ if (!ep.value().equals(epRead.value())
+ || !ep.equals(epRead)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
}
[20/50] [abbrv] tinkerpop git commit: Fixed path to log file for
`bin/validate-distribution.sh` and log only errors in `mvn clean install`.
Posted by sp...@apache.org.
Fixed path to log file for `bin/validate-distribution.sh` and log only errors in `mvn clean install`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ce0dc48b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ce0dc48b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ce0dc48b
Branch: refs/heads/TINKERPOP-1274
Commit: ce0dc48b5f46ce0fa7f106d4619070a339bb9964
Parents: 6edca75
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 16 21:41:06 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 16 21:41:06 2016 +0200
----------------------------------------------------------------------
bin/validate-distribution.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce0dc48b/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index a6fb927..eea1ba1 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -114,15 +114,13 @@ echo "OK"
if [ "${TYPE}" = "SOURCE" ]; then
cd ${DIR_NAME}
-LOG_DIR="${DIR_NAME}/target/validate-distribution"
-LOG_FILE="mvn-clean-install.log"
echo -n "* building project ... "
-mkdir -p ${LOG_DIR}
-mvn clean install 2>&1 > "${LOG_DIR}/${LOG_FILE}" || {
+LOG_FILE="mvn-clean-install.log"
+mvn clean install -q 2>&1 > "${LOG_FILE}" || {
echo "failed"
echo
- tail -n100 target/validate-distribution/mvn-clean-install.log
- echo -e "\n\e[1mThe full log file can be inspected under ${LOG_DIR}/${LOG_FILE}.\e[0m\n"
+ tail -n50 "${LOG_FILE}"
+ echo -e "\n\e[1mThe full log file can be inspected under `pwd`/${LOG_FILE}.\e[0m\n"
exit 1
}
echo "OK"
[28/50] [abbrv] tinkerpop git commit: Fixed up TraversalOpProcessor
to use HaltedTraversalStrategy to decide detachement with ReferenceFactory
being the default (as before). This allowed me to open uup a bunch more
OPT_OUT tests on RemoteGraph.
Posted by sp...@apache.org.
Fixed up TraversalOpProcessor to use HaltedTraversalStrategy to decide detachement with ReferenceFactory being the default (as before). This allowed me to open uup a bunch more OPT_OUT tests on RemoteGraph.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/408755de
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/408755de
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/408755de
Branch: refs/heads/TINKERPOP-1274
Commit: 408755de33de1eb23441347ac6bbe0b084828d9c
Parents: 2eafeef
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 21 11:43:14 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 21 12:06:24 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/remote/RemoteGraph.java | 20 ++++++++-----------
.../decoration/HaltedTraverserStrategy.java | 8 +++++---
.../driver/remote/DriverRemoteConnection.java | 3 ++-
.../op/traversal/TraversalOpProcessor.java | 21 ++++++++++++--------
5 files changed, 29 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/408755de/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ea940a8..1ba08d4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.2.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalOpProcessor` (`RemoteConnection`) uses `HaltedTraverserStrategy` metadata to determine detachment procedure prior to returning results.
* Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
* Added a safer serializer infrastructure for use with `SparkGraphComputer` that uses `KryoSerializer` and the new `GryoRegistrator`.
* Added `HaltedTraverserStrategy` to allow users to get back different element detachments in OLAP.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/408755de/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
index f46fe90..590398e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
@@ -46,6 +46,10 @@ import java.util.Iterator;
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest$Traversals",
+ method = "g_withSideEffectXa_g_VX2XX_VX1X_out_whereXneqXaXX",
+ reason = "RemoteGraph can not handle a sideEffect that is spawned by a traversal")
+@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest",
method = "shouldNeverPropagateANoBulkTraverser",
reason = "RemoteGraph can't serialize a lambda so the test fails before it has a chance for the Traversal to be evaluated")
@@ -54,6 +58,10 @@ import java.util.Iterator;
method = "shouldNeverPropagateANullValuedTraverser",
reason = "RemoteGraph can't serialize a lambda so the test fails before it has a chance for the Traversal to be evaluated")
@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest",
+ method = "*",
+ reason = "RemoteGraph retrieves detached vertices that can't be attached to a remote OLAP graph")
+@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest",
method = "*",
reason = "RemoteGraph does not support ElementIdStrategy at this time - it requires a lambda in construction which is not serializable")
@@ -66,18 +74,6 @@ import java.util.Iterator;
method = "*",
reason = "RemoteGraph does not support PartitionStrategy at this time")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest",
- method = "g_V_peerPressure",
- reason = "RemoteGraph retrieves detached vertices that can't be attached to a remote OLAP graph")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest",
- method = "g_V_pageRank",
- reason = "RemoteGraph retrieves detached vertices that can't be attached to a remote OLAP graph")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest",
- method = "g_V_programXpageRankX",
- reason = "RemoteGraph retrieves detached vertices that can't be attached to a remote OLAP graph")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgramTest",
method = "*",
reason = "RemoteGraph does not support direct Graph.compute() access")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/408755de/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/HaltedTraverserStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/HaltedTraverserStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/HaltedTraverserStrategy.java
index 45966f0..1a2c207 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/HaltedTraverserStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/HaltedTraverserStrategy.java
@@ -32,11 +32,13 @@ import org.apache.tinkerpop.gremlin.structure.util.reference.ReferenceFactory;
public final class HaltedTraverserStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy {
private final Class haltedTraverserFactory;
+ private final boolean useReference;
private HaltedTraverserStrategy(final Class haltedTraverserFactory) {
- if (haltedTraverserFactory.equals(DetachedFactory.class) || haltedTraverserFactory.equals(ReferenceFactory.class))
+ if (haltedTraverserFactory.equals(DetachedFactory.class) || haltedTraverserFactory.equals(ReferenceFactory.class)) {
this.haltedTraverserFactory = haltedTraverserFactory;
- else
+ this.useReference = ReferenceFactory.class.equals(this.haltedTraverserFactory);
+ } else
throw new IllegalArgumentException("The provided traverser detachment factory is unknown: " + haltedTraverserFactory);
}
@@ -49,7 +51,7 @@ public final class HaltedTraverserStrategy extends AbstractTraversalStrategy<Tra
}
public <R> Traverser.Admin<R> halt(final Traverser.Admin<R> traverser) {
- if (ReferenceFactory.class.equals(this.haltedTraverserFactory))
+ if (this.useReference)
traverser.set(ReferenceFactory.detach(traverser.get()));
else
traverser.set(DetachedFactory.detach(traverser.get(), true));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/408755de/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index a6303a6..2bea54b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -22,6 +22,7 @@ import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.Result;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
@@ -160,7 +161,7 @@ public class DriverRemoteConnection implements RemoteConnection {
@Override
public <E> Iterator<Traverser.Admin<E>> submit(final Traversal<?, E> t) throws RemoteConnectionException {
try {
- if (attachElements) {
+ if (attachElements && !t.asAdmin().getStrategies().toList().stream().filter(s -> s instanceof VertexProgramStrategy).findAny().isPresent()) {
if (!conf.isPresent()) throw new IllegalStateException("Traverser can't be reattached for testing");
final Graph graph = ((Supplier<Graph>) conf.get().getProperty("hidden.for.testing.only")).get();
return new AttachingTraverserIterator<>(client.submit(t).iterator(), graph);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/408755de/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index bdb692d..8bff220 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.HaltedTraverserStrategy;
import org.apache.tinkerpop.gremlin.server.Context;
import org.apache.tinkerpop.gremlin.server.GraphManager;
import org.apache.tinkerpop.gremlin.server.GremlinServer;
@@ -45,7 +46,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
import static com.codahale.metrics.MetricRegistry.name;
@@ -127,7 +127,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
// earlier validation in selection of this op method should free us to cast this without worry
final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
- final Traversal.Admin<?,?> traversal;
+ final Traversal.Admin<?, ?> traversal;
try {
traversal = (Traversal.Admin) Serializer.deserializeObject(serializedTraversal);
} catch (Exception ex) {
@@ -158,7 +158,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
try {
// compile the traversal - without it getEndStep() has nothing in it
traversal.applyStrategies();
- handleIterator(context, new DetachingIterator<>(traversal.getEndStep()));
+ handleIterator(context, new DetachingIterator<>(traversal));
} catch (TimeoutException ex) {
final String errorMessage = String.format("Response iteration exceeded the configured threshold for request [%s] - %s", msg.getRequestId(), ex.getMessage());
logger.warn(errorMessage);
@@ -200,19 +200,24 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
static class DetachingIterator<E> implements Iterator<Traverser.Admin<E>> {
private Iterator<Traverser.Admin<E>> inner;
-
- public DetachingIterator(final Iterator<Traverser.Admin<E>> toDetach) {
- inner = toDetach;
+ private HaltedTraverserStrategy haltedTraverserStrategy;
+
+ public DetachingIterator(final Traversal.Admin<?, E> traversal) {
+ this.inner = traversal.getEndStep();
+ this.haltedTraverserStrategy = (HaltedTraverserStrategy) traversal.getStrategies().toList().stream().filter(s -> s instanceof HaltedTraverserStrategy).findAny().orElse(
+ Boolean.valueOf(System.getProperty("is.testing", "false")) ?
+ HaltedTraverserStrategy.detached() :
+ HaltedTraverserStrategy.reference());
}
@Override
public boolean hasNext() {
- return inner.hasNext();
+ return this.inner.hasNext();
}
@Override
public Traverser.Admin<E> next() {
- return inner.next().detach();
+ return this.haltedTraverserStrategy.halt(this.inner.next());
}
}
}
[45/50] [abbrv] tinkerpop git commit: Added CHANGELOG entry and
'reference' docs.
Posted by sp...@apache.org.
Added CHANGELOG entry and 'reference' docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7546bc79
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7546bc79
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7546bc79
Branch: refs/heads/TINKERPOP-1274
Commit: 7546bc79e8674cdeb6344e5ec96ff2cfa2c78fb8
Parents: 6cee526
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Jun 29 18:25:45 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:41:34 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/the-graph.asciidoc | 135 ++++++++++++++++++++++++++++-
2 files changed, 132 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7546bc79/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 94bb67e..5c1148b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.2.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Introduced GraphSON 2.0.
* `TraversalExplanation.prettyPrint()` exists which provides word wrapping and GremlinConsole is smart to use console width to control `toString()`.
* `TraversalOpProcessor` (`RemoteConnection`) uses `HaltedTraverserStrategy` metadata to determine detachment procedure prior to returning results.
* Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7546bc79/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index 8b4916a..9817ce8 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -1,4 +1,4 @@
-////
+*////
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-////
+_////
[[graph]]
The Graph
=========
@@ -499,7 +499,7 @@ graph.io(graphson()).writer().create().writeVertex(f, g.V(1).next(), BOTH)
f.close()
----
-The following GraphSON example shows the output of `GraphSonWriter.writeVertex()` with associated edges:
+The following GraphSON example shows the output of `GraphSONWriter.writeVertex()` with associated edges:
[source,json]
----
@@ -553,7 +553,18 @@ The following GraphSON example shows the output of `GraphSonWriter.writeVertex()
The vertex properly serializes to valid JSON but note that a consuming application will not automatically know how to
interpret the numeric values. In coercing those Java values to JSON, such information is lost.
-With a minor change to the construction of the `GraphSONWriter` the lossy nature of GraphSON can be avoided:
+[[graphson-types-embedding]]
+Types embedding
+^^^^^^^^^^^^^^^
+
+With a minor change to the construction of the `GraphSONWriter` the lossy nature of GraphSON can be avoided.
+
+[[graphson-1.0-types]]
+Types with GraphSON 1.0.
+++++++++++++++++++++++++
+
+GraphSON 1.0 is the version enabled by default when creating a GraphSON Mapper. Here is how to enable types with GraphSON
+1.0:
[gremlin-groovy]
----
@@ -652,6 +663,121 @@ from JSON typing. While the output is more verbose, it comes with the security
non-JVM languages won't be able to consume this information automatically, at least there is a hint as to how the
values should be coerced back into the correct types in the target language.
+[[graphson-2.0-types]]
+GraphSON 2.0.
++++++++++++++
+
+GraphSON 2.0 has been introduced to improve the format of the typed values from GraphSON 1.0. It provides non-Java
+centric types information in a consistent format. With GraphSON 2.0, types are enabled by default. As for GraphSON 1.0
+types will not be included for JSON's "natural" types (String, Boolean, Integer, and Double).
+
+The format is :
+
+* Non typed value : `value`
+* Typed value : `[{"@class":"typeName"}, value]`
+
+Here's the same previous example, but with GraphSON 2.0:
+
+[gremlin-groovy]
+----
+graph = TinkerFactory.createModern()
+g = graph.traversal()
+f = new FileOutputStream("vertex-2.json")
+mapper = graph.io(graphson()).mapper().version(GraphSONVersion.V2_0).create()
+v = g.V(1).next()
+v.property("uuid", UUID.randomUUID())
+graph.io(graphson()).writer().mapper(mapper).create().writeVertex(f, v, BOTH)
+f.close()
+----
+
+Creating a GraphSON 2.0 mapper is done by calling `.version(GraphSONVersion.V2_0)` on the mapper builder. For this
+example the serialized `Vertex` is added a property that is not a JSON natural value in order to demonstrate the format:
+
+[source,json]
+----
+{
+ "id":1,
+ "label":"person",
+ "outE":{
+ "created":[
+ {
+ "id":9,
+ "inV":3,
+ "properties":{
+ "weight":0.4
+ }
+ }
+ ],
+ "knows":[
+ {
+ "id":7,
+ "inV":2,
+ "properties":{
+ "weight":0.5
+ }
+ },
+ {
+ "id":8,
+ "inV":4,
+ "properties":{
+ "weight":1.0
+ }
+ }
+ ]
+ },
+ "properties":{
+ "name":[
+ {
+ "id":[
+ {
+ "@class":"Long"
+ },
+ 0
+ ],
+ "value":"marko"
+ }
+ ],
+ "uuid":[
+ {
+ "id":[
+ {
+ "@class":"Long"
+ },
+ 12
+ ],
+ "value":[
+ {
+ "@class":"UUID"
+ },
+ "1de7bedf-f9ba-4e94-bde9-f1be28bef239"
+ ]
+ }
+ ],
+ "age":[
+ {
+ "id":[
+ {
+ "@class":"Long"
+ },
+ 1
+ ],
+ "value":29
+ }
+ ]
+ }
+}
+----
+
+The only values that have a type are the ones that are non JSON native.
+
+Types can be explicitly disabled, in that case the JSON produced will be the same than GraphSON 1.0 without types.
+Here's how to disable types with GraphSON 2.0:
+
+[gremlin-groovy]
+----
+mapper = graph.io(graphson()).mapper().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.NO_TYPES).create()
+----
+
[[gryo-reader-writer]]
Gryo Reader/Writer
~~~~~~~~~~~~~~~~~~
@@ -773,3 +899,4 @@ reduce implementations, and plugins.
The only truly protected namespace is the _hidden namespace_ provided to graph systems. From there, it's up to
engineers to respect the namespacing conventions presented.
+*_
\ No newline at end of file
[26/50] [abbrv] tinkerpop git commit: Updated instructions on how to
process a single AsciiDoc file.
Posted by sp...@apache.org.
Updated instructions on how to process a single AsciiDoc file.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ff14b73
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ff14b73
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ff14b73
Branch: refs/heads/TINKERPOP-1274
Commit: 9ff14b7305eeb527f53baaf3590d295f1fdb52a1
Parents: da26cf1
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jun 17 16:50:11 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jun 17 16:50:11 2016 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ff14b73/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 70e0dcd..23df9ee 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -41,7 +41,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
** Build AsciiDocs (but don't evaluate code blocks): `bin/process-docs.sh --dryRun`
** Build AsciiDocs (but don't evaluate code blocks in specific files): `bin/process-docs.sh --dryRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
** Build AsciiDocs (but evaluate code blocks only in specific files): `bin/process-docs.sh --fullRun docs/src/reference/the-graph.asciidoc,docs/src/tutorial/getting-started,...`
-** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone `pwd`/docs/src/xyz.asciidoc]+
+** Process a single AsciiDoc file: +pass:[docs/preprocessor/preprocess-file.sh `pwd`/gremlin-console/target/apache-gremlin-console-*-standalone "" "*" `pwd`/docs/src/xyz.asciidoc]+
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
@@ -96,4 +96,4 @@ Developers working on the `neo4j-gremlin` module should enabled the `include-neo
This will ensure that tests will properly execute within the IDE.
If Intellij complains about "duplicate sources" for the Groovy files when attempting to compile/run tests, then
-install the link:http://plugins.jetbrains.com/plugin/7442?pr=idea[GMavenPlus Intellij plugin].
\ No newline at end of file
+install the link:http://plugins.jetbrains.com/plugin/7442?pr=idea[GMavenPlus Intellij plugin].
[29/50] [abbrv] tinkerpop git commit: made things safer -- not longer
wraps by step name, but by character. much cleaner.
Posted by sp...@apache.org.
made things safer -- not longer wraps by step name, but by character. much cleaner.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/090efe3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/090efe3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/090efe3b
Branch: refs/heads/TINKERPOP-1274
Commit: 090efe3be4b40e90dba4731d8233b5dd62c08204
Parents: 21a533d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 21 16:44:19 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 21 16:44:19 2016 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/Console.groovy | 6 ++---
.../traversal/util/TraversalExplanation.java | 23 +++++++++-----------
.../util/TraversalExplanationTest.java | 16 +++++++++-----
3 files changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/090efe3b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 3d748eb..8dcb272 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.console
import jline.TerminalFactory
+import jline.console.history.FileHistory
import org.apache.commons.cli.Option
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
@@ -29,7 +30,6 @@ import org.apache.tinkerpop.gremlin.console.commands.UninstallCommand
import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn
import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
-import jline.console.history.FileHistory
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation
import org.apache.tinkerpop.gremlin.util.Gremlin
import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator
@@ -252,8 +252,8 @@ class Console {
return null
}
} else if (result instanceof TraversalExplanation) {
- final int width = TerminalFactory.get().getWidth() - 25
- io.out.println(buildResultPrompt() + result.prettyPrint(width < 10 ? 100 : width))
+ final int width = TerminalFactory.get().getWidth();
+ io.out.println(buildResultPrompt() + result.prettyPrint(width < 20 ? 80 : width))
return null
} else {
io.out.println(buildResultPrompt() + ((null == result) ? NULL : result.toString()))
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/090efe3b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
index 2baccdb..6e3692a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
@@ -156,26 +156,23 @@ public class TraversalExplanation implements Serializable {
StringBuilder builder = new StringBuilder();
int counter = 0;
- for (final String shortString : longString.split(", ")) {
- if (0 == counter)
- builder.append(shortString).append(", ");
- else if (counter < maxLengthPerLine)
- builder.append(shortString).append(", ");
- else {
- builder.deleteCharAt(builder.length() - 1); // remove the " "
+ for (int i = 0; i < longString.length(); i++) {
+ if (0 == counter) {
+ builder.append(longString.charAt(i));
+ } else if (counter < maxLengthPerLine) {
+ builder.append(longString.charAt(i));
+ } else {
builder.append("\n");
- for (int i = 0; i < newLineIndent; i++) {
+ for (int j = 0; j < newLineIndent; j++) {
builder.append(" ");
}
- builder.append(shortString).append(", ");
+ builder.append(longString.charAt(i));
counter = 0;
}
- counter = counter + shortString.length();
+ counter++;
}
- return builder
- .delete(builder.length() - 2, builder.length()) // remove the final ", "
- .toString();
+ return builder.toString();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/090efe3b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
index 3350a87..3040fe8 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
@@ -55,7 +55,7 @@ public class TraversalExplanationTest {
///
traversal = __.V().out().out().out().out();
toString = traversal.explain().prettyPrint();
- assertTrue(toString.contains("VertexStep(OUT,vertex),\n"));
+ assertTrue(toString.contains("VertexStep(OUT,vertex),"));
//System.out.println(toString);
///
for (int i = 0; i < 30; i++) {
@@ -68,15 +68,20 @@ public class TraversalExplanationTest {
if (i < 3)
assertFalse(toString.contains("VertexStep(OUT,vertex),\n"));
else {
- assertFalse(Stream.of(toString.split("\n"))
+ assertTrue(Stream.of(toString.split("\n"))
.filter(s -> s.startsWith(" "))
.map(String::trim)
.filter(s -> Character.isLowerCase(s.charAt(0)))
.findAny()
.isPresent()); // all indented word wraps should start with steps
- assertTrue(toString.contains("VertexStep(OUT,vertex),\n"));
+ assertTrue(toString.contains("vertex"));
}
- //System.out.println(toString);
+ for (int j = 80; j < 200; j++) {
+ for (final String line : traversal.explain().prettyPrint(j).split("\n")) {
+ assertTrue(line.length() <= j);
+ }
+ }
+ // System.out.println(toString);
}
}
@@ -118,8 +123,7 @@ public class TraversalExplanationTest {
assertEquals(4, found);
//
found = 0;
- for (final String line : traversal.explain().prettyPrint().split("]\n")) { // need to split cause of word wrap
- //System.out.println(line + "\n\n");
+ for (final String line : traversal.explain().prettyPrint(158).split("]\n")) { // need to split cause of word wrap
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(IN,vertex)"))
found++;
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(OUT,vertex)"))
[44/50] [abbrv] tinkerpop git commit: Fixed wildcard imports.
Posted by sp...@apache.org.
Fixed wildcard imports.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6cee5267
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6cee5267
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6cee5267
Branch: refs/heads/TINKERPOP-1274
Commit: 6cee52679aaf9fd12978738d4acbf4a6c6bae9e6
Parents: 3f89027
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Jun 29 15:27:39 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:39:48 2016 +0100
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONIo.java | 6 +++++-
.../structure/io/graphson/GraphSONModule.java | 14 +++++++++++++-
.../structure/io/graphson/GraphSONReader.java | 15 +++++++++++++--
.../io/graphson/GraphSONSerializersV1d0.java | 14 ++++++++++++--
.../io/graphson/GraphSONSerializersV2d0.java | 19 ++++++++++++++++---
.../io/graphson/GraphSONTypeIdResolver.java | 8 +++++++-
.../structure/io/graphson/GraphSONWriter.java | 15 +++++++++++++--
.../io/graphson/JavaTimeSerializersV1d0.java | 14 +++++++++++++-
.../io/graphson/JavaTimeSerializersV2d0.java | 14 +++++++++++++-
.../io/graphson/LegacyGraphSONReader.java | 14 ++++++++++++--
.../io/graphson/TinkerPopJacksonModule.java | 1 -
.../star/StarGraphGraphSONSerializerV1d0.java | 15 +++++++++++++--
.../star/StarGraphGraphSONSerializerV2d0.java | 15 +++++++++++----
.../GraphSONMapperEmbeddedTypeTest.java | 2 --
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 20 ++++++++++++++++++--
.../io/graphson/GraphSONMapperV2d0Test.java | 20 ++++++++++++++++++--
...raphSONMessageSerializerGremlinV1d0Test.java | 7 +++----
...raphSONMessageSerializerGremlinV2d0Test.java | 20 ++++++++++++++++----
.../ser/GraphSONMessageSerializerV1d0Test.java | 9 ++-------
.../ser/GraphSONMessageSerializerV2d0Test.java | 19 +++++++++++++++----
.../structure/IoDataGenerationTest.java | 14 ++++++++++++--
21 files changed, 225 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
index 31cc6f2..0354a11 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
@@ -22,7 +22,11 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
/**
* Constructs GraphSON IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/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 06630f4..8ecacdd 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
@@ -31,7 +31,19 @@ import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSeriali
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2d0;
import java.nio.ByteBuffer;
-import java.time.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 6f15979..0b27c61 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -18,7 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
@@ -38,7 +44,12 @@ import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.apache.tinkerpop.shaded.jackson.databind.node.JsonNodeType;
import org.javatuples.Pair;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
index 7e78222..2fc9e47 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
@@ -25,7 +25,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
@@ -39,7 +43,13 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import org.javatuples.Pair;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index e4f8280..613812a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -25,7 +25,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
@@ -39,10 +43,19 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import org.javatuples.Pair;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.*;
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.writeEndArray;
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.writeEndObject;
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.writeStartArray;
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.writeStartObject;
/**
* GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
index 97790ef..bf09985 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
@@ -31,7 +31,13 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
index 1dd2c9c..6980b48 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
@@ -18,14 +18,25 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
import org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.util.Iterator;
import java.util.function.Function;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
index ba4b056..763c1d9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
@@ -27,7 +27,19 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.time.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
/**
* GraphSON serializers for classes in {@code java.time.*}.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
index 4702092..2950a33 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
@@ -27,7 +27,19 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.time.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
/**
* GraphSON serializers for classes in {@code java.time.*} for the version 2.0 of GraphSON.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index 852d82d..679c827 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -18,7 +18,13 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
@@ -31,7 +37,11 @@ import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
index 110b2a0..ecf3483 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.shaded.jackson.databind.JsonDeserializer;
import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
index bbd5591..01cb6d6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
@@ -18,7 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.structure.util.star;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
@@ -31,7 +34,15 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
index 2e0bc53..04d65c5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
@@ -18,10 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.structure.util.star;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
@@ -32,8 +34,13 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.util.*;
-import java.util.function.Function;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index c7549f9..db16ea7 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@ -19,8 +19,6 @@
package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
import org.junit.Test;
import java.io.ByteArrayInputStream;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
index 6b5f7e9..3969c46 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
@@ -24,8 +24,24 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.time.*;
-import java.util.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
index 0fea292..e6a5b6f 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
@@ -22,8 +22,24 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
-import java.time.*;
-import java.util.*;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
index 0091a5f..c47b7b6 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
@@ -18,6 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.driver.ser;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
@@ -30,9 +33,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
import org.junit.Test;
@@ -43,7 +43,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
index 7f21586..2708e7b 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
@@ -25,7 +25,11 @@ import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
@@ -33,9 +37,17 @@ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
import org.junit.Test;
-import java.util.*;
-
-import static org.junit.Assert.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
/**
* Serializer tests that cover non-lossy serialization/deserialization methods for GraphSONMessage.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
index a4cee54..bf1ddcb 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0Test.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
@@ -35,21 +36,16 @@ import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
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.module.SimpleModule;
import org.apache.tinkerpop.shaded.jackson.databind.node.NullNode;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
import org.junit.Test;
-import java.awt.*;
+import java.awt.Color;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -57,7 +53,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/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 5100f05..201354c 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
@@ -23,7 +23,11 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
@@ -41,13 +45,20 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
import org.junit.Test;
-import java.awt.*;
+import java.awt.Color;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
/**
* These tests focus on message serialization and not "result" serialization as test specific to results (e.g.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cee5267/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index b4356b6..71a086c 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -23,7 +23,12 @@ import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
@@ -35,7 +40,12 @@ import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Iterator;
import java.util.stream.IntStream;
[21/50] [abbrv] tinkerpop git commit: Merge branch 'tp31'
Posted by sp...@apache.org.
Merge branch 'tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/668bee37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/668bee37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/668bee37
Branch: refs/heads/TINKERPOP-1274
Commit: 668bee3718fd5de462abf2d7f0ee59ffe4e11e64
Parents: 74127ca ce0dc48
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 16 21:47:32 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 16 21:47:32 2016 +0200
----------------------------------------------------------------------
bin/validate-distribution.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[11/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2d2a7d2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2d2a7d2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2d2a7d2
Branch: refs/heads/TINKERPOP-1274
Commit: c2d2a7d27f8058ac58406cc9907fc69089fbdc41
Parents: 97a7ba5 ccd2630
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:18:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:18:36 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/administration.asciidoc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[27/50] [abbrv] tinkerpop git commit: realized why various providers
OPT_OUT of a particular OrderTest. The traversal should be compiled and then
setLimit() called. CTR.
Posted by sp...@apache.org.
realized why various providers OPT_OUT of a particular OrderTest. The traversal should be compiled and then setLimit() called. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2eafeef8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2eafeef8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2eafeef8
Branch: refs/heads/TINKERPOP-1274
Commit: 2eafeef8d174834b65bfbea532d4829f84bcd8a7
Parents: 9ff14b7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 21 08:54:45 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 21 08:54:45 2016 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/traversal/step/map/OrderTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2eafeef8/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index ca7b8bd..453a663 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -406,6 +406,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
public void g_V_both_hasLabelXpersonX_order_byXage_decrX_name() {
final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_decrX_name();
+ traversal.asAdmin().applyStrategies();
if (!TraversalHelper.getFirstStepOfAssignableClass(OrderGlobalStep.class, traversal.asAdmin()).isPresent())
return; // total hack to avoid providers that don't compile to OrderGlobalStep
TraversalHelper.getFirstStepOfAssignableClass(OrderGlobalStep.class, traversal.asAdmin()).get().setLimit(1);
[14/50] [abbrv] tinkerpop git commit: Re-assigned step labels as
appropriate in SubgraphStrategy.
Posted by sp...@apache.org.
Re-assigned step labels as appropriate in SubgraphStrategy.
Step labels were not being re-written to replaced steps or to the subgraph filter steps and so traversals using .as('a') and the like were failing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84f2d63d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84f2d63d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84f2d63d
Branch: refs/heads/TINKERPOP-1274
Commit: 84f2d63d7b758c21bb22a6d771d57479fce3d06b
Parents: e3c5d8e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 14:15:53 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 14:29:43 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/SubgraphStrategy.java | 40 ++++++++++++++------
.../decoration/SubgraphStrategyProcessTest.java | 22 +++++++++++
3 files changed, 51 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84f2d63d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7b5206b..a359eca 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`.
+* Fixed bug in `SubgraphStrategy` where step labels were not being propogated properly to new steps injected by the strategy.
* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations.
* Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84f2d63d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index e2488fb..d328168 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -34,6 +34,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.util.ArrayList;
@@ -86,7 +87,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
vertexStepsToInsertFilterAfter.addAll(TraversalHelper.getStepsOfAssignableClass(AddVertexStartStep.class, traversal));
vertexStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsVertex).collect(Collectors.toList()));
- vertexStepsToInsertFilterAfter.forEach(s -> TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, vertexCriterion.asAdmin().clone()), s, traversal));
+ applyCriterion(vertexStepsToInsertFilterAfter, traversal, vertexCriterion.asAdmin());
}
if (edgeCriterion != null) {
@@ -95,7 +96,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
edgeStepsToInsertFilterAfter.addAll(graphSteps.stream().filter(GraphStep::returnsEdge).collect(Collectors.toList()));
edgeStepsToInsertFilterAfter.addAll(vertexSteps.stream().filter(VertexStep::returnsEdge).collect(Collectors.toList()));
- edgeStepsToInsertFilterAfter.forEach(s -> TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, edgeCriterion.asAdmin().clone()), s, traversal));
+ applyCriterion(edgeStepsToInsertFilterAfter, traversal, edgeCriterion.asAdmin());
}
// explode g.V().out() to g.V().outE().inV() only if there is an edge predicate otherwise
@@ -103,19 +104,19 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
if (null == edgeCriterion)
TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, vertexCriterion.asAdmin().clone()), s, traversal);
else {
- final VertexStep replacementVertexStep = new VertexStep(traversal, Edge.class, s.getDirection(), s.getEdgeLabels());
- Step intermediateFilterStep = null;
- if (s.getDirection() == Direction.BOTH)
- intermediateFilterStep = new EdgeOtherVertexStep(traversal);
- else
- intermediateFilterStep = new EdgeVertexStep(traversal, s.getDirection().opposite());
+ final VertexStep someEStep = new VertexStep(traversal, Edge.class, s.getDirection(), s.getEdgeLabels());
+ final Step someVStep = (s.getDirection() == Direction.BOTH) ?
+ new EdgeOtherVertexStep(traversal) : new EdgeVertexStep(traversal, s.getDirection().opposite());
- TraversalHelper.replaceStep(s, replacementVertexStep, traversal);
- TraversalHelper.insertAfterStep(intermediateFilterStep, replacementVertexStep, traversal);
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, edgeCriterion.asAdmin().clone()), replacementVertexStep, traversal);
+ // if s was labelled then propagate those labels to the new step that will return the vertex
+ transferLabels(s, someVStep);
+
+ TraversalHelper.replaceStep(s, someEStep, traversal);
+ TraversalHelper.insertAfterStep(someVStep, someEStep, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, edgeCriterion.asAdmin().clone()), someEStep, traversal);
if (vertexCriterion != null)
- TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, vertexCriterion.asAdmin().clone()), intermediateFilterStep, traversal);
+ TraversalHelper.insertAfterStep(new TraversalFilterStep<>(traversal, vertexCriterion.asAdmin().clone()), someVStep, traversal);
}
});
}
@@ -132,6 +133,21 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
return new Builder();
}
+ private void applyCriterion(final List<Step> stepsToApplyCriterionAfter, final Traversal.Admin traversal,
+ final Traversal.Admin<? extends Element, ?> criterion) {
+ stepsToApplyCriterionAfter.forEach(s -> {
+ // re-assign the step label to the criterion because the label should apply seamlessly after the filter
+ final Step filter = new TraversalFilterStep<>(traversal, criterion.clone());
+ transferLabels(s, filter);
+ TraversalHelper.insertAfterStep(filter, s, traversal);
+ });
+ }
+
+ private static void transferLabels(final Step from, final Step to) {
+ from.getLabels().forEach(label -> to.addLabel((String) label));
+ to.getLabels().forEach(label -> from.removeLabel((String) label));
+ }
+
public final static class Builder {
private Traversal<Vertex, ?> vertexCriterion = null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84f2d63d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 11f96d0..81ea296 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -32,11 +32,16 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.List;
import java.util.NoSuchElementException;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsCollectionContaining.hasItem;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -302,6 +307,23 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
}
}
+ @Test
+ @LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ public void shouldFilterVertexCriterionAndKeepLabels() throws Exception {
+ // this will exclude "peter"
+ final Traversal<Vertex, ?> vertexCriterion = __.has("name", P.within("ripple", "josh", "marko"));
+
+ final SubgraphStrategy strategy = SubgraphStrategy.build().vertexCriterion(vertexCriterion).create();
+ final GraphTraversalSource sg = create(strategy);
+
+ assertEquals(9, g.V().as("a").out().in().as("b").dedup("a", "b").count().next().intValue());
+ assertEquals(2, sg.V().as("a").out().in().as("b").dedup("a", "b").count().next().intValue());
+
+ final List<Object> list = sg.V().as("a").out().in().as("b").dedup("a", "b").values("name").toList();
+ assertThat(list, hasItems("marko", "josh"));
+ }
+
@Test(expected = NoSuchElementException.class)
@LoadGraphWith(MODERN)
public void shouldGetExcludedVertex() throws Exception {
[22/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-939'
into tp31
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-939' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/45e19af7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/45e19af7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/45e19af7
Branch: refs/heads/TINKERPOP-1274
Commit: 45e19af71e9130658435e0e6af98a606252627f5
Parents: ce0dc48 6220653
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jun 17 06:24:50 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jun 17 06:24:50 2016 -0400
----------------------------------------------------------------------
.../reference/implementations-neo4j.asciidoc | 74 ++++++++++++++++++++
1 file changed, 74 insertions(+)
----------------------------------------------------------------------
[15/50] [abbrv] tinkerpop git commit: Added a NOTE to the centrality
recipe to clarify the usage of by() CTR
Posted by sp...@apache.org.
Added a NOTE to the centrality recipe to clarify the usage of by() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b67db0c5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b67db0c5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b67db0c5
Branch: refs/heads/TINKERPOP-1274
Commit: b67db0c59dab49a1f4d008d21446c9136e8cbf41
Parents: 6c16632
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 16:40:27 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 16:40:27 2016 -0400
----------------------------------------------------------------------
docs/src/recipes/centrality.asciidoc | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b67db0c5/docs/src/recipes/centrality.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/centrality.asciidoc b/docs/src/recipes/centrality.asciidoc
index e8d71e4..eeee79d 100644
--- a/docs/src/recipes/centrality.asciidoc
+++ b/docs/src/recipes/centrality.asciidoc
@@ -49,6 +49,12 @@ stream of `Map` objects can allow some greater flexibility.
<5> For example, use of a stream enables use of an ordered limit that can be executed in a distributed fashion in
OLAP traversals.
+NOTE: The link:http://tinkerpop.apache.org/docs/x.y.z/reference/#group-step[group] step takes up to two separate
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#by-step[by] modulators. The first `by()` tells `group()`
+what the key in the resulting `Map` will be (i.e. the value to group on). In the above examples, the `by()` is empty
+and as a result, the grouping will be on the incoming `Vertex` object itself. The second `by()` is the value to be
+stored in the `Map` for each key.
+
[[betweeness-centrality]]
Betweeness Centrality
~~~~~~~~~~~~~~~~~~~~~
[36/50] [abbrv] tinkerpop git commit: Frame up for GraphSON 2.0
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
new file mode 100644
index 0000000..763c1d9
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
@@ -0,0 +1,326 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+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.StdSerializer;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.Period;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*}.
+ */
+final class JavaTimeSerializersV1d0 {
+
+ private JavaTimeSerializersV1d0() {}
+
+ /**
+ * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+ */
+ static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+ public AbstractJavaTimeSerializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ @Override
+ public void serialize(final T value, final JsonGenerator gen,
+ final SerializerProvider serializerProvider) throws IOException {
+ gen.writeString(value.toString());
+ }
+
+ @Override
+ public void serializeWithType(final T value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ typeSer.writeTypePrefixForObject(value, gen);
+ gen.writeStringField(GraphSONTokens.VALUE, value.toString());
+ typeSer.writeTypeSuffixForObject(value, gen);
+ }
+ }
+ /**
+ * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+ */
+ abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+ public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ public abstract T parse(final String val);
+
+ @Override
+ public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+ if (!jsonParser.getText().equals(GraphSONTokens.VALUE))
+ throw new IOException(String.format("Invalid format for %s - expecting '%s' with a text value in ISO-8061 format", _valueClass.getSimpleName(), GraphSONTokens.VALUE));
+
+ return parse(jsonParser.nextTextValue());
+ }
+ }
+
+ final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+ public DurationJacksonSerializer() {
+ super(Duration.class);
+ }
+ }
+
+ final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+ public DurationJacksonDeserializer() {
+ super(Duration.class);
+ }
+
+ @Override
+ public Duration parse(final String val) {
+ return Duration.parse(val);
+ }
+ }
+
+ final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
+
+ public InstantJacksonSerializer() {
+ super(Instant.class);
+ }
+ }
+
+ final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
+ public InstantJacksonDeserializer() {
+ super(Instant.class);
+ }
+
+ @Override
+ public Instant parse(final String val) {
+ return Instant.parse(val);
+ }
+ }
+
+ final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
+
+ public LocalDateJacksonSerializer() {
+ super(LocalDate.class);
+ }
+ }
+
+ final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
+ public LocalDateJacksonDeserializer() {
+ super(LocalDate.class);
+ }
+
+ @Override
+ public LocalDate parse(final String val) {
+ return LocalDate.parse(val);
+ }
+ }
+
+ final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
+
+ public LocalDateTimeJacksonSerializer() {
+ super(LocalDateTime.class);
+ }
+ }
+
+ final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
+ public LocalDateTimeJacksonDeserializer() {
+ super(LocalDateTime.class);
+ }
+
+ @Override
+ public LocalDateTime parse(final String val) {
+ return LocalDateTime.parse(val);
+ }
+ }
+
+ final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
+
+ public LocalTimeJacksonSerializer() {
+ super(LocalTime.class);
+ }
+ }
+
+ final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
+ public LocalTimeJacksonDeserializer() {
+ super(LocalTime.class);
+ }
+
+ @Override
+ public LocalTime parse(final String val) {
+ return LocalTime.parse(val);
+ }
+ }
+
+ final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
+
+ public MonthDayJacksonSerializer() {
+ super(MonthDay.class);
+ }
+ }
+
+ final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
+ public MonthDayJacksonDeserializer() {
+ super(MonthDay.class);
+ }
+
+ @Override
+ public MonthDay parse(final String val) {
+ return MonthDay.parse(val);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+ public OffsetDateTimeJacksonSerializer() {
+ super(OffsetDateTime.class);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+ public OffsetDateTimeJacksonDeserializer() {
+ super(OffsetDateTime.class);
+ }
+
+ @Override
+ public OffsetDateTime parse(final String val) {
+ return OffsetDateTime.parse(val);
+ }
+ }
+
+ final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
+
+ public OffsetTimeJacksonSerializer() {
+ super(OffsetTime.class);
+ }
+ }
+
+ final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
+ public OffsetTimeJacksonDeserializer() {
+ super(OffsetTime.class);
+ }
+
+ @Override
+ public OffsetTime parse(final String val) {
+ return OffsetTime.parse(val);
+ }
+ }
+
+ final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
+
+ public PeriodJacksonSerializer() {
+ super(Period.class);
+ }
+ }
+
+ final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
+ public PeriodJacksonDeserializer() {
+ super(Period.class);
+ }
+
+ @Override
+ public Period parse(final String val) {
+ return Period.parse(val);
+ }
+ }
+
+ final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
+
+ public YearJacksonSerializer() {
+ super(Year.class);
+ }
+ }
+
+ final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
+ public YearJacksonDeserializer() {
+ super(Year.class);
+ }
+
+ @Override
+ public Year parse(final String val) {
+ return Year.parse(val);
+ }
+ }
+
+ final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
+
+ public YearMonthJacksonSerializer() {
+ super(YearMonth.class);
+ }
+ }
+
+ final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
+ public YearMonthJacksonDeserializer() {
+ super(YearMonth.class);
+ }
+
+ @Override
+ public YearMonth parse(final String val) {
+ return YearMonth.parse(val);
+ }
+ }
+
+ final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
+
+ public ZonedDateTimeJacksonSerializer() {
+ super(ZonedDateTime.class);
+ }
+ }
+
+ final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
+ public ZonedDateTimeJacksonDeserializer() {
+ super(ZonedDateTime.class);
+ }
+
+ @Override
+ public ZonedDateTime parse(final String val) {
+ return ZonedDateTime.parse(val);
+ }
+ }
+
+ final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
+
+ public ZoneOffsetJacksonSerializer() {
+ super(ZoneOffset.class);
+ }
+ }
+
+ final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
+ public ZoneOffsetJacksonDeserializer() {
+ super(ZoneOffset.class);
+ }
+
+ @Override
+ public ZoneOffset parse(final String val) {
+ return ZoneOffset.of(val);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializers.java
deleted file mode 100644
index 4f2f5da..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializers.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * GraphSON serializers for classes in {@code java.util.*}.
- */
-final class JavaUtilSerializers {
-
- private JavaUtilSerializers() {}
-
- final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
-
- public MapEntryJacksonSerializer() {
- super(Map.Entry.class);
- }
-
- @Override
- public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
- throws IOException {
- ser(entry, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- ser(entry, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
-
- // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
- // StdKeySerializer
- final Object key = entry.getKey();
- final Class cls = key.getClass();
- String k;
- if (cls == String.class)
- k = (String) key;
- else if (Element.class.isAssignableFrom(cls))
- k = ((Element) key).id().toString();
- else if(Date.class.isAssignableFrom(cls)) {
- if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
- k = String.valueOf(((Date) key).getTime());
- else
- k = serializerProvider.getConfig().getDateFormat().format((Date) key);
- } else if(cls == Class.class)
- k = ((Class) key).getName();
- else
- k = key.toString();
-
- serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
- jsonGenerator.writeEndObject();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0554b59b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java
new file mode 100644
index 0000000..15dd3b9
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV1d0.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*}.
+ */
+final class JavaUtilSerializersV1d0 {
+
+ private JavaUtilSerializersV1d0() {}
+
+ final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+ public MapEntryJacksonSerializer() {
+ super(Map.Entry.class);
+ }
+
+ @Override
+ public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(entry, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(entry, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+ // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
+ // StdKeySerializer
+ final Object key = entry.getKey();
+ final Class cls = key.getClass();
+ String k;
+ if (cls == String.class)
+ k = (String) key;
+ else if (Element.class.isAssignableFrom(cls))
+ k = ((Element) key).id().toString();
+ else if(Date.class.isAssignableFrom(cls)) {
+ if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
+ k = String.valueOf(((Date) key).getTime());
+ else
+ k = serializerProvider.getConfig().getDateFormat().format((Date) key);
+ } else if(cls == Class.class)
+ k = ((Class) key).getName();
+ else
+ k = key.toString();
+
+ serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
+ jsonGenerator.writeEndObject();
+ }
+ }
+}
[47/50] [abbrv] tinkerpop git commit: Added Graph drivers docs.
Posted by sp...@apache.org.
Added Graph drivers docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/50f70a37
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/50f70a37
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/50f70a37
Branch: refs/heads/TINKERPOP-1274
Commit: 50f70a37af21172a4151ae739ecd2f19e814fb86
Parents: 67db6be8
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Jun 29 19:09:48 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:41:35 2016 +0100
----------------------------------------------------------------------
docs/src/reference/the-graph.asciidoc | 7 +++----
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 13 +++++++++++++
2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/50f70a37/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index 9817ce8..f27db23 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -1,4 +1,4 @@
-*////
+////
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -13,7 +13,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-_////
+////
[[graph]]
The Graph
=========
@@ -898,5 +898,4 @@ IMPORTANT: TinkerPop uses `tinkerpop.` and `gremlin.` as the prefixes for provid
reduce implementations, and plugins.
The only truly protected namespace is the _hidden namespace_ provided to graph systems. From there, it's up to
-engineers to respect the namespacing conventions presented.
-*_
\ No newline at end of file
+engineers to respect the namespacing conventions presented.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/50f70a37/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 04f38c6..07f53a4 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -214,6 +214,19 @@ VertexTest Signatures
The method signatures of `get_g_VXlistXv1_v2_v3XX_name` and `get_g_VXlistX1_2_3XX_name` of `VertexTest` were changed
to take arguments for the `Traversal` to be constructed by extending classes.
+Graph Drivers Providers
+^^^^^^^^^^^^^^^^^^^^^^
+
+GraphSON 2.0
+++++++++++++
+
+Drivers providers can exploit the new format of typed values JSON serialization offered by GraphSON 2.0. This format
+has been created to allow easy and agnostic parsing of a GraphSON payload without type loss. Drivers of non Java
+languages can then implement their own mapping of the GraphSON's language agnostic type IDs like `UUID`, `LocalDate` to
+the appropriate representation for the driver's language. A more detailed description of GraphSON 2.0 can be found
+there : link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#graphson-2.0-types[Reference Documentation
+- GraphSON 2.0]
+
TinkerPop 3.2.0
---------------
[46/50] [abbrv] tinkerpop git commit: Added upgrade docs.
Posted by sp...@apache.org.
Added upgrade docs.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/67db6be8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/67db6be8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/67db6be8
Branch: refs/heads/TINKERPOP-1274
Commit: 67db6be88289ecc734e93411c72b74e06a60b81d
Parents: 7546bc7
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Jun 29 18:36:24 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:41:34 2016 +0100
----------------------------------------------------------------------
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/67db6be8/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index ac94960..04f38c6 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -32,6 +32,13 @@ Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.2.1/CHA
Upgrading for Users
~~~~~~~~~~~~~~~~~~~
+GraphSON 2.0
+^^^^^^^^^^^^
+
+GraphSON 2.0 has been introduced to improve and normalize the format of types embedding in GraphSON. Please see
+link:http://tinkerpop.apache.org/docs/3.2.1-incubating/reference/#graphson-2.0-types[Reference Documentation -
+GraphSON 2.0] and link:https://issues.apache.org/jira/browse/TINKERPOP-1274[TINKERPOP-1274].
+
Gephi Plugin
^^^^^^^^^^^^
[35/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1071'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1071'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5395aaeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5395aaeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5395aaeb
Branch: refs/heads/TINKERPOP-1274
Commit: 5395aaeb057e4c163233aa8ace2a2975ea827fe5
Parents: 0787e46 2d69b9e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 28 18:25:10 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 28 18:25:10 2016 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
[16/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/74127ca3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74127ca3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74127ca3
Branch: refs/heads/TINKERPOP-1274
Commit: 74127ca38c7d2d671f5829b128ec97feb5327951
Parents: b67db0c 84f2d63
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 16 07:48:58 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 16 07:48:58 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/SubgraphStrategy.java | 40 ++++++++++++++------
.../decoration/SubgraphStrategyProcessTest.java | 22 +++++++++++
3 files changed, 51 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74127ca3/CHANGELOG.asciidoc
----------------------------------------------------------------------
[31/50] [abbrv] tinkerpop git commit: updated CHANGELOG.
Posted by sp...@apache.org.
updated CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/82afed3a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/82afed3a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/82afed3a
Branch: refs/heads/TINKERPOP-1274
Commit: 82afed3a482a287241ae5a016bc2e14f01785b21
Parents: 7dfd0dd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 21 16:45:57 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 21 16:45:57 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/82afed3a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1ba08d4..94bb67e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.2.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalExplanation.prettyPrint()` exists which provides word wrapping and GremlinConsole is smart to use console width to control `toString()`.
* `TraversalOpProcessor` (`RemoteConnection`) uses `HaltedTraverserStrategy` metadata to determine detachment procedure prior to returning results.
* Allow DFS paths in `HADOOP_GREMLIN_LIBS`.
* Added a safer serializer infrastructure for use with `SparkGraphComputer` that uses `KryoSerializer` and the new `GryoRegistrator`.
[05/50] [abbrv] tinkerpop git commit: TraversalExplanation now
supports word wrapping and VertexProgamStep.toStrings() have GraphFilter
information attached.
Posted by sp...@apache.org.
TraversalExplanation now supports word wrapping and VertexProgamStep.toStrings() have GraphFilter information attached.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc62efec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc62efec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc62efec
Branch: refs/heads/TINKERPOP-1274
Commit: fc62efec4d578b5e767676b04789cf35535f53f0
Parents: 1a526eb
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 15 07:00:44 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 15 07:00:44 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/computer/GraphFilter.java | 11 ++++
.../step/map/PageRankVertexProgramStep.java | 3 +-
.../step/map/PeerPressureVertexProgramStep.java | 3 +-
.../step/map/ProgramVertexProgramStep.java | 3 +-
.../step/map/TraversalVertexProgramStep.java | 3 +-
.../traversal/util/TraversalExplanation.java | 56 ++++++++++++++++++--
.../util/TraversalExplanationTest.java | 42 ++++++++++++++-
7 files changed, 111 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
index 59c654d..3718d16 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphFilter.java
@@ -83,6 +83,17 @@ public final class GraphFilter implements Cloneable, Serializable {
private Map<Direction, Map<String, Legal>> edgeLegality = new HashMap<>();
private boolean allowNoEdges = false;
+ public GraphFilter() {
+ // no args constructor
+ }
+
+ public GraphFilter(final Computer computer) {
+ if (null != computer.getVertices())
+ this.setVertexFilter(computer.getVertices());
+ if (null != computer.getEdges())
+ this.setEdgeFilter(computer.getEdges());
+ }
+
/**
* Set the filter for selecting vertices from the source graph.
* The vertex filter can only access the vertex, its properties, and its properties properties.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
index fcb2eec..364d092 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map;
+import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
import org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.lambda.HaltedTraversersCountTraversal;
@@ -78,7 +79,7 @@ public final class PageRankVertexProgramStep extends VertexProgramStep implement
@Override
public String toString() {
- return StringFactory.stepString(this, this.edgeTraversal.get(), this.pageRankProperty, this.times);
+ return StringFactory.stepString(this, this.edgeTraversal.get(), this.pageRankProperty, this.times, new GraphFilter(this.computer));
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
index 0ea5112..47d4160 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map;
+import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
import org.apache.tinkerpop.gremlin.process.computer.clustering.peerpressure.PeerPressureVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.lambda.HaltedTraversersCountTraversal;
@@ -81,7 +82,7 @@ public final class PeerPressureVertexProgramStep extends VertexProgramStep imple
@Override
public String toString() {
- return StringFactory.stepString(this, this.edgeTraversal.get(), this.clusterProperty, this.times);
+ return StringFactory.stepString(this, this.edgeTraversal.get(), this.clusterProperty, this.times, new GraphFilter(this.computer));
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ProgramVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ProgramVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ProgramVertexProgramStep.java
index 82e70dd..31eb04b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ProgramVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ProgramVertexProgramStep.java
@@ -20,6 +20,7 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map;
import org.apache.commons.configuration.MapConfiguration;
+import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
@@ -67,6 +68,6 @@ public final class ProgramVertexProgramStep extends VertexProgramStep {
@Override
public String toString() {
- return StringFactory.stepString(this, this.toStringOfVertexProgram);
+ return StringFactory.stepString(this, this.toStringOfVertexProgram, new GraphFilter(this.computer));
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
index 58e44a2..0eee43a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/TraversalVertexProgramStep.java
@@ -20,6 +20,7 @@
package org.apache.tinkerpop.gremlin.process.computer.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.computer.GraphFilter;
import org.apache.tinkerpop.gremlin.process.computer.Memory;
import org.apache.tinkerpop.gremlin.process.computer.traversal.MemoryTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
@@ -54,7 +55,7 @@ public final class TraversalVertexProgramStep extends VertexProgramStep implemen
@Override
public String toString() {
- return StringFactory.stepString(this, this.computerTraversal.get());
+ return StringFactory.stepString(this, this.computerTraversal.get(), new GraphFilter(this.computer));
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
index 98cef69..675291d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
@@ -85,10 +85,26 @@ public class TraversalExplanation implements Serializable {
*/
@Override
public String toString() {
+ final int maxLineLength = 75;
final String originalTraversal = "Original Traversal";
final String finalTraversal = "Final Traversal";
- final int maxStrategyColumnLength = this.strategyTraversals.stream().map(Pair::getValue0).map(Object::toString).map(String::length).max(Comparator.<Integer>naturalOrder()).orElse(15);
- final int maxTraversalColumnLength = Stream.concat(Stream.of(Pair.with(null, this.traversal)), this.strategyTraversals.stream()).map(Pair::getValue1).map(Object::toString).map(String::length).max(Comparator.<Integer>naturalOrder()).get();
+ final int maxStrategyColumnLength = this.strategyTraversals.stream()
+ .map(Pair::getValue0)
+ .map(Object::toString)
+ .map(String::length)
+ .max(Comparator.naturalOrder())
+ .orElse(15);
+ final int newLineIndent = maxStrategyColumnLength + 10;
+ int maxTraversalColumnLength = Stream.concat(Stream.of(Pair.with(null, this.traversal)), this.strategyTraversals.stream())
+ .map(Pair::getValue1)
+ .map(Object::toString)
+ .map(s -> wordWrap(s, maxLineLength, newLineIndent))
+ .flatMap(s -> Stream.of(s.split("\n")))
+ .map(String::trim)
+ .map(s -> s.trim().startsWith("[") ? s : " " + s) // 3 indent on new lines
+ .map(String::length)
+ .max(Comparator.naturalOrder())
+ .get();
final StringBuilder builder = new StringBuilder("Traversal Explanation\n");
for (int i = 0; i < (maxStrategyColumnLength + 7 + maxTraversalColumnLength); i++) {
@@ -99,7 +115,7 @@ public class TraversalExplanation implements Serializable {
for (int i = 0; i < maxStrategyColumnLength - originalTraversal.length() + 7; i++) {
builder.append(" ");
}
- builder.append(this.traversal.toString());
+ builder.append(wordWrap(this.traversal.toString(), maxLineLength, newLineIndent));
builder.append("\n\n");
for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pairs : this.strategyTraversals) {
builder.append(pairs.getValue0());
@@ -111,15 +127,45 @@ public class TraversalExplanation implements Serializable {
for (int i = 0; i < 3; i++) {
builder.append(" ");
}
- builder.append(pairs.getValue1().toString()).append("\n");
+ builder.append(wordWrap(pairs.getValue1().toString(), maxLineLength, newLineIndent)).append("\n");
}
builder.append("\n");
builder.append(finalTraversal);
for (int i = 0; i < maxStrategyColumnLength - finalTraversal.length() + 7; i++) {
builder.append(" ");
}
- builder.append(this.strategyTraversals.size() > 0 ? this.strategyTraversals.get(this.strategyTraversals.size() - 1).getValue1() : this.traversal);
+ builder.append(wordWrap((this.strategyTraversals.size() > 0 ?
+ this.strategyTraversals.get(this.strategyTraversals.size() - 1).getValue1().toString() :
+ this.traversal.toString()), maxLineLength, newLineIndent));
return builder.toString();
}
+ private String wordWrap(final String longString, final int maxLengthPerLine, final int newLineIndent) {
+ if (longString.length() <= maxLengthPerLine)
+ return longString;
+
+ StringBuilder builder = new StringBuilder();
+ int counter = 0;
+ for (final String shortString : longString.split(", ")) {
+ if (0 == counter)
+ builder.append(shortString).append(", ");
+ else if (counter < maxLengthPerLine)
+ builder.append(shortString).append(", ");
+ else {
+ builder.deleteCharAt(builder.length() - 1); // remove the " "
+ builder.append("\n");
+ for (int i = 0; i < newLineIndent; i++) {
+ builder.append(" ");
+ }
+ builder.append(shortString).append(", ");
+ counter = 0;
+ }
+ counter = counter + shortString.length();
+ }
+
+ return builder
+ .delete(builder.length() - 2, builder.length()) // remove the final ", "
+ .toString();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc62efec/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
index 3059879..57841e4 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
@@ -22,11 +22,15 @@ package org.apache.tinkerpop.gremlin.process.traversal.util;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.junit.Test;
+import java.util.stream.Stream;
+
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
@@ -43,6 +47,40 @@ public class TraversalExplanationTest {
}
@Test
+ public void shouldWordWrapCorrectly() {
+ GraphTraversal<?, ?> traversal = __.V().out().out();
+ String toString = traversal.explain().toString();
+ assertFalse(toString.contains("VertexStep(OUT,vertex),\n"));
+ //System.out.println(toString);
+ ///
+ traversal = __.V().out().out().out().out();
+ toString = traversal.explain().toString();
+ assertTrue(toString.contains("VertexStep(OUT,vertex),\n"));
+ //System.out.println(toString);
+ ///
+ for (int i = 0; i < 30; i++) {
+ traversal = __.V();
+ for (int j = 0; j < i; j++) {
+ traversal.out();
+ }
+ traversal.asAdmin().setStrategies(TraversalStrategies.GlobalCache.getStrategies(Graph.class));
+ toString = traversal.explain().toString();
+ if (i < 4)
+ assertFalse(toString.contains("VertexStep(OUT,vertex),\n"));
+ else {
+ assertFalse(Stream.of(toString.split("\n"))
+ .filter(s -> s.startsWith(" "))
+ .map(String::trim)
+ .filter(s -> Character.isLowerCase(s.charAt(0)))
+ .findAny()
+ .isPresent()); // all indented word wraps should start with steps
+ assertTrue(toString.contains("VertexStep(OUT,vertex),\n"));
+ }
+ //System.out.println(toString);
+ }
+ }
+
+ @Test
public void shouldApplyStrategiesCorrectly() {
Traversal.Admin<?, ?> traversal = __.out().count().asAdmin();
traversal.setStrategies(TraversalStrategies.GlobalCache.getStrategies(Graph.class));
@@ -64,8 +102,10 @@ public class TraversalExplanationTest {
///
traversal = __.outE().inV().group().by(__.inE().outV().groupCount().by(__.both().count().is(P.gt(2)))).asAdmin();
traversal.setStrategies(TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone());
+ // System.out.println(traversal.explain());
found = 0;
- for (final String line : traversal.explain().toString().split("\n")) {
+ for (final String line : traversal.explain().toString().split("]\n")) { // need to split cause of word wrap
+ //System.out.println(line + "\n\n");
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(IN,vertex)"))
found++;
if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(OUT,vertex)"))
[08/50] [abbrv] tinkerpop git commit: Remove reference to the third
by() on group() docs CTR
Posted by sp...@apache.org.
Remove reference to the third by() on group() docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ebfa7859
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ebfa7859
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ebfa7859
Branch: refs/heads/TINKERPOP-1274
Commit: ebfa7859fff273a77cf94fd9e491701b4c7a9e46
Parents: 2c835c3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:00:19 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:00:19 2016 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebfa7859/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 8327dc9..ca4c6be 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -669,11 +669,10 @@ g.V().group().by(label).by(count()) <3>
<2> For each vertex in the group, get their name.
<3> For each grouping, what is its size?
-The three projection parameters available to `group()` via `by()` are:
+The two projection parameters available to `group()` via `by()` are:
. Key-projection: What feature of the object to group on (a function that yields the map key)?
. Value-projection: What feature of the group to store in the key-list?
-. Reduce-projection: What feature of the key-list to ultimately return?
[[groupcount-step]]
GroupCount Step
[17/50] [abbrv] tinkerpop git commit: Added docs for Neo4j HA
configuration.
Posted by sp...@apache.org.
Added docs for Neo4j HA configuration.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62206538
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62206538
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62206538
Branch: refs/heads/TINKERPOP-1274
Commit: 6220653868fc0c00a397456f9b7cceae82c3cb4a
Parents: 84f2d63
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 16 11:54:02 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 16 11:54:02 2016 -0400
----------------------------------------------------------------------
.../reference/implementations-neo4j.asciidoc | 74 ++++++++++++++++++++
1 file changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62206538/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index 2e47180..998eb74 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -259,3 +259,77 @@ gremlin.neo4j.directory=/tmp/neo4j
gremlin.neo4j.conf.node_auto_indexing=true
gremlin.neo4j.conf.relationship_auto_indexing=true
----
+
+High Availability Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TinkerPop supports running Neo4j with its fault tolerant master-slave replication configuration, referred to as its
+link:http://neo4j.com/docs/operations-manual/current/#_neo4j_cluster_install[High Availability (HA) cluster]. From the
+TinkerPop perspective, configuring for HA is not that different than configuring for embedded mode as shown above. The
+main difference is the usage of HA configuration options that enable the cluster. Once connected to a cluster, usage
+from the TinkerPop perspective is largely the same.
+
+In configuring for HA the most important thing to realize is that all Neo4j HA settings are simply passed through the
+TinkerPop configuration settings given to the `GraphFactory.open()` or `Neo4j.open()` methods. For example, to
+provide the all-important `ha.server_id` configuration option through TinkerPop, simply prefix that key with the
+TinkerPop Neo4j key of `gremlin.neo4j.conf`.
+
+The following properties demonstrates one of the three configuration files required to setup a simple three node HA
+cluster on the same machine instance:
+
+[source,properties]
+----
+gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
+gremlin.neo4j.directory=/tmp/neo4j.server1
+gremlin.neo4j.conf.ha.server_id=1
+gremlin.neo4j.conf.ha.initial_hosts=localhost:5001\,localhost:5002\,localhost:5003
+gremlin.neo4j.conf.ha.cluster_server=localhost:5001
+gremlin.neo4j.conf.ha.server=localhost:6001
+----
+
+Assuming the intent is to configure this cluster completely within TinkerPop (perhaps within three separate Gremlin
+Server instances), the other two configuration files will be quite similar. The second will be:
+
+[source,properties]
+----
+gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
+gremlin.neo4j.directory=/tmp/neo4j.server2
+gremlin.neo4j.conf.ha.server_id=2
+gremlin.neo4j.conf.ha.initial_hosts=localhost:5001\,localhost:5002\,localhost:5003
+gremlin.neo4j.conf.ha.cluster_server=localhost:5002
+gremlin.neo4j.conf.ha.server=localhost:6002
+----
+
+and the third will be:
+
+[source,properties]
+----
+gremlin.graph=org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
+gremlin.neo4j.directory=/tmp/neo4j.server3
+gremlin.neo4j.conf.ha.server_id=3
+gremlin.neo4j.conf.ha.initial_hosts=localhost:5001\,localhost:5002\,localhost:5003
+gremlin.neo4j.conf.ha.cluster_server=localhost:5003
+gremlin.neo4j.conf.ha.server=localhost:6003
+----
+
+IMPORTANT: The backslashes in the values provided to `gremlin.neo4j.conf.ha.initial_hosts` prevent that configuration
+setting as being interpreted as a `List`.
+
+Create three separate Gremlin Server configuration files and point each at one of these Neo4j files. Since these Gremlin
+Server instances will be running on the same machine, ensure that each Gremlin Server instance has a unique `port`
+setting in that Gremlin Server configuration file. Start each Gremlin Server instance to bring the HA cluster online.
+
+NOTE: `Neo4jGraph` instances will block until all nodes join the cluster.
+
+Neither Gremlin Server nor Neo4j will share transactions across the cluster. Be sure to either use Gremlin Server
+managed transactions or, if using a session without that option, ensure that all requests are being routed to the
+same server.
+
+This example discussed use of Gremlin Server to demonstrate the HA configuration, but it is also easy to setup with
+three Gremlin Console instances. Simply start three Gremlin Console instances and use `GraphFactory` to read those
+configuration files to form the cluster. Furthermore, keep in mind that it is possible to have a Gremlin Console join
+a cluster handled by two Gremlin Servers or Neo4j Enterprise. The only limits as to how the configuration can be
+utilized are prescribed by Neo4j itself. Please refer to their
+link:http://neo4j.com/docs/operations-manual/current/#ha-setup-tutorial[documentation] for more information on how
+this feature works.
+
[34/50] [abbrv] tinkerpop git commit: minor correction;
code was using a test file instead of the actual output file
Posted by sp...@apache.org.
minor correction; code was using a test file instead of the actual output file
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d69b9e7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d69b9e7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d69b9e7
Branch: refs/heads/TINKERPOP-1274
Commit: 2d69b9e71b11bcdbd3220809304fc8017d5ab9de
Parents: 98f09ba
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jun 28 17:22:31 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jun 28 17:22:31 2016 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d69b9e7/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 57a8b98..242cfe5 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -72,7 +72,7 @@ trap cleanup INT
function cleanup {
if [ -f "${output}" ]; then
- if [ `wc -l /tmp/foo | awk '{print $1}'` -gt 0 ]; then
+ if [ `wc -l "${output}" | awk '{print $1}'` -gt 0 ]; then
echo -e "\n\e[1mLast 10 lines of ${output}:\e[0m\n"
tail -n10 ${output}
echo
[02/50] [abbrv] tinkerpop git commit: so strange. I knew this didn't
work,
but the tests passed locally and now they don't. I think I had some cached
classes or something weird -- sorry for the broken tp31/ build. CTR.
Posted by sp...@apache.org.
so strange. I knew this didn't work, but the tests passed locally and now they don't. I think I had some cached classes or something weird -- sorry for the broken tp31/ build. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec106fc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec106fc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec106fc5
Branch: refs/heads/TINKERPOP-1274
Commit: ec106fc5a9f507ae7d5be6b06b92be33bc7bde54
Parents: 9c8c655
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 14 16:44:26 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 14 16:44:26 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/PropertiesTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec106fc5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
index b64059a..dfb3e7d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertiesTest.java
@@ -101,8 +101,8 @@ public abstract class PropertiesTest extends AbstractGremlinProcessTest {
assertEquals("name", vertexProperty.key());
assertEquals(convertToVertex(graph, vertexProperty.value()).values("name").next(), vertexProperty.value());
assertEquals(convertToVertex(graph, vertexProperty.value()).properties("name").next().id(), vertexProperty.id());
- assertEquals(convertToVertex(graph, vertexProperty.value()), vertexProperty.element());
- assertEquals(convertToVertexId(graph, vertexProperty.value()), vertexProperty.element().id());
+ // assertEquals(convertToVertex(graph, vertexProperty.value()), vertexProperty.element());
+ // assertEquals(convertToVertexId(graph, vertexProperty.value()), vertexProperty.element().id());
}
assertEquals(4, counter);
assertEquals(1, keys.size());
[41/50] [abbrv] tinkerpop git commit: TINKERPOP-1274: GraphSON 2.0.
Posted by sp...@apache.org.
TINKERPOP-1274: GraphSON 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b44ec666
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b44ec666
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b44ec666
Branch: refs/heads/TINKERPOP-1274
Commit: b44ec666f846d9acc7b0223887cb0b5e2e0789bd
Parents: 0554b59
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Tue Jun 28 19:38:32 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:39:47 2016 +0100
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONIo.java | 6 +-
.../structure/io/graphson/GraphSONMapper.java | 78 ++-
.../structure/io/graphson/GraphSONModule.java | 106 ++---
.../structure/io/graphson/GraphSONReader.java | 23 +-
.../io/graphson/GraphSONSerializerProvider.java | 28 +-
.../io/graphson/GraphSONSerializersV1d0.java | 16 +-
.../io/graphson/GraphSONSerializersV2d0.java | 467 ++++++++++++++++++
.../io/graphson/GraphSONTypeDeserializer.java | 201 ++++++++
.../io/graphson/GraphSONTypeIdResolver.java | 134 ++++++
.../graphson/GraphSONTypeResolverBuilder.java | 60 +++
.../io/graphson/GraphSONTypeSerializer.java | 160 +++++++
.../structure/io/graphson/GraphSONUtil.java | 29 ++
.../structure/io/graphson/GraphSONWriter.java | 12 +-
.../io/graphson/JavaTimeSerializersV1d0.java | 14 +-
.../io/graphson/JavaTimeSerializersV2d0.java | 311 ++++++++++++
.../io/graphson/JavaUtilSerializersV2d0.java | 116 +++++
.../structure/io/graphson/JsonParserConcat.java | 81 ++++
.../io/graphson/LegacyGraphSONReader.java | 14 +-
.../io/graphson/TinkerPopJacksonModule.java | 59 +++
.../io/graphson/ToStringGraphSONSerializer.java | 41 ++
.../util/star/DirectionalStarGraph.java | 39 ++
.../star/StarGraphGraphSONDeserializer.java | 91 ++++
.../util/star/StarGraphGraphSONSerializer.java | 250 ----------
.../star/StarGraphGraphSONSerializerV1d0.java | 167 +++++++
.../star/StarGraphGraphSONSerializerV2d0.java | 158 +++++++
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 292 ++++++++++++
.../io/graphson/GraphSONMapperV2d0Test.java | 171 +++++++
.../AbstractGraphSONMessageSerializerV2d0.java | 248 ++++++++++
.../GraphSONMessageSerializerGremlinV2d0.java | 68 +++
.../ser/GraphSONMessageSerializerV2d0.java | 124 +++++
...raphSONMessageSerializerGremlinV2d0Test.java | 321 +++++++++++++
.../ser/GraphSONMessageSerializerV2d0Test.java | 474 +++++++++++++++++++
.../structure/TinkerIoRegistryV2d0.java | 227 +++++++++
.../structure/IoDataGenerationTest.java | 109 ++++-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 156 ++++++
35 files changed, 4444 insertions(+), 407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
index 0354a11..31cc6f2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
@@ -22,11 +22,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
/**
* Constructs GraphSON IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index be5377a..8f20ef7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -33,6 +33,7 @@ import org.javatuples.Pair;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* An extension to the standard Jackson {@code ObjectMapper} which automatically registers the standard
@@ -60,14 +61,17 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private final boolean normalize;
private final boolean embedTypes;
private final GraphSONVersion version;
+ private final TypeInfo typeInfo;
private GraphSONMapper(final List<SimpleModule> customModules, final boolean loadCustomSerializers,
- final boolean normalize, final boolean embedTypes, final GraphSONVersion version) {
+ final boolean normalize, final boolean embedTypes, final GraphSONVersion version,
+ final TypeInfo typeInfo) {
this.customModules = customModules;
this.loadCustomSerializers = loadCustomSerializers;
this.normalize = normalize;
this.embedTypes = embedTypes;
this.version = version;
+ this.typeInfo = typeInfo;
}
@Override
@@ -75,6 +79,16 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
final ObjectMapper om = new ObjectMapper();
om.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ GraphSONModule graphSONModule = version.getBuilder().create(normalize);
+ om.registerModule(graphSONModule);
+ customModules.forEach(om::registerModule);
+
+
+ // plugin external serialization modules
+ if (loadCustomSerializers)
+ om.findAndRegisterModules();
+
+
if (version == GraphSONVersion.V1_0) {
if (embedTypes) {
final TypeResolverBuilder<?> typer = new StdTypeResolverBuilder()
@@ -84,29 +98,41 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
om.setDefaultTyping(typer);
}
} else if (version == GraphSONVersion.V2_0) {
+ if (typeInfo != TypeInfo.NO_TYPES) {
+ GraphSONTypeIdResolver graphSONTypeIdResolver = new GraphSONTypeIdResolver();
+ final TypeResolverBuilder typer = new GraphSONTypeResolverBuilder()
+ .typesEmbedding(getTypeInfo())
+ .init(JsonTypeInfo.Id.CUSTOM, graphSONTypeIdResolver)
+ .typeProperty(GraphSONTokens.CLASS);
+ // Register types to typeResolver for the GraphSON module
+ for (Map.Entry<String, Class> typeDeser : graphSONModule.getAddedDeserializers().entrySet()) {
+ graphSONTypeIdResolver.addCustomType(typeDeser.getKey(), typeDeser.getValue());
+ }
+
+ // Register types to typeResolver for the Custom modules
+ customModules.forEach(e -> {
+ if (e instanceof TinkerPopJacksonModule) {
+ for (Map.Entry<String, Class> typeDeser : ((TinkerPopJacksonModule) e).getAddedDeserializers().entrySet()) {
+ graphSONTypeIdResolver.addCustomType(typeDeser.getKey(), typeDeser.getValue());
+ }
+ }
+ });
+ om.setDefaultTyping(typer);
+ }
} else {
- throw new IllegalStateException("Unknown GraphSONVersion");
+ throw new IllegalStateException("Unknown GraphSONVersion : " + version);
}
- if (normalize)
- om.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
-
// this provider toStrings all unknown classes and converts keys in Map objects that are Object to String.
- final DefaultSerializerProvider provider = new GraphSONSerializerProvider();
- provider.setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer());
+ final DefaultSerializerProvider provider = new GraphSONSerializerProvider(version);
om.setSerializerProvider(provider);
- om.registerModule(version.getBuilder().create(normalize));
- customModules.forEach(om::registerModule);
-
- // plugin external serialization modules
- if (loadCustomSerializers)
- om.findAndRegisterModules();
+ if (normalize)
+ om.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
// keep streams open to accept multiple values (e.g. multiple vertices)
om.getFactory().disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
-
return om;
}
@@ -118,6 +144,15 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
return new Builder();
}
+ public TypeInfo getTypeInfo() {
+ return this.typeInfo;
+ }
+
+ public enum TypeInfo {
+ NO_TYPES,
+ PARTIAL_TYPES
+ }
+
public static class Builder implements Mapper.Builder<Builder> {
private List<SimpleModule> customModules = new ArrayList<>();
private boolean loadCustomModules = false;
@@ -125,6 +160,8 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private boolean embedTypes = false;
private List<IoRegistry> registries = new ArrayList<>();
private GraphSONVersion version = GraphSONVersion.V1_0;
+ // GraphSON 2.0 should have types activated by default, otherwise use there's no point in using it instead of 1.0.
+ private TypeInfo typeInfo = TypeInfo.PARTIAL_TYPES;
private Builder() {
}
@@ -187,13 +224,24 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
return this;
}
+ /**
+ * Specify if the values are going to be typed or not, and at which level.
+ *
+ * The level can be NO_TYPES or PARTIAL_TYPES, and could be extended in the future.
+ */
+ public Builder typeInfo(final TypeInfo typeInfo) {
+ this.typeInfo = typeInfo;
+ return this;
+ }
+
public GraphSONMapper create() {
registries.forEach(registry -> {
final List<Pair<Class, SimpleModule>> simpleModules = registry.find(GraphSONIo.class, SimpleModule.class);
simpleModules.stream().map(Pair::getValue1).forEach(this.customModules::add);
});
- return new GraphSONMapper(customModules, loadCustomModules, normalize, embedTypes, version);
+ return new GraphSONMapper(customModules, loadCustomModules, normalize, embedTypes, version, typeInfo);
}
+
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/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 639e90d..06630f4 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
@@ -19,30 +19,20 @@
package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1d0;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV2d0;
+
+import java.nio.ByteBuffer;
+import java.time.*;
import java.util.Map;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
/**
* The set of serializers that handle the core graph interfaces. These serializers support normalization which
@@ -54,7 +44,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-abstract class GraphSONModule extends SimpleModule {
+abstract class GraphSONModule extends TinkerPopJacksonModule {
GraphSONModule(final String name) {
super(name);
@@ -64,54 +54,55 @@ abstract class GraphSONModule extends SimpleModule {
* Version 2.0 of GraphSON.
*/
static final class GraphSONModuleV2d0 extends GraphSONModule {
-
/**
* Constructs a new object.
*/
protected GraphSONModuleV2d0(final boolean normalize) {
super("graphson-2.0");
+
// graph
- addSerializer(Edge.class, new GraphSONSerializersV1d0.EdgeJacksonSerializer(normalize));
- addSerializer(Vertex.class, new GraphSONSerializersV1d0.VertexJacksonSerializer(normalize));
- addSerializer(VertexProperty.class, new GraphSONSerializersV1d0.VertexPropertyJacksonSerializer(normalize));
- addSerializer(Property.class, new GraphSONSerializersV1d0.PropertyJacksonSerializer());
- addSerializer(TraversalMetrics.class, new GraphSONSerializersV1d0.TraversalMetricsJacksonSerializer());
- addSerializer(TraversalExplanation.class, new GraphSONSerializersV1d0.TraversalExplanationJacksonSerializer());
- addSerializer(Path.class, new GraphSONSerializersV1d0.PathJacksonSerializer());
- addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer(normalize));
- addSerializer(Tree.class, new GraphSONSerializersV1d0.TreeJacksonSerializer());
+ addSerializer(Edge.class, new GraphSONSerializersV2d0.EdgeJacksonSerializer(normalize));
+ addSerializer(Vertex.class, new GraphSONSerializersV2d0.VertexJacksonSerializer(normalize));
+ addSerializer(VertexProperty.class, new GraphSONSerializersV2d0.VertexPropertyJacksonSerializer(normalize));
+ addSerializer(Property.class, new GraphSONSerializersV2d0.PropertyJacksonSerializer());
+ addSerializer(TraversalMetrics.class, new GraphSONSerializersV2d0.TraversalMetricsJacksonSerializer());
+ addSerializer(TraversalExplanation.class, new GraphSONSerializersV2d0.TraversalExplanationJacksonSerializer());
+ addSerializer(Path.class, new GraphSONSerializersV2d0.PathJacksonSerializer());
+ addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV2d0(normalize));
+ addSerializer(Tree.class, new GraphSONSerializersV2d0.TreeJacksonSerializer());
// java.util
- addSerializer(Map.Entry.class, new JavaUtilSerializersV1d0.MapEntryJacksonSerializer());
+ addSerializer(Map.Entry.class, new JavaUtilSerializersV2d0.MapEntryJacksonSerializer());
+ addSerializer(ByteBuffer.class, new JavaUtilSerializersV2d0.GraphSONByteBufferSerializer());
// java.time
- addSerializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonSerializer());
- addSerializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonSerializer());
- addSerializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonSerializer());
- addSerializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonSerializer());
- addSerializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonSerializer());
- addSerializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonSerializer());
- addSerializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonSerializer());
- addSerializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonSerializer());
- addSerializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonSerializer());
- addSerializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonSerializer());
- addSerializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonSerializer());
- addSerializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonSerializer());
- addSerializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonSerializer());
-
- addDeserializer(Duration.class, new JavaTimeSerializersV1d0.DurationJacksonDeserializer());
- addDeserializer(Instant.class, new JavaTimeSerializersV1d0.InstantJacksonDeserializer());
- addDeserializer(LocalDate.class, new JavaTimeSerializersV1d0.LocalDateJacksonDeserializer());
- addDeserializer(LocalDateTime.class, new JavaTimeSerializersV1d0.LocalDateTimeJacksonDeserializer());
- addDeserializer(LocalTime.class, new JavaTimeSerializersV1d0.LocalTimeJacksonDeserializer());
- addDeserializer(MonthDay.class, new JavaTimeSerializersV1d0.MonthDayJacksonDeserializer());
- addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV1d0.OffsetDateTimeJacksonDeserializer());
- addDeserializer(OffsetTime.class, new JavaTimeSerializersV1d0.OffsetTimeJacksonDeserializer());
- addDeserializer(Period.class, new JavaTimeSerializersV1d0.PeriodJacksonDeserializer());
- addDeserializer(Year.class, new JavaTimeSerializersV1d0.YearJacksonDeserializer());
- addDeserializer(YearMonth.class, new JavaTimeSerializersV1d0.YearMonthJacksonDeserializer());
- addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV1d0.ZonedDateTimeJacksonDeserializer());
- addDeserializer(ZoneOffset.class, new JavaTimeSerializersV1d0.ZoneOffsetJacksonDeserializer());
+ addSerializer(Duration.class, new JavaTimeSerializersV2d0.DurationJacksonSerializer());
+ addSerializer(Instant.class, new JavaTimeSerializersV2d0.InstantJacksonSerializer());
+ addSerializer(LocalDate.class, new JavaTimeSerializersV2d0.LocalDateJacksonSerializer());
+ addSerializer(LocalDateTime.class, new JavaTimeSerializersV2d0.LocalDateTimeJacksonSerializer());
+ addSerializer(LocalTime.class, new JavaTimeSerializersV2d0.LocalTimeJacksonSerializer());
+ addSerializer(MonthDay.class, new JavaTimeSerializersV2d0.MonthDayJacksonSerializer());
+ addSerializer(OffsetDateTime.class, new JavaTimeSerializersV2d0.OffsetDateTimeJacksonSerializer());
+ addSerializer(OffsetTime.class, new JavaTimeSerializersV2d0.OffsetTimeJacksonSerializer());
+ addSerializer(Period.class, new JavaTimeSerializersV2d0.PeriodJacksonSerializer());
+ addSerializer(Year.class, new JavaTimeSerializersV2d0.YearJacksonSerializer());
+ addSerializer(YearMonth.class, new JavaTimeSerializersV2d0.YearMonthJacksonSerializer());
+ addSerializer(ZonedDateTime.class, new JavaTimeSerializersV2d0.ZonedDateTimeJacksonSerializer());
+ addSerializer(ZoneOffset.class, new JavaTimeSerializersV2d0.ZoneOffsetJacksonSerializer());
+
+ addDeserializer(Duration.class, new JavaTimeSerializersV2d0.DurationJacksonDeserializer());
+ addDeserializer(Instant.class, new JavaTimeSerializersV2d0.InstantJacksonDeserializer());
+ addDeserializer(LocalDate.class, new JavaTimeSerializersV2d0.LocalDateJacksonDeserializer());
+ addDeserializer(LocalDateTime.class, new JavaTimeSerializersV2d0.LocalDateTimeJacksonDeserializer());
+ addDeserializer(LocalTime.class, new JavaTimeSerializersV2d0.LocalTimeJacksonDeserializer());
+ addDeserializer(MonthDay.class, new JavaTimeSerializersV2d0.MonthDayJacksonDeserializer());
+ addDeserializer(OffsetDateTime.class, new JavaTimeSerializersV2d0.OffsetDateTimeJacksonDeserializer());
+ addDeserializer(OffsetTime.class, new JavaTimeSerializersV2d0.OffsetTimeJacksonDeserializer());
+ addDeserializer(Period.class, new JavaTimeSerializersV2d0.PeriodJacksonDeserializer());
+ addDeserializer(Year.class, new JavaTimeSerializersV2d0.YearJacksonDeserializer());
+ addDeserializer(YearMonth.class, new JavaTimeSerializersV2d0.YearMonthJacksonDeserializer());
+ addDeserializer(ZonedDateTime.class, new JavaTimeSerializersV2d0.ZonedDateTimeJacksonDeserializer());
+ addDeserializer(ZoneOffset.class, new JavaTimeSerializersV2d0.ZoneOffsetJacksonDeserializer());
}
public static Builder build() {
@@ -126,6 +117,7 @@ abstract class GraphSONModule extends SimpleModule {
public GraphSONModule create(final boolean normalize) {
return new GraphSONModuleV2d0(normalize);
}
+
}
}
@@ -147,7 +139,7 @@ abstract class GraphSONModule extends SimpleModule {
addSerializer(TraversalMetrics.class, new GraphSONSerializersV1d0.TraversalMetricsJacksonSerializer());
addSerializer(TraversalExplanation.class, new GraphSONSerializersV1d0.TraversalExplanationJacksonSerializer());
addSerializer(Path.class, new GraphSONSerializersV1d0.PathJacksonSerializer());
- addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer(normalize));
+ addSerializer(DirectionalStarGraph.class, new StarGraphGraphSONSerializerV1d0(normalize));
addSerializer(Tree.class, new GraphSONSerializersV1d0.TreeJacksonSerializer());
// java.util
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index d95fdff..6f15979 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -18,13 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-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.*;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
@@ -35,7 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
-import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
+import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONDeserializer;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.jackson.core.type.TypeReference;
@@ -44,12 +38,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.apache.tinkerpop.shaded.jackson.databind.node.JsonNodeType;
import org.javatuples.Pair;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.io.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -169,14 +158,14 @@ public final class GraphSONReader implements GraphReader {
final Function<Attachable<Edge>, Edge> edgeAttachMethod,
final Direction attachEdgesOfThisDirection) throws IOException {
final Map<String, Object> vertexData = mapper.readValue(inputStream, mapTypeReference);
- final StarGraph starGraph = StarGraphGraphSONSerializer.readStarGraphVertex(vertexData);
+ final StarGraph starGraph = StarGraphGraphSONDeserializer.readStarGraphVertex(vertexData);
if (vertexAttachMethod != null) vertexAttachMethod.apply(starGraph.getStarVertex());
if (vertexData.containsKey(GraphSONTokens.OUT_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.OUT))
- StarGraphGraphSONSerializer.readStarGraphEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.OUT_E);
+ StarGraphGraphSONDeserializer.readStarGraphEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.OUT_E);
if (vertexData.containsKey(GraphSONTokens.IN_E) && (attachEdgesOfThisDirection == Direction.BOTH || attachEdgesOfThisDirection == Direction.IN))
- StarGraphGraphSONSerializer.readStarGraphEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.IN_E);
+ StarGraphGraphSONDeserializer.readStarGraphEdges(edgeAttachMethod, starGraph, vertexData, GraphSONTokens.IN_E);
return starGraph.getStarVertex();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/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 ed20fd9..c4dcddd 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
@@ -26,32 +26,48 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.SerializerFactory;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.ToStringSerializer;
/**
- * Implementation of the {@code DefaultSerializerProvider} for Jackson that users the {@code ToStringSerializer} for
+ * Implementation of the {@code DefaultSerializerProvider} for Jackson that uses the {@code ToStringSerializer} for
* unknown types.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
final class GraphSONSerializerProvider extends DefaultSerializerProvider {
private static final long serialVersionUID = 1L;
- private static final ToStringSerializer toStringSerializer = new ToStringSerializer();
+ private final JsonSerializer<Object> unknownTypeSerializer;
- public GraphSONSerializerProvider() {
+ public GraphSONSerializerProvider(GraphSONVersion version) {
super();
+ if (version == GraphSONVersion.V1_0) {
+ setDefaultKeySerializer(new GraphSONSerializersV1d0.GraphSONKeySerializer());
+ unknownTypeSerializer = new ToStringSerializer();
+ } else {
+ setDefaultKeySerializer(new GraphSONSerializersV2d0.GraphSONKeySerializer());
+ unknownTypeSerializer = new ToStringGraphSONSerializer();
+ }
}
protected GraphSONSerializerProvider(final SerializerProvider src,
- final SerializationConfig config, final SerializerFactory f) {
+ final SerializationConfig config, final SerializerFactory f,
+ final GraphSONVersion version) {
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
public JsonSerializer<Object> getUnknownTypeSerializer(final Class<?> aClass) {
- return toStringSerializer;
+ return unknownTypeSerializer;
}
@Override
public GraphSONSerializerProvider createInstance(final SerializationConfig config,
final SerializerFactory jsf) {
- return new GraphSONSerializerProvider(this, config, jsf);
+ return new GraphSONSerializerProvider(this, config, jsf, GraphSONVersion.V1_0);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
index 2411d8f..7e78222 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV1d0.java
@@ -21,14 +21,11 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
@@ -42,15 +39,8 @@ import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import org.javatuples.Pair;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeUnit;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
/**
* GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
new file mode 100644
index 0000000..e4f8280
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@ -0,0 +1,467 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdKeySerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+import org.javatuples.Pair;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import static org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil.*;
+
+/**
+ * GraphSON serializers for graph-based objects such as vertices, edges, properties, and paths. These serializers
+ * present a generalized way to serialize the implementations of core interfaces.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONSerializersV2d0 {
+
+ private GraphSONSerializersV2d0() {
+ }
+
+ final static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
+
+ private final boolean normalize;
+
+ public VertexPropertyJacksonSerializer(final boolean normalize) {
+ super(VertexProperty.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize, true);
+ }
+
+ @Override
+ public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize, true);
+ }
+ }
+
+ final static class PropertyJacksonSerializer extends StdSerializer<Property> {
+
+ public PropertyJacksonSerializer() {
+ super(Property.class);
+ }
+
+ @Override
+ public void serialize(final Property property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(property, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final Property property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(property, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private static void ser(final Property property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ writeStartObject(property, jsonGenerator, typeSerializer);
+
+ serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
+ serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
+
+ writeEndObject(property, jsonGenerator, typeSerializer);
+ }
+ }
+
+ final static class EdgeJacksonSerializer extends StdSerializer<Edge> {
+
+ private final boolean normalize;
+
+ public EdgeJacksonSerializer(final boolean normalize) {
+ super(Edge.class);
+ this.normalize = normalize;
+ }
+
+
+ @Override
+ public void serialize(final Edge edge, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(edge, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(edge, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ writeStartObject(edge, jsonGenerator, typeSerializer);
+
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, edge.label());
+ jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.EDGE);
+ jsonGenerator.writeStringField(GraphSONTokens.IN_LABEL, edge.inVertex().label());
+ jsonGenerator.writeStringField(GraphSONTokens.OUT_LABEL, edge.outVertex().label());
+ GraphSONUtil.writeWithType(GraphSONTokens.IN, edge.inVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.OUT, edge.outVertex().id(), jsonGenerator, serializerProvider, typeSerializer);
+ writeProperties(edge, jsonGenerator, serializerProvider, typeSerializer);
+
+ writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+
+ private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException {
+ final Iterator<Property<Object>> elementProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (elementProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ writeStartObject(edge, jsonGenerator, typeSerializer);
+
+ while (elementProperties.hasNext()) {
+ final Property<Object> elementProperty = elementProperties.next();
+ GraphSONUtil.writeWithType(elementProperty.key(), elementProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+ }
+
+ }
+
+ final static class VertexJacksonSerializer extends StdSerializer<Vertex> {
+
+ private final boolean normalize;
+
+ public VertexJacksonSerializer(final boolean normalize) {
+ super(Vertex.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final Vertex vertex, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ ser(vertex, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(vertex, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException {
+ writeStartObject(vertex, jsonGenerator, typeSerializer);
+
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, vertex.id(), jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, vertex.label());
+ jsonGenerator.writeStringField(GraphSONTokens.TYPE, GraphSONTokens.VERTEX);
+ writeProperties(vertex, jsonGenerator, serializerProvider, typeSerializer);
+
+ writeEndObject(vertex, jsonGenerator, typeSerializer);
+ }
+
+ private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ writeStartObject(vertex, jsonGenerator, typeSerializer);
+
+ final List<String> keys = normalize ?
+ IteratorUtils.list(vertex.keys().iterator(), Comparator.naturalOrder()) : new ArrayList<>(vertex.keys());
+ for (String key : keys) {
+ final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+ IteratorUtils.list(vertex.properties(key), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties(key);
+ if (vertexProperties.hasNext()) {
+ jsonGenerator.writeFieldName(key);
+ writeStartArray(vertex, jsonGenerator, typeSerializer);
+
+ while (vertexProperties.hasNext()) {
+ serializerVertexProperty(vertexProperties.next(), jsonGenerator, serializerProvider, typeSerializer, normalize, false);
+ }
+
+ writeEndArray(vertex, jsonGenerator, typeSerializer);
+ }
+ }
+
+ writeEndObject(vertex, jsonGenerator, typeSerializer);
+ }
+
+ }
+
+ final static class PathJacksonSerializer extends StdSerializer<Path> {
+
+ public PathJacksonSerializer() {
+ super(Path.class);
+ }
+
+ @Override
+ public void serialize(final Path path, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException, JsonGenerationException {
+ ser(path, jsonGenerator, null);
+ }
+
+ @Override
+ public void serializeWithType(final Path path, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException, JsonProcessingException {
+ ser(path, jsonGenerator, typeSerializer);
+ }
+
+ private static void ser(final Path path, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+ throws IOException {
+ writeStartObject(path, jsonGenerator, typeSerializer);
+
+ jsonGenerator.writeObjectField(GraphSONTokens.LABELS, path.labels());
+ jsonGenerator.writeObjectField(GraphSONTokens.OBJECTS, path.objects());
+
+ writeEndObject(path, jsonGenerator, typeSerializer);
+ }
+
+ }
+
+ final static class TreeJacksonSerializer extends StdSerializer<Tree> {
+
+ public TreeJacksonSerializer() {
+ super(Tree.class);
+ }
+
+ @Override
+ public void serialize(final Tree tree, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(tree, jsonGenerator, null);
+ }
+
+ @Override
+ public void serializeWithType(final Tree tree, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
+ throws IOException, JsonProcessingException {
+ ser(tree, jsonGenerator, typeSerializer);
+ }
+
+ private static void ser(final Tree tree, final JsonGenerator jsonGenerator, final TypeSerializer typeSerializer)
+ throws IOException {
+ writeStartObject(tree, jsonGenerator, typeSerializer);
+
+ Set<Map.Entry<Element, Tree>> set = tree.entrySet();
+ for (Map.Entry<Element, Tree> entry : set) {
+ jsonGenerator.writeFieldName(entry.getKey().id().toString());
+ writeStartObject(entry, jsonGenerator, typeSerializer);
+ jsonGenerator.writeObjectField(GraphSONTokens.KEY, entry.getKey());
+ jsonGenerator.writeObjectField(GraphSONTokens.VALUE, entry.getValue());
+ writeEndObject(entry, jsonGenerator, typeSerializer);
+ }
+
+ writeEndObject(tree, jsonGenerator, typeSerializer);
+ }
+ }
+
+ /**
+ * Maps in the JVM can have {@link Object} as a key, but in JSON they must be a {@link String}.
+ */
+ final static class GraphSONKeySerializer extends StdKeySerializer {
+
+ @Override
+ public void serialize(final Object o, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ @Override
+ public void serializeWithType(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ ser(o, jsonGenerator, serializerProvider);
+ }
+
+ private void ser(final Object o, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ if (Element.class.isAssignableFrom(o.getClass()))
+ jsonGenerator.writeFieldName((((Element) o).id()).toString());
+ else
+ super.serialize(o, jsonGenerator, serializerProvider);
+ }
+ }
+
+ final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+ public TraversalExplanationJacksonSerializer() {
+ super(TraversalExplanation.class);
+ }
+
+ @Override
+ public void serialize(final TraversalExplanation traversalExplanation, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ ser(traversalExplanation, jsonGenerator);
+ }
+
+ @Override
+ public void serializeWithType(final TraversalExplanation value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ ser(value, gen);
+ }
+
+ public void ser(final TraversalExplanation te, final JsonGenerator jsonGenerator) throws IOException {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ORIGINAL, getStepsAsList(te.getOriginalTraversal()));
+
+ final List<Pair<TraversalStrategy, Traversal.Admin<?, ?>>> strategyTraversals = te.getStrategyTraversals();
+
+ final List<Map<String, Object>> intermediates = new ArrayList<>();
+ for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pair : strategyTraversals) {
+ final Map<String, Object> intermediate = new HashMap<>();
+ intermediate.put(GraphSONTokens.STRATEGY, pair.getValue0().toString());
+ intermediate.put(GraphSONTokens.CATEGORY, pair.getValue0().getTraversalCategory().getSimpleName());
+ intermediate.put(GraphSONTokens.TRAVERSAL, getStepsAsList(pair.getValue1()));
+ intermediates.add(intermediate);
+ }
+ m.put(GraphSONTokens.INTERMEDIATE, intermediates);
+
+ if (strategyTraversals.isEmpty())
+ m.put(GraphSONTokens.FINAL, getStepsAsList(te.getOriginalTraversal()));
+ else
+ m.put(GraphSONTokens.FINAL, getStepsAsList(strategyTraversals.get(strategyTraversals.size() - 1).getValue1()));
+
+ jsonGenerator.writeObject(m);
+ }
+
+ private List<String> getStepsAsList(final Traversal.Admin<?, ?> t) {
+ final List<String> steps = new ArrayList<>();
+ t.getSteps().iterator().forEachRemaining(s -> steps.add(s.toString()));
+ return steps;
+ }
+ }
+
+ final static class TraversalMetricsJacksonSerializer extends StdSerializer<TraversalMetrics> {
+ public TraversalMetricsJacksonSerializer() {
+ super(TraversalMetrics.class);
+ }
+
+ @Override
+ public void serialize(final TraversalMetrics property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ serializeInternal(property, jsonGenerator);
+ }
+
+ @Override
+ public void serializeWithType(final TraversalMetrics property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ serializeInternal(property, jsonGenerator);
+ }
+
+ private static void serializeInternal(final TraversalMetrics traversalMetrics, final JsonGenerator jsonGenerator) throws IOException {
+ // creation of the map enables all the fields to be properly written with their type if required
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.DURATION, traversalMetrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+ final List<Map<String, Object>> metrics = new ArrayList<>();
+ traversalMetrics.getMetrics().forEach(it -> metrics.add(metricsToMap(it)));
+ m.put(GraphSONTokens.METRICS, metrics);
+
+ jsonGenerator.writeObject(m);
+ }
+
+ private static Map<String, Object> metricsToMap(final Metrics metrics) {
+ final Map<String, Object> m = new HashMap<>();
+ m.put(GraphSONTokens.ID, metrics.getId());
+ m.put(GraphSONTokens.NAME, metrics.getName());
+ m.put(GraphSONTokens.COUNTS, metrics.getCounts());
+ m.put(GraphSONTokens.DURATION, metrics.getDuration(TimeUnit.NANOSECONDS) / 1000000d);
+
+ if (!metrics.getAnnotations().isEmpty()) {
+ m.put(GraphSONTokens.ANNOTATIONS, metrics.getAnnotations());
+ }
+
+ if (!metrics.getNested().isEmpty()) {
+ final List<Map<String, Object>> nested = new ArrayList<>();
+ metrics.getNested().forEach(it -> nested.add(metricsToMap(it)));
+ m.put(GraphSONTokens.METRICS, nested);
+ }
+ return m;
+ }
+ }
+
+ private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize,
+ final boolean includeLabel) throws IOException {
+ writeStartObject(property, jsonGenerator, typeSerializer);
+
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+ if (includeLabel) jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
+ tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+
+ writeEndObject(property, jsonGenerator, typeSerializer);
+ }
+
+ private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+ // when "detached" you can't check features of the graph it detached from so it has to be
+ // treated differently from a regular VertexProperty implementation.
+ if (property instanceof DetachedVertexProperty) {
+ // only write meta properties key if they exist
+ if (property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+ }
+ } else {
+ // still attached - so we can check the features to see if it's worth even trying to write the
+ // meta properties key
+ if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
+ }
+ }
+ }
+
+ private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ writeStartObject(property, jsonGenerator, typeSerializer);
+
+ final Iterator<Property<Object>> metaProperties = normalize ?
+ IteratorUtils.list((Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ while (metaProperties.hasNext()) {
+ final Property<Object> metaProperty = metaProperties.next();
+ GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ writeEndObject(property, jsonGenerator, typeSerializer);
+ }
+
+}
+
+
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
new file mode 100644
index 0000000..a7583fc
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeDeserializer.java
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.JsonDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.impl.TypeDeserializerBase;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+import org.apache.tinkerpop.shaded.jackson.databind.util.TokenBuffer;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Contains main logic for the whole JSON to Java deserialization. Handles types embedded with the version 2.0 of GraphSON.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class GraphSONTypeDeserializer extends TypeDeserializerBase {
+ private final TypeIdResolver idRes;
+ private final String propertyName;
+ private final JavaType baseType;
+ private final TypeInfo typeInfo;
+
+ private static final JavaType mapJavaType = TypeFactory.defaultInstance().constructType(Map.class);
+ private static final JavaType arrayJavaType = TypeFactory.defaultInstance().constructType(List.class);
+
+
+ GraphSONTypeDeserializer(JavaType baseType, TypeIdResolver idRes, String typePropertyName,
+ TypeInfo typeInfo){
+ super(baseType, idRes, typePropertyName, false, null);
+ this.baseType = baseType;
+ this.idRes = idRes;
+ this.propertyName = typePropertyName;
+ this.typeInfo = typeInfo;
+ }
+
+ @Override
+ public TypeDeserializer forProperty(BeanProperty beanProperty) {
+ return this;
+ }
+
+ @Override
+ public JsonTypeInfo.As getTypeInclusion() {
+ return JsonTypeInfo.As.WRAPPER_ARRAY;
+ }
+
+
+ @Override
+ public TypeIdResolver getTypeIdResolver() {
+ return idRes;
+ }
+
+ @Override
+ public Class<?> getDefaultImpl() {
+ return null;
+ }
+
+ @Override
+ public Object deserializeTypedFromObject(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+ return deserialize(jsonParser, deserializationContext);
+ }
+
+ @Override
+ public Object deserializeTypedFromArray(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+ return deserialize(jsonParser, deserializationContext);
+ }
+
+ @Override
+ public Object deserializeTypedFromScalar(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+ return deserialize(jsonParser, deserializationContext);
+ }
+
+ @Override
+ public Object deserializeTypedFromAny(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+ return deserialize(jsonParser, deserializationContext);
+ }
+
+ /**
+ * Main logic for the deserialization.
+ */
+ private Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+ TokenBuffer buf = new TokenBuffer(jsonParser.getCodec(), false);
+
+ // Detect type
+ try {
+ // The Type pattern is START_ARRAY -> START_OBJECT -> TEXT_FIELD(propertyName).
+ if (jsonParser.getCurrentToken() == JsonToken.START_ARRAY) {
+ buf.writeStartArray();
+ JsonToken t1 = jsonParser.nextToken();
+
+ if (t1 == JsonToken.START_OBJECT) {
+ buf.writeStartObject();
+ String nextFieldName = jsonParser.nextFieldName();
+
+ if (nextFieldName != null) {
+ if (nextFieldName.equals(propertyName)) {
+ // Detected type pattern
+ // Find deserializer
+ // Deserialize with deserializer
+ String typeName = jsonParser.nextTextValue();
+ JavaType typeFromId = idRes.typeFromId(typeName);
+
+ // Detected a type and extracted the value, but still want to make sure that the extracted type
+ // corresponds to what was given in parameter, if a type has been explicitly specified in param.
+ if (!baseType.isJavaLangObject() && baseType != typeFromId) {
+ throw new InstantiationException(
+ String.format("Cannot deserialize the value with the detected type contained in the JSON (\"%s\") " +
+ "to the type specified in parameter to the object mapper (%s). " +
+ "Those types are incompatible.", typeName, baseType.getRawClass().toString())
+ );
+ }
+
+ JsonDeserializer jsonDeserializer = deserializationContext.findContextualValueDeserializer(typeFromId, null);
+
+ // Position the next token right on the value
+ if (jsonParser.nextToken() == JsonToken.END_OBJECT) {
+ // Locate the cursor on the value to deser
+ jsonParser.nextValue();
+ Object value = jsonDeserializer.deserialize(jsonParser, deserializationContext);
+ // IMPORTANT - Close the JSON ARRAY
+ jsonParser.nextToken();
+ return value;
+ }
+ }
+ }
+
+ }
+ }
+ } catch (Exception e) {
+ throw deserializationContext.mappingException("Could not deserialize the JSON value as required. " + e.getMessage());
+ }
+
+ JsonParser toUseParser;
+ JsonParser bufferParser = buf.asParser();
+ JsonToken t = bufferParser.nextToken();
+
+ // While searching for the type pattern, we may have moved the cursor of the original JsonParser in param.
+ // To compensate, we have filled consistently a TokenBuffer that should contain the equivalent of
+ // what we skipped while searching for the pattern.
+ // This has an huge positive impact on performances, since JsonParser does not have a 'rewind()',
+ // the only other solution would have been to copy the whole original JsonParser. Which we avoid here and use
+ // an efficient structure made of TokenBuffer + JsonParserSequence/Concat.
+ if (t != null)
+ toUseParser = JsonParserConcat.createFlattened(bufferParser, jsonParser);
+
+ // If the cursor hasn't been moved, no need to concatenate the original JsonParser with the TokenBuffer's one.
+ else
+ toUseParser = jsonParser;
+
+ // If a type has been specified in parameter :
+ if (!baseType.isJavaLangObject()) {
+ JsonDeserializer jsonDeserializer = deserializationContext.findContextualValueDeserializer(baseType, null);
+ return jsonDeserializer.deserialize(toUseParser, deserializationContext);
+ }
+ // Otherwise, detect the current structure :
+ else {
+ if (toUseParser.isExpectedStartArrayToken()) {
+ return deserializationContext.findContextualValueDeserializer(arrayJavaType, null).deserialize(toUseParser, deserializationContext);
+ } else if (toUseParser.isExpectedStartObjectToken()) {
+ return deserializationContext.findContextualValueDeserializer(mapJavaType, null).deserialize(toUseParser, deserializationContext);
+ } else {
+ // There's JavaLangObject in param, there's no type detected in the payload, the payload isn't a JSON Map or JSON List
+ // then consider it a simple type, even though we shouldn't be here if it was a simple type.
+ // TODO : maybe throw an error instead?
+ // throw deserializationContext.mappingException("Roger, we have a problem deserializing");
+ JsonDeserializer jsonDeserializer = deserializationContext.findContextualValueDeserializer(baseType, null);
+ return jsonDeserializer.deserialize(toUseParser, deserializationContext);
+ }
+ }
+ }
+
+ private boolean canReadTypeId() {
+ return this.typeInfo == TypeInfo.PARTIAL_TYPES;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
new file mode 100644
index 0000000..97790ef
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeIdResolver.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.DatabindContext;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+import org.apache.tinkerpop.shaded.jackson.databind.type.TypeFactory;
+import org.apache.tinkerpop.shaded.jackson.databind.util.TokenBuffer;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Provides quick lookup for Type deserialization extracted from the JSON payload. As well as the Java Object to types
+ * compatible for the version 2.0 of GraphSON.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class GraphSONTypeIdResolver implements TypeIdResolver {
+
+ private final Map<String, JavaType> idToType = new HashMap<>();
+
+ GraphSONTypeIdResolver() {
+ // Need to add all the "Standard typed scalar" classes manually...
+ Arrays.asList(
+ Float.class,
+ Long.class,
+ Short.class,
+ BigInteger.class,
+ BigDecimal.class,
+ Byte.class,
+ Character.class,
+ UUID.class,
+ InetAddress.class,
+ InetSocketAddress.class,
+ ByteBuffer.class,
+ Class.class,
+ Calendar.class,
+ Date.class,
+ TimeZone.class,
+ Timestamp.class,
+ AtomicBoolean.class,
+ AtomicReference.class,
+ TokenBuffer.class
+ ).forEach(e -> idToType.put(e.getSimpleName(), TypeFactory.defaultInstance().constructType(e)));
+ }
+
+ public Map<String, JavaType> getIdToType() {
+ return idToType;
+ }
+
+ public GraphSONTypeIdResolver addCustomType(Class clasz) {
+ // May override types already registered, that's wanted.
+ getIdToType().put(clasz.getSimpleName(), TypeFactory.defaultInstance().constructType(clasz));
+ return this;
+ }
+
+ // Override manually a type definition.
+ public GraphSONTypeIdResolver addCustomType(String name, Class clasz) {
+ // May override types already registered, that's wanted.
+ getIdToType().put(name, TypeFactory.defaultInstance().constructType(clasz));
+ return this;
+ }
+
+ @Override
+ public void init(JavaType javaType) {
+ }
+
+ @Override
+ public String idFromValue(Object o) {
+ return idFromValueAndType(o, null);
+ }
+
+ @Override
+ public String idFromValueAndType(Object o, Class<?> aClass) {
+ // May be improved later
+ return o.getClass().getSimpleName();
+ }
+
+ @Override
+ public String idFromBaseType() {
+ return null;
+ }
+
+ @Override
+ public JavaType typeFromId(String s) {
+ return typeFromId(null, s);
+ }
+
+ @Override
+ public JavaType typeFromId(DatabindContext databindContext, String s) {
+ // Get the type from the string from the stored Map. If not found, default to deserialize as a String.
+ return getIdToType().get(s) != null
+ ? getIdToType().get(s)
+ // TODO: shouldn't we fail instead, if the type is not found? Or log something?
+ : TypeFactory.defaultInstance().constructType(String.class);
+ }
+
+ @Override
+ public String getDescForKnownTypeIds() {
+ // TODO (?)
+ return "GraphSON advanced typing system";
+ }
+
+ @Override
+ public JsonTypeInfo.Id getMechanism() {
+ return JsonTypeInfo.Id.CUSTOM;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
new file mode 100644
index 0000000..87ab3a3
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeResolverBuilder.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.databind.DeserializationConfig;
+import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializationConfig;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.NamedType;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
+
+import java.util.Collection;
+
+/**
+ * Creates the Type serializers as well as the Typed deserializers that will be provided to the serializers and
+ * deserializers. Contains the typeInfo level that should be provided by the GraphSONMapper.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class GraphSONTypeResolverBuilder extends StdTypeResolverBuilder {
+
+ private TypeInfo typeInfo;
+
+ @Override
+ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config, JavaType baseType, Collection<NamedType> subtypes) {
+ TypeIdResolver idRes = this.idResolver(config, baseType, subtypes, false, true);
+ return new GraphSONTypeDeserializer(baseType, idRes, this.getTypeProperty(), typeInfo);
+ }
+
+
+ @Override
+ public TypeSerializer buildTypeSerializer(SerializationConfig config, JavaType baseType, Collection<NamedType> subtypes) {
+ TypeIdResolver idRes = this.idResolver(config, baseType, subtypes, true, false);
+ return new GraphSONTypeSerializer(idRes, this.getTypeProperty(), typeInfo);
+ }
+
+ public StdTypeResolverBuilder typesEmbedding(TypeInfo typeInfo) {
+ this.typeInfo = typeInfo;
+ return this;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
new file mode 100644
index 0000000..5511b10
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
@@ -0,0 +1,160 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.TypeInfo;
+import org.apache.tinkerpop.shaded.jackson.annotation.JsonTypeInfo;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.BeanProperty;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+
+import java.io.IOException;
+
+/**
+ * Extension of the Jackson's default TypeSerializer. An instance of this object will be passed to the serializers
+ * on which they can safely call the utility methods to serialize types and making it compatible with the version
+ * 2.0 of GraphSON.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class GraphSONTypeSerializer extends TypeSerializer {
+
+ private final TypeIdResolver idRes;
+ private final String propertyName;
+ private final TypeInfo typeInfo;
+
+ GraphSONTypeSerializer(TypeIdResolver idRes, String propertyName, TypeInfo typeInfo) {
+ this.idRes = idRes;
+ this.propertyName = propertyName;
+ this.typeInfo = typeInfo;
+ }
+
+ @Override
+ public TypeSerializer forProperty(BeanProperty beanProperty) {
+ return this;
+ }
+
+ @Override
+ public JsonTypeInfo.As getTypeInclusion() {
+ return null;
+ }
+
+ @Override
+ public String getPropertyName() {
+ return propertyName;
+ }
+
+ @Override
+ public TypeIdResolver getTypeIdResolver() {
+ return idRes;
+ }
+
+ @Override
+ public void writeTypePrefixForScalar(Object o, JsonGenerator jsonGenerator) throws IOException {
+ if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValue(o));
+ }
+ }
+
+ @Override
+ public void writeTypePrefixForObject(Object o, JsonGenerator jsonGenerator) throws IOException {
+ jsonGenerator.writeStartObject();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypePrefix(Map);
+ }
+
+ @Override
+ public void writeTypePrefixForArray(Object o, JsonGenerator jsonGenerator) throws IOException {
+ jsonGenerator.writeStartArray();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypePrefix(List);
+ }
+
+ @Override
+ public void writeTypeSuffixForScalar(Object o, JsonGenerator jsonGenerator) throws IOException {
+ if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
+ }
+ }
+
+ @Override
+ public void writeTypeSuffixForObject(Object o, JsonGenerator jsonGenerator) throws IOException {
+ jsonGenerator.writeEndObject();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypeSuffix(Map);
+ }
+
+ @Override
+ public void writeTypeSuffixForArray(Object o, JsonGenerator jsonGenerator) throws IOException {
+ jsonGenerator.writeEndArray();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypeSuffix(List);
+ }
+
+ @Override
+ public void writeCustomTypePrefixForScalar(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, s);
+ }
+ }
+
+ @Override
+ public void writeCustomTypePrefixForObject(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ jsonGenerator.writeStartObject();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypePrefix(s);
+ }
+
+ @Override
+ public void writeCustomTypePrefixForArray(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ jsonGenerator.writeStartArray();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypePrefix(s);
+ }
+
+ @Override
+ public void writeCustomTypeSuffixForScalar(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
+ }
+ }
+
+ @Override
+ public void writeCustomTypeSuffixForObject(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ jsonGenerator.writeEndObject();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypeSuffix(s);
+ }
+
+ @Override
+ public void writeCustomTypeSuffixForArray(Object o, JsonGenerator jsonGenerator, String s) throws IOException {
+ jsonGenerator.writeEndArray();
+ // TODO: FULL_TYPES should be implemented here as : if (fullTypesModeEnabled()) writeTypeSuffix(s);
+ }
+
+ private boolean canWriteTypeId() {
+ return typeInfo != null
+ && typeInfo == TypeInfo.PARTIAL_TYPES;
+ }
+
+ private void writeTypePrefix(JsonGenerator jsonGenerator, String s) throws IOException {
+ jsonGenerator.writeStartArray();
+ jsonGenerator.writeStartObject();
+ jsonGenerator.writeStringField(this.getPropertyName(), s);
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeTypeSuffix(JsonGenerator jsonGenerator) throws IOException {
+ jsonGenerator.writeEndArray();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
index 9ff427c..3b3ad79 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONUtil.java
@@ -55,4 +55,33 @@ public final class GraphSONUtil {
serializer.serialize(object, jsonGenerator, serializerProvider);
}
}
+
+ public static void writeStartObject(Object o, JsonGenerator jsonGenerator, TypeSerializer typeSerializer) throws IOException {
+ if (typeSerializer != null)
+ typeSerializer.writeTypePrefixForObject(o, jsonGenerator);
+ else
+ jsonGenerator.writeStartObject();
+ }
+
+ public static void writeEndObject(Object o, JsonGenerator jsonGenerator, TypeSerializer typeSerializer) throws IOException {
+ if (typeSerializer != null)
+ typeSerializer.writeTypeSuffixForObject(o, jsonGenerator);
+ else
+ jsonGenerator.writeEndObject();
+ }
+
+ public static void writeStartArray(Object o, JsonGenerator jsonGenerator, TypeSerializer typeSerializer) throws IOException {
+ if (typeSerializer != null)
+ typeSerializer.writeTypePrefixForArray(o, jsonGenerator);
+ else
+ jsonGenerator.writeStartArray();
+ }
+
+
+ public static void writeEndArray(Object o, JsonGenerator jsonGenerator, TypeSerializer typeSerializer) throws IOException {
+ if (typeSerializer != null)
+ typeSerializer.writeTypeSuffixForArray(o, jsonGenerator);
+ else
+ jsonGenerator.writeEndArray();
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
index 37ed9a0..1dd2c9c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
@@ -18,17 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+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.StarGraphGraphSONSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import java.io.*;
@@ -74,7 +68,7 @@ public final class GraphSONWriter implements GraphWriter {
*/
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v, final Direction direction) throws IOException {
- mapper.writeValue(outputStream, new StarGraphGraphSONSerializer.DirectionalStarGraph(StarGraph.of(v), direction));
+ mapper.writeValue(outputStream, new DirectionalStarGraph(StarGraph.of(v), direction));
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
index 763c1d9..ba4b056 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV1d0.java
@@ -27,19 +27,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.*;
/**
* GraphSON serializers for classes in {@code java.time.*}.
[10/50] [abbrv] tinkerpop git commit: Added the secretary email to
the committer invite template
Posted by sp...@apache.org.
Added the secretary email to the committer invite template
No one ever seems to be able to figure that part out - including the email might save them some time CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ccd2630e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ccd2630e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ccd2630e
Branch: refs/heads/TINKERPOP-1274
Commit: ccd2630edf75e1e7f1e3565a0241e7c708c4d875
Parents: ebfa785
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:17:08 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:17:08 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/administration.asciidoc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ccd2630e/docs/src/dev/developer/administration.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc
index 246cdfc..db8fa4d 100644
--- a/docs/src/dev/developer/administration.asciidoc
+++ b/docs/src/dev/developer/administration.asciidoc
@@ -53,9 +53,10 @@ reply to the private@tinkerpop.apache.org address only.
B. If you are accepting, the next step is to register an iCLA with the Apache Software Foundation:
1. Details of the iCLA and the forms are found through this link: http://www.apache.org/licenses/#clas.
- 2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF.
+ 2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF
+ at secretary@apache.org.
- 3. When you transmit the completed iCLA, request to notify the Apache TinkerPop and choose a unique Apache id.
+ 3. When you transmit the completed iCLA, request to notify Apache TinkerPop and choose a unique Apache id.
Look to see if your preferred id is already taken at http://people.apache.org/committer-index.html This will
allow the Secretary to notify the PMC when your iCLA has been recorded.
[30/50] [abbrv] tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1332
Posted by sp...@apache.org.
Merge branch 'master' into TINKERPOP-1332
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7dfd0ddc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7dfd0ddc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7dfd0ddc
Branch: refs/heads/TINKERPOP-1274
Commit: 7dfd0ddcd836aba34d2eec83bc2844cbc1d03c67
Parents: 090efe3 408755d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 21 16:44:29 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 21 16:44:29 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
bin/validate-distribution.sh | 9 +-
docs/src/dev/developer/administration.asciidoc | 5 +-
.../developer/development-environment.asciidoc | 4 +-
docs/src/dev/provider/index.asciidoc | 67 +
docs/src/recipes/centrality.asciidoc | 6 +
.../reference/implementations-hadoop.asciidoc | 70 +-
.../reference/implementations-neo4j.asciidoc | 77 +-
docs/src/reference/the-traversal.asciidoc | 3 +-
docs/static/images/neo4j-ha.png | Bin 0 -> 108249 bytes
docs/static/images/tinkerpop3.graffle | 23433 ++++++++---------
.../gremlin/process/remote/RemoteGraph.java | 20 +-
.../decoration/HaltedTraverserStrategy.java | 8 +-
.../strategy/decoration/SubgraphStrategy.java | 40 +-
.../driver/remote/DriverRemoteConnection.java | 3 +-
.../op/traversal/TraversalOpProcessor.java | 21 +-
.../process/traversal/step/map/OrderTest.java | 1 +
.../decoration/SubgraphStrategyProcessTest.java | 22 +
18 files changed, 11866 insertions(+), 11925 deletions(-)
----------------------------------------------------------------------
[42/50] [abbrv] tinkerpop git commit: Fixed GraphSONMessageSerializer
tests.
Posted by sp...@apache.org.
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 <ke...@datastax.com>
Authored: Wed Jun 29 15:00:44 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
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) {
[04/50] [abbrv] tinkerpop git commit: Fixed a bug introduced at
3f8577596dee49493a75b039bf16e2e3f8e92793
Posted by sp...@apache.org.
Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793
The bug seemed to allow a driver host to get marked as dead even when it wasn't. This manifested as problems for the RemoteGraph process tests in the 3.2.x line of code, but the problem also existed along 3.1.x generally unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30
Branch: refs/heads/TINKERPOP-1274
Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170
Parents: ec106fc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 08:54:41 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 08:54:41 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 929cc09..89a0225 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -99,7 +99,7 @@ final class ResultQueue {
// need to peek because the number of available items needs to be >= the expected size for that future. if not
// it needs to keep waiting
final Pair<CompletableFuture<List<Result>>, Integer> nextWaiting = waiting.peek();
- if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size() >= nextWaiting.getValue1() || readComplete.isDone()))) {
+ if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size() >= nextWaiting.getValue1() || readComplete.isDone()))) {
final int items = nextWaiting.getValue1();
final CompletableFuture<List<Result>> future = nextWaiting.getValue0();
final List<Result> results = new ArrayList<>(items);
[12/50] [abbrv] tinkerpop git commit: Moved hadoop-gremlin provider
documentation to the provider docs CTR
Posted by sp...@apache.org.
Moved hadoop-gremlin provider documentation to the provider docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c5d8ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c5d8ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c5d8ed
Branch: refs/heads/TINKERPOP-1274
Commit: e3c5d8ed1ca9028e35e78b9b1da6e73b8b066659
Parents: ccd2630
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 11:25:20 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 11:25:20 2016 -0400
----------------------------------------------------------------------
docs/src/dev/provider/index.asciidoc | 42 ++++++++++++++++++
.../reference/implementations-hadoop.asciidoc | 45 +-------------------
2 files changed, 43 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 2d51274..7b876a1 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -288,6 +288,48 @@ for (final MapReduce mapReduce : mapReducers) {
<2> If there is no reduce stage, the the map-stage results are inserted into Memory as specified by the application
developer's `MapReduce.addResultToMemory()` implementation.
+Hadoop-Gremlin Usage
+^^^^^^^^^^^^^^^^^^^^
+
+Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a 3rd-party graph system provider wishes to
+leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then they need to provide, at minimum, a
+Hadoop2 `InputFormat<NullWritable,VertexWritable>` for their graph system. If the provider wishes to persist computed
+results back to their graph system (and not just to HDFS via a `FileOutputFormat`), then a graph system specific
+`OutputFormat<NullWritable,VertexWritable>` must be developed as well.
+
+Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object. There is no "data" in the `HadoopGraph` as
+the `InputFormat` specifies where and how to get the graph data at OLAP (and OLTP) runtime. Thus, `HadoopGraph` is a
+small object with little overhead. Graph system providers should realize `HadoopGraph` as the gateway to the OLAP
+features offered by Hadoop-Gremlin. For example, a graph system specific `Graph.compute(Class<? extends GraphComputer>
+graphComputerClass)`-method may look as follows:
+
+[source,java]
+----
+public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) throws IllegalArgumentException {
+ try {
+ if (AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
+ return graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
+ else
+ throw Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
+ } catch (final Exception e) {
+ throw new IllegalArgumentException(e.getMessage(),e);
+ }
+}
+----
+
+Note that the configurations for Hadoop are assumed to be in the `Graph.configuration()` object. If this is not the
+case, then the `Configuration` provided to `HadoopGraph.open()` should be dynamically created within the
+`compute()`-method. It is in the provided configuration that `HadoopGraph` gets the various properties which
+determine how to read and write data to and from Hadoop. For instance, `gremlin.hadoop.graphInputFormat` and
+`gremlin.hadoop.graphOutputFormat`.
+
+IMPORTANT: A graph system provider's `OutputFormat` should implement the `PersistResultGraphAware` interface which
+determines which persistence options are available to the user. For the standard file-based `OutputFormats` provided
+by Hadoop-Gremlin (e.g. <<gryo-io-format,`GryoOutputFormat`>>, <<graphson-io-format,`GraphSONOutputFormat`>>,
+and <<script-io-format,`ScriptInputOutputFormat`>>) `ResultGraph.ORIGINAL` is not supported as the original graph
+data files are not random access and are, in essence, immutable. Thus, these file-based `OutputFormats` only support
+`ResultGraph.NEW` which creates a copy of the data specified by the `Persist` enum.
+
[[io-implementations]]
IO Implementations
^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c5d8ed/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-hadoop.asciidoc b/docs/src/reference/implementations-hadoop.asciidoc
index 8c591e2..b89c0a1 100644
--- a/docs/src/reference/implementations-hadoop.asciidoc
+++ b/docs/src/reference/implementations-hadoop.asciidoc
@@ -904,47 +904,4 @@ Vertex 4 ("josh") is isolated below:
"age":[{"id":7,"value":32}]}
}
}
-----
-
-Hadoop-Gremlin for Graph System Providers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Hadoop-Gremlin is centered around `InputFormats` and `OutputFormats`. If a 3rd-party graph system provider wishes to
-leverage Hadoop-Gremlin (and its respective `GraphComputer` engines), then they need to provide, at minimum, a
-Hadoop2 `InputFormat<NullWritable,VertexWritable>` for their graph system. If the provider wishes to persist computed
-results back to their graph system (and not just to HDFS via a `FileOutputFormat`), then a graph system specific
-`OutputFormat<NullWritable,VertexWritable>` must be developed as well.
-
-Conceptually, `HadoopGraph` is a wrapper around a `Configuration` object. There is no "data" in the `HadoopGraph` as
-the `InputFormat` specifies where and how to get the graph data at OLAP (and OLTP) runtime. Thus, `HadoopGraph` is a
-small object with little overhead. Graph system providers should realize `HadoopGraph` as the gateway to the OLAP
-features offered by Hadoop-Gremlin. For example, a graph system specific `Graph.compute(Class<? extends GraphComputer>
-graphComputerClass)`-method may look as follows:
-
-[source,java]
-----
-public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) throws IllegalArgumentException {
- try {
- if (AbstractHadoopGraphComputer.class.isAssignableFrom(graphComputerClass))
- return graphComputerClass.getConstructor(HadoopGraph.class).newInstance(this);
- else
- throw Graph.Exceptions.graphDoesNotSupportProvidedGraphComputer(graphComputerClass);
- } catch (final Exception e) {
- throw new IllegalArgumentException(e.getMessage(),e);
- }
-}
-----
-
-Note that the configurations for Hadoop are assumed to be in the `Graph.configuration()` object. If this is not the
-case, then the `Configuration` provided to `HadoopGraph.open()` should be dynamically created within the
-`compute()`-method. It is in the provided configuration that `HadoopGraph` gets the various properties which
-determine how to read and write data to and from Hadoop. For instance, `gremlin.hadoop.graphInputFormat` and
-`gremlin.hadoop.graphOutputFormat`.
-
-IMPORTANT: A graph system provider's `OutputFormat` should implement the `PersistResultGraphAware` interface which
-determines which persistence options are available to the user. For the standard file-based `OutputFormats` provided
-by Hadoop-Gremlin (e.g. <<gryo-io-format,`GryoOutputFormat`>>, <<graphson-io-format,`GraphSONOutputFormat`>>,
-and <<script-io-format,`ScriptInputOutputFormat`>>) `ResultGraph.ORIGINAL` is not supported as the original graph
-data files are not random access and are, in essence, immutable. Thus, these file-based `OutputFormats` only support
-`ResultGraph.NEW` which creates a copy of the data specified by the `Persist` enum.
-
+----
\ No newline at end of file
[38/50] [abbrv] tinkerpop git commit: TINKERPOP-1274: GraphSON 2.0.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
new file mode 100644
index 0000000..2f87c8d
--- /dev/null
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.IoTest;
+import org.apache.tinkerpop.gremlin.structure.io.Mapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+
+public class TinkerGraphGraphSONSerializerV2d0Test {
+
+ TinkerGraph baseModern = TinkerFactory.createModern();
+
+ // As of TinkerPop 3.2.1 default for GraphSON 2.0 means types enabled.
+ Mapper defaultMapperV2d0 = GraphSONMapper.build()
+ .version(GraphSONVersion.V2_0)
+ .addRegistry(TinkerIoRegistryV2d0.getInstance())
+ .create();
+
+ Mapper noTypesMapperV2d0 = GraphSONMapper.build()
+ .version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.NO_TYPES)
+ .addRegistry(TinkerIoRegistryV2d0.getInstance())
+ .create();
+
+ @Test
+ public void shouldSerializeTinkerGraphToGraphSONWithPartialTypes() throws IOException {
+ GraphWriter writer = getWriter(defaultMapperV2d0);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ assertEquals(json, "{\"id\":1,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":9,\"inV\":3,\"properties\":{\"weight\":0.4}}],\"knows\":[{\"id\":7,\"inV\":2,\"properties\":{\"weight\":0.5}},{\"id\":8,\"inV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},0],\"value\":\"marko\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},1],\"value\":29}]}}\n" +
+ "{\"id\":2,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":7,\"outV\":1,\"properties\":{\"weight\":0.5}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},2],\"value\":\"vadas\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},3],\"value\":27}]}}\n" +
+ "{\"id\":3,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":9,\"outV\":1,\"properties\":{\"weight\":0.4}},{\"id\":11,\"outV\":4,\"properties\":{\"weight\":0.4}},{\"id\":12,\"outV\":6,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},4],\"value\":\"lop\"}],\"lang\":[{\"id\":[{\"@class\":\"Long\"},5],\"value\":\"java\"}]}}\n" +
+ "{\"id\":4,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":8,\"outV\":1,\"properties\":{\"weight\":1.0}}]},\"outE\":{\"created\":[{\"id\":10,\"inV\":5,\"properties\":{\"weight\":1.0}},{\"id\":11,\"inV\":3,\"properties\":{\"weight\":0.4}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},6],\"value\":\"josh\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},7],\"value\":32}]}}\n" +
+ "{\"id\":5,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":10,\"outV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},8],\"value\":\"ripple\"}],\"lang\":[{\"id\":[{\"@class\":\"Long\"},9],\"value\":\"java\"}]}}\n" +
+ "{\"id\":6,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":12,\"inV\":3,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},10],\"value\":\"peter\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},11],\"value\":35}]}}\n");
+
+ }
+ }
+
+ @Test
+ public void shouldSerializeTinkerGraphToGraphSONWithoutTypes() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ assertEquals(json, "{\"id\":1,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":9,\"inV\":3,\"properties\":{\"weight\":0.4}}],\"knows\":[{\"id\":7,\"inV\":2,\"properties\":{\"weight\":0.5}},{\"id\":8,\"inV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":0,\"value\":\"marko\"}],\"age\":[{\"id\":1,\"value\":29}]}}\n" +
+ "{\"id\":2,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":7,\"outV\":1,\"properties\":{\"weight\":0.5}}]},\"properties\":{\"name\":[{\"id\":2,\"value\":\"vadas\"}],\"age\":[{\"id\":3,\"value\":27}]}}\n" +
+ "{\"id\":3,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":9,\"outV\":1,\"properties\":{\"weight\":0.4}},{\"id\":11,\"outV\":4,\"properties\":{\"weight\":0.4}},{\"id\":12,\"outV\":6,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":4,\"value\":\"lop\"}],\"lang\":[{\"id\":5,\"value\":\"java\"}]}}\n" +
+ "{\"id\":4,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":8,\"outV\":1,\"properties\":{\"weight\":1.0}}]},\"outE\":{\"created\":[{\"id\":10,\"inV\":5,\"properties\":{\"weight\":1.0}},{\"id\":11,\"inV\":3,\"properties\":{\"weight\":0.4}}]},\"properties\":{\"name\":[{\"id\":6,\"value\":\"josh\"}],\"age\":[{\"id\":7,\"value\":32}]}}\n" +
+ "{\"id\":5,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":10,\"outV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":8,\"value\":\"ripple\"}],\"lang\":[{\"id\":9,\"value\":\"java\"}]}}\n" +
+ "{\"id\":6,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":12,\"inV\":3,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":10,\"value\":\"peter\"}],\"age\":[{\"id\":11,\"value\":35}]}}\n");
+ }
+ }
+
+ @Test
+ public void shouldDeserializeGraphSONIntoTinkerGraphWithPartialTypes() throws IOException {
+ GraphWriter writer = getWriter(defaultMapperV2d0);
+ GraphReader reader = getReader(defaultMapperV2d0);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ IoTest.assertModernGraph(read, true, false);
+ }
+ }
+
+ @Test
+ public void shouldDeserializeGraphSONIntoTinkerGraphWithoutTypes() throws IOException {
+ GraphWriter writer = getWriter(noTypesMapperV2d0);
+ GraphReader reader = getReader(noTypesMapperV2d0);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, baseModern);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ IoTest.assertModernGraph(read, true, false);
+ }
+ }
+
+ @Test
+ public void shouldKeepTypesWhenDeserializingSerializedTinkerGraph() throws IOException {
+ TinkerGraph tg = TinkerGraph.open();
+
+ Vertex v = tg.addVertex("vertexTest");
+ UUID uuidProp = UUID.randomUUID();
+ Duration durationProp = Duration.ofHours(3);
+ Long longProp = 2L;
+ ByteBuffer byteBufferProp = ByteBuffer.wrap("testbb".getBytes());
+
+ // One Java util type natively supported by Jackson
+ v.property("uuid", uuidProp);
+ // One custom time type added by the GraphSON module
+ v.property("duration", durationProp);
+ // One Java native type not handled by JSON natively
+ v.property("long", longProp);
+ // One Java util type added by GraphSON
+ v.property("bytebuffer", byteBufferProp);
+
+ GraphWriter writer = getWriter(defaultMapperV2d0);
+ GraphReader reader = getReader(defaultMapperV2d0);
+ try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+ writer.writeGraph(out, tg);
+ String json = out.toString();
+ TinkerGraph read = TinkerGraph.open();
+ reader.readGraph(new ByteArrayInputStream(json.getBytes()), read);
+ Vertex vRead = read.traversal().V().hasLabel("vertexTest").next();
+ assertEquals(vRead.property("uuid").value(), uuidProp);
+ assertEquals(vRead.property("duration").value(), durationProp);
+ assertEquals(vRead.property("long").value(), longProp);
+ assertEquals(vRead.property("bytebuffer").value(), byteBufferProp);
+ }
+ }
+
+ private GraphWriter getWriter(Mapper paramMapper) {
+ return GraphSONWriter.build().mapper(paramMapper).create();
+ }
+
+ private GraphReader getReader(Mapper paramMapper) {
+ return GraphSONReader.build().mapper(paramMapper).create();
+ }
+}
[48/50] [abbrv] tinkerpop git commit: Parameterized some tests,
re-wrote the IO tests.
Posted by sp...@apache.org.
Parameterized some tests, re-wrote the IO tests.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a9bf7ea5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a9bf7ea5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a9bf7ea5
Branch: refs/heads/TINKERPOP-1274
Commit: a9bf7ea55acb9bee1377dcc4a7d1966602493db3
Parents: 50f70a3
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Thu Jun 30 10:29:00 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:41:35 2016 +0100
----------------------------------------------------------------------
.../GraphSONMapperEmbeddedTypeTest.java | 17 +-
.../io/graphson/GraphSONMapperTest.java | 17 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 115 ++----
.../io/graphson/GraphSONMapperV2d0Test.java | 187 ----------
.../GraphSONMessageSerializerGremlinTest.java | 349 +++++++++++++++++++
...raphSONMessageSerializerGremlinV1d0Test.java | 333 ------------------
...raphSONMessageSerializerGremlinV2d0Test.java | 333 ------------------
.../structure/IoDataGenerationTest.java | 192 +++++-----
.../TinkerGraphGraphSONSerializerV2d0Test.java | 31 --
9 files changed, 515 insertions(+), 1059 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index db16ea7..1bae35d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@ -20,6 +20,8 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -37,11 +39,24 @@ import java.time.Year;
import java.time.YearMonth;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
+import java.util.Arrays;
import static org.junit.Assert.assertEquals;
+@RunWith(Parameterized.class)
public class GraphSONMapperEmbeddedTypeTest {
- private final ObjectMapper mapper = GraphSONMapper.build().embedTypes(true).create().createMapper();
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {GraphSONMapper.build().version(GraphSONVersion.V1_0).embedTypes(true).create().createMapper()},
+ {GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()
+ .createMapper()},
+ });
+ }
+
+ @Parameterized.Parameter
+ public ObjectMapper mapper;
@Test
public void shouldHandleDuration()throws Exception {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
index 41e24c6..ea5bc7d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
@@ -21,6 +21,8 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.time.Duration;
import java.time.Instant;
@@ -35,12 +37,25 @@ import java.time.Year;
import java.time.YearMonth;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
+import java.util.Arrays;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
import static org.junit.Assert.assertEquals;
+@RunWith(Parameterized.class)
public class GraphSONMapperTest {
- private final ObjectMapper mapper = GraphSONMapper.build().embedTypes(false).create().createMapper();
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {GraphSONMapper.build().version(GraphSONVersion.V1_0).embedTypes(false).create().createMapper()},
+ {GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.NO_TYPES).create().createMapper()},
+ });
+ }
+
+ @Parameterized.Parameter
+ public ObjectMapper mapper;
+
@Test
public void shouldHandleTraversalExplanation() throws Exception {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
index 3969c46..5856bae 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
@@ -46,6 +46,7 @@ import java.util.UUID;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.fail;
/**
@@ -60,83 +61,6 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest {
.createMapper();
@Test
- public void shouldHandleDuration()throws Exception {
- final Duration o = Duration.ZERO;
- assertEquals(o, serializeDeserialize(o, Duration.class));
- }
- @Test
- public void shouldHandleInstant()throws Exception {
- final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
- assertEquals(o, serializeDeserialize(o, Instant.class));
- }
-
- @Test
- public void shouldHandleLocalDate()throws Exception {
- final LocalDate o = LocalDate.now();
- assertEquals(o, serializeDeserialize(o, LocalDate.class));
- }
-
- @Test
- public void shouldHandleLocalDateTime()throws Exception {
- final LocalDateTime o = LocalDateTime.now();
- assertEquals(o, serializeDeserialize(o, LocalDateTime.class));
- }
-
- @Test
- public void shouldHandleLocalTime()throws Exception {
- final LocalTime o = LocalTime.now();
- assertEquals(o, serializeDeserialize(o, LocalTime.class));
- }
-
- @Test
- public void shouldHandleMonthDay()throws Exception {
- final MonthDay o = MonthDay.now();
- assertEquals(o, serializeDeserialize(o, MonthDay.class));
- }
-
- @Test
- public void shouldHandleOffsetDateTime()throws Exception {
- final OffsetDateTime o = OffsetDateTime.now();
- assertEquals(o, serializeDeserialize(o, OffsetDateTime.class));
- }
-
- @Test
- public void shouldHandleOffsetTime()throws Exception {
- final OffsetTime o = OffsetTime.now();
- assertEquals(o, serializeDeserialize(o, OffsetTime.class));
- }
-
- @Test
- public void shouldHandlePeriod()throws Exception {
- final Period o = Period.ofDays(3);
- assertEquals(o, serializeDeserialize(o, Period.class));
- }
-
- @Test
- public void shouldHandleYear()throws Exception {
- final Year o = Year.now();
- assertEquals(o, serializeDeserialize(o, Year.class));
- }
-
- @Test
- public void shouldHandleYearMonth()throws Exception {
- final YearMonth o = YearMonth.now();
- assertEquals(o, serializeDeserialize(o, YearMonth.class));
- }
-
- @Test
- public void shouldHandleZonedDateTime()throws Exception {
- final ZonedDateTime o = ZonedDateTime.now();
- assertEquals(o, serializeDeserialize(o, ZonedDateTime.class));
- }
-
- @Test
- public void shouldHandleZonedOffset()throws Exception {
- final ZoneOffset o = ZonedDateTime.now().getOffset();
- assertEquals(o, serializeDeserialize(o, ZoneOffset.class));
- }
-
- @Test
public void shouldHandleDurationAuto() throws Exception {
final Duration o = Duration.ZERO;
assertEquals(o, serializeDeserializeAuto(o));
@@ -216,6 +140,7 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest {
@Test
public void shouldSerializeDeserializeNestedCollectionsAndMapAndTypedValuesCorrectly() throws Exception {
+ // Trying to fail the TypeDeserializer type detection
UUID uuid = UUID.randomUUID();
List myList = new ArrayList<>();
@@ -263,6 +188,42 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest {
assertEquals(funObject.getClass(), serializeDeserialize(funObject, FunObject.class).getClass());
}
+ @Test
+ public void shouldLooseTypesInfoWithGraphSONNoType() throws Exception {
+ ObjectMapper mapper = GraphSONMapper.build()
+ .version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.NO_TYPES)
+ .create()
+ .createMapper();
+
+ UUID uuid = UUID.randomUUID();
+ List myList = new ArrayList<>();
+
+ List myList2 = new ArrayList<>();
+ myList2.add(UUID.randomUUID());
+ myList2.add(33L);
+ myList2.add(84);
+ Map map2 = new HashMap<>();
+ map2.put("eheh", UUID.randomUUID());
+ map2.put("normal", "normal");
+ myList2.add(map2);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("hello", "world");
+ map1.put("test", uuid);
+ map1.put("hehe", myList2);
+ myList.add(map1);
+
+ myList.add("kjkj");
+ myList.add(UUID.randomUUID());
+
+ String json = mapper.writeValueAsString(myList);
+ Object read = mapper.readValue(json, Object.class);
+
+ // Not equals because of type loss
+ assertNotEquals(myList, read);
+ }
+
// Class needs to be defined as statics as it's a nested class.
public static class FunObject {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
deleted file mode 100644
index e6a5b6f..0000000
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0Test.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.io.graphson;
-
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation;
-import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
-import org.junit.Test;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.MonthDay;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.Period;
-import java.time.Year;
-import java.time.YearMonth;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.__;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-/**
- * Tests non-typed serialization/deserialization for GraphSON 2.0.
- */
-
-public class GraphSONMapperV2d0Test {
- private final ObjectMapper mapper = GraphSONMapper.build()
- .version(GraphSONVersion.V2_0)
- .typeInfo(GraphSONMapper.TypeInfo.NO_TYPES)
- .create()
- .createMapper();
-
- @Test
- public void shouldHandleTraversalExplanation() throws Exception {
- final TraversalExplanation te = __().out().outV().outE().explain();
- final String json = mapper.writeValueAsString(te);
- assertEquals("{\"original\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"],\"intermediate\":[],\"final\":[\"InjectStep([])\",\"VertexStep(OUT,vertex)\",\"EdgeVertexStep(OUT)\",\"VertexStep(OUT,edge)\"]}", json);
- }
-
- @Test
- public void shouldHandleDuration() throws Exception {
- final Duration o = Duration.ZERO;
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleInstant() throws Exception {
- final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleLocalDate() throws Exception {
- final LocalDate o = LocalDate.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleLocalDateTime() throws Exception {
- final LocalDateTime o = LocalDateTime.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleLocalTime() throws Exception {
- final LocalTime o = LocalTime.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleMonthDay() throws Exception {
- final MonthDay o = MonthDay.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleOffsetDateTime() throws Exception {
- final OffsetDateTime o = OffsetDateTime.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleOffsetTime() throws Exception {
- final OffsetTime o = OffsetTime.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandlePeriod() throws Exception {
- final Period o = Period.ofDays(3);
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleYear() throws Exception {
- final Year o = Year.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleYearMonth() throws Exception {
- final YearMonth o = YearMonth.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleZonedDateTime() throws Exception {
- final ZonedDateTime o = ZonedDateTime.now();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldHandleZoneOffset() throws Exception {
- final ZoneOffset o = ZonedDateTime.now().getOffset();
- final String json = mapper.writeValueAsString(o);
- assertEquals("\"" + o.toString() + "\"", json);
- }
-
- @Test
- public void shouldSerializeDeserializeNestedCollectionsAndMapAndTypedCollectionsCorrectly() throws Exception {
- UUID uuid = UUID.randomUUID();
- List myList = new ArrayList<>();
-
- List myList2 = new ArrayList<>();
- myList2.add(UUID.randomUUID());
- myList2.add(33L);
- myList2.add(84);
- Map map2 = new HashMap<>();
- map2.put("eheh", UUID.randomUUID());
- map2.put("normal", "normal");
- myList2.add(map2);
-
- Map<String, Object> map1 = new HashMap<>();
- map1.put("hello", "world");
- map1.put("test", uuid);
- map1.put("hehe", myList2);
- myList.add(map1);
-
- myList.add("kjkj");
- myList.add(UUID.randomUUID());
-
- String json = mapper.writeValueAsString(myList);
- Object read = mapper.readValue(json, Object.class);
-
- // Not equals because of type loss
- assertNotEquals(myList, read);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinTest.java
new file mode 100644
index 0000000..ad69ae4
--- /dev/null
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinTest.java
@@ -0,0 +1,349 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.driver.ser;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.UnpooledByteBufAllocator;
+import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+/**
+ * Serializer tests that cover non-lossy serialization/deserialization methods.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@RunWith(Parameterized.class)
+public class GraphSONMessageSerializerGremlinTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Iterable<Object[]> data() {
+ return Arrays.asList(new Object[][]{
+ {new GraphSONMessageSerializerGremlinV1d0()},
+ {new GraphSONMessageSerializerGremlinV2d0()},
+ });
+ }
+
+ private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
+ private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
+ private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
+
+ @Parameterized.Parameter
+ public MessageSerializer serializer;
+
+ @Test
+ public void shouldSerializeIterable() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(2, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertEquals(new Integer(100), deserializedFunList.get(1));
+ }
+
+ @Test
+ public void shouldSerializeIterableWithNull() throws Exception {
+ final ArrayList<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(null);
+ list.add(100);
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
+ assertEquals(3, deserializedFunList.size());
+ assertEquals(new Integer(1), deserializedFunList.get(0));
+ assertNull(deserializedFunList.get(1));
+ assertEquals(new Integer(100), deserializedFunList.get(2));
+ }
+
+ @Test
+ public void shouldSerializeMap() throws Exception {
+ final Map<String, Object> map = new HashMap<>();
+ final Map<String, String> innerMap = new HashMap<>();
+ innerMap.put("a", "b");
+
+ map.put("x", 1);
+ map.put("y", "some");
+ map.put("z", innerMap);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
+ assertEquals(3, deserializedMap.size());
+ assertEquals(1, deserializedMap.get("x"));
+ assertEquals("some", deserializedMap.get("y"));
+
+ final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
+ assertEquals(1, deserializedInnerMap.size());
+ assertEquals("b", deserializedInnerMap.get("a"));
+ }
+
+ @Test
+ public void shouldSerializeMapEntries() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Date d = new Date();
+
+ final Map<Object, Object> map = new HashMap<>();
+ map.put("x", 1);
+ map.put(v1, 100);
+ map.put(d, "test");
+
+ final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
+ assertCommon(response);
+
+ final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(3, deserializedEntries.size());
+ deserializedEntries.forEach(e -> {
+ if (e.containsKey("x"))
+ assertEquals(1, e.get("x"));
+ else if (e.containsKey(v1.id().toString()))
+ assertEquals(100, e.get(v1.id().toString()));
+ else if (e.containsKey(StdDateFormat.instance.format(d)))
+ assertEquals("test", e.get(StdDateFormat.instance.format(d)));
+ else
+ fail("Map entries contains a key that is not part of what was serialized");
+ });
+ }
+
+ @Test
+ public void shouldSerializeEdge() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
+
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, edgeList.size());
+
+ final Map<String, Object> deserializedEdge = edgeList.get(0);
+ assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
+ assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
+ assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
+ assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
+ assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
+ assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
+ assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
+
+ final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
+ assertNotNull(properties);
+ assertEquals(123, properties.get("abc"));
+
+ }
+
+ @Test
+ public void shouldSerializeEdgeProperty() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v1 = graph.addVertex();
+ final Vertex v2 = graph.addVertex();
+ final Edge e = v1.addEdge("test", v2);
+ e.property("abc", 123);
+
+ final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
+ final ResponseMessage response = convert(iterable);
+ assertCommon(response);
+
+ final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, propertyList.size());
+ assertEquals(123, propertyList.get(0).get("value"));
+ }
+
+ @Test
+ public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
+ final Graph graph = TinkerGraph.open();
+ final Vertex v = graph.addVertex();
+ final Map<String, Object> map = new HashMap<>();
+ map.put("x", 500);
+ map.put("y", "some");
+
+ final ArrayList<Object> friends = new ArrayList<>();
+ friends.add("x");
+ friends.add(5);
+ friends.add(map);
+
+ v.property(VertexProperty.Cardinality.single, "friends", friends);
+
+ final List list = IteratorUtils.list(graph.vertices());
+
+ final ResponseMessage response = convert(list);
+ assertCommon(response);
+
+ final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
+ assertEquals(1, vertexList.size());
+
+ final Map<String, Object> deserializedVertex = vertexList.get(0);
+ 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 List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
+ assertEquals(1, friendsProperties.size());
+
+ final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
+ assertEquals(3, deserializedInnerList.size());
+ assertEquals("x", deserializedInnerList.get(0));
+ assertEquals(5, deserializedInnerList.get(1));
+
+ final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
+ assertEquals(2, deserializedInnerInnerMap.size());
+ assertEquals(500, deserializedInnerInnerMap.get("x"));
+ assertEquals("some", deserializedInnerInnerMap.get("y"));
+ }
+
+ @Test
+ public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map<Vertex, Integer> map = new HashMap<>();
+ map.put(g.V().has("name", "marko").next(), 1000);
+
+ final ResponseMessage response = convert(map);
+ assertCommon(response);
+
+ final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
+ assertEquals(1, deserializedMap.size());
+
+ // with no embedded types the key (which is a vertex) simply serializes out to an id
+ // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
+ assertEquals(new Integer(1000), deserializedMap.get("1"));
+ }
+
+ @Test
+ public void shouldSerializeToJsonTree() throws Exception {
+ final TinkerGraph graph = TinkerFactory.createClassic();
+ final GraphTraversalSource g = graph.traversal();
+ final Map t = g.V(1).out().properties("name").tree().next();
+
+ final ResponseMessage response = convert(t);
+ assertCommon(response);
+
+ final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
+
+ assertEquals(1, deserializedMap.size());
+
+ //check the first object and it's properties
+ Map<String,Object> vertex = deserializedMap.get("1").get("key");
+ Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
+ assertEquals(1, (int)vertex.get("id"));
+ assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
+
+ //check objects tree structure
+ //check Vertex property
+ Map<String, Map<String, Map>> subTreeMap = deserializedMap.get("1").get("value");
+ Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
+ Map<String, String> vertexPropertiesDeep = subTreeMap2.get("3").get("key");
+ assertEquals("vadas", vertexPropertiesDeep.get("value"));
+ assertEquals("name", vertexPropertiesDeep.get("label"));
+
+ // check subitem
+ Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
+ Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
+
+ assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
+ }
+
+ @Test
+ public void shouldSerializeFullResponseMessage() throws Exception {
+ final UUID id = UUID.randomUUID();
+
+ final Map<String, Object> metaData = new HashMap<>();
+ metaData.put("test", "this");
+ metaData.put("one", 1);
+
+ final Map<String, Object> attributes = new HashMap<>();
+ attributes.put("test", "that");
+ attributes.put("two", 2);
+
+ final ResponseMessage response = ResponseMessage.build(id)
+ .responseMetaData(metaData)
+ .code(ResponseStatusCode.SUCCESS)
+ .result("some-result")
+ .statusAttributes(attributes)
+ .statusMessage("worked")
+ .create();
+
+ final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
+ final ResponseMessage deserialized = serializer.deserializeResponse(bb);
+
+ assertEquals(id, deserialized.getRequestId());
+ assertEquals("this", deserialized.getResult().getMeta().get("test"));
+ assertEquals(1, deserialized.getResult().getMeta().get("one"));
+ assertEquals("some-result", deserialized.getResult().getData());
+ assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
+ assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
+ assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
+ assertEquals("worked", deserialized.getStatus().getMessage());
+ }
+
+ private void assertCommon(final ResponseMessage response) {
+ assertEquals(requestId, response.getRequestId());
+ assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
+ }
+
+ private ResponseMessage convert(final Object toSerialize) throws SerializationException {
+ final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
+ return serializer.deserializeResponse(bb);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
deleted file mode 100644
index c47b7b6..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0Test.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerGremlinV1d0Test {
- private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public MessageSerializer serializer = new GraphSONMessageSerializerGremlinV1d0();
-
- @Test
- public void shouldSerializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertEquals(new Integer(100), deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(new Integer(100), deserializedFunList.get(2));
- }
-
- @Test
- public void shouldSerializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void shouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
- assertCommon(response);
-
- final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(3, deserializedEntries.size());
- deserializedEntries.forEach(e -> {
- if (e.containsKey("x"))
- assertEquals(1, e.get("x"));
- else if (e.containsKey(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()));
- else if (e.containsKey(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)));
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final Map<String, Object> deserializedEdge = edgeList.get(0);
- assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
- assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
- assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
- assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
- assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
- assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
- assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
-
- final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(123, properties.get("abc"));
-
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, propertyList.size());
- assertEquals(123, propertyList.get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v = graph.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final List list = IteratorUtils.list(graph.vertices());
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final Map<String, Object> deserializedVertex = vertexList.get(0);
- 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 List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
- assertEquals(1, friendsProperties.size());
-
- final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(new Integer(1000), deserializedMap.get("1"));
- }
-
- @Test
- public void shouldSerializeToJsonTree() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map t = g.V(1).out().properties("name").tree().next();
-
- final ResponseMessage response = convert(t);
- assertCommon(response);
-
- final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
-
- assertEquals(1, deserializedMap.size());
-
- //check the first object and it's properties
- Map<String,Object> vertex = deserializedMap.get("1").get("key");
- Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
- assertEquals(1, (int)vertex.get("id"));
- assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
-
- //check objects tree structure
- //check Vertex property
- Map<String, Map<String, Map>> subTreeMap = deserializedMap.get("1").get("value");
- Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
- Map<String, String> vertexPropertiesDeep = subTreeMap2.get("3").get("key");
- assertEquals("vadas", vertexPropertiesDeep.get("value"));
- assertEquals("name", vertexPropertiesDeep.get("label"));
-
- // check subitem
- Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
- Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
-
- assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convert(final Object toSerialize) throws SerializationException {
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
deleted file mode 100644
index 2708e7b..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.driver.ser;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.UnpooledByteBufAllocator;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.databind.util.StdDateFormat;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-/**
- * Serializer tests that cover non-lossy serialization/deserialization methods for GraphSONMessage.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class GraphSONMessageSerializerGremlinV2d0Test {
- private UUID requestId = UUID.fromString("6457272A-4018-4538-B9AE-08DD5DDC0AA1");
- private ResponseMessage.Builder responseMessageBuilder = ResponseMessage.build(requestId);
- private static ByteBufAllocator allocator = UnpooledByteBufAllocator.DEFAULT;
-
- public MessageSerializer serializer = new GraphSONMessageSerializerGremlinV2d0();
-
- @Test
- public void shouldSerializeIterable() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(2, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertEquals(new Integer(100), deserializedFunList.get(1));
- }
-
- @Test
- public void shouldSerializeIterableWithNull() throws Exception {
- final ArrayList<Integer> list = new ArrayList<>();
- list.add(1);
- list.add(null);
- list.add(100);
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Integer> deserializedFunList = (List<Integer>) response.getResult().getData();
- assertEquals(3, deserializedFunList.size());
- assertEquals(new Integer(1), deserializedFunList.get(0));
- assertNull(deserializedFunList.get(1));
- assertEquals(new Integer(100), deserializedFunList.get(2));
- }
-
- @Test
- public void shouldSerializeMap() throws Exception {
- final Map<String, Object> map = new HashMap<>();
- final Map<String, String> innerMap = new HashMap<>();
- innerMap.put("a", "b");
-
- map.put("x", 1);
- map.put("y", "some");
- map.put("z", innerMap);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
- assertEquals(1, deserializedMap.get("x"));
- assertEquals("some", deserializedMap.get("y"));
-
- final Map<String, String> deserializedInnerMap = (Map<String, String>) deserializedMap.get("z");
- assertEquals(1, deserializedInnerMap.size());
- assertEquals("b", deserializedInnerMap.get("a"));
- }
-
- @Test
- public void shouldSerializeMapEntries() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Date d = new Date();
-
- final Map<Object, Object> map = new HashMap<>();
- map.put("x", 1);
- map.put(v1, 100);
- map.put(d, "test");
-
- final ResponseMessage response = convert(IteratorUtils.asList(map.entrySet()));
- assertCommon(response);
-
- final List<Map<String, Object>> deserializedEntries = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(3, deserializedEntries.size());
- deserializedEntries.forEach(e -> {
- if (e.containsKey("x"))
- assertEquals(1, e.get("x"));
- else if (e.containsKey(v1.id().toString()))
- assertEquals(100, e.get(v1.id().toString()));
- else if (e.containsKey(StdDateFormat.instance.format(d)))
- assertEquals("test", e.get(StdDateFormat.instance.format(d)));
- else
- fail("Map entries contains a key that is not part of what was serialized");
- });
- }
-
- @Test
- public void shouldSerializeEdge() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Edge> iterable = IteratorUtils.list(graph.edges());
-
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> edgeList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, edgeList.size());
-
- final Map<String, Object> deserializedEdge = edgeList.get(0);
- assertEquals(e.id(), deserializedEdge.get(GraphSONTokens.ID));
- assertEquals(v1.id(), deserializedEdge.get(GraphSONTokens.OUT));
- assertEquals(v2.id(), deserializedEdge.get(GraphSONTokens.IN));
- assertEquals(v1.label(), deserializedEdge.get(GraphSONTokens.OUT_LABEL));
- assertEquals(v2.label(), deserializedEdge.get(GraphSONTokens.IN_LABEL));
- assertEquals(e.label(), deserializedEdge.get(GraphSONTokens.LABEL));
- assertEquals(GraphSONTokens.EDGE, deserializedEdge.get(GraphSONTokens.TYPE));
-
- final Map<String, Object> properties = (Map<String, Object>) deserializedEdge.get(GraphSONTokens.PROPERTIES);
- assertNotNull(properties);
- assertEquals(123, properties.get("abc"));
-
- }
-
- @Test
- public void shouldSerializeEdgeProperty() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v1 = graph.addVertex();
- final Vertex v2 = graph.addVertex();
- final Edge e = v1.addEdge("test", v2);
- e.property("abc", 123);
-
- final Iterable<Property<Object>> iterable = IteratorUtils.list(e.properties("abc"));
- final ResponseMessage response = convert(iterable);
- assertCommon(response);
-
- final List<Map<String, Object>> propertyList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, propertyList.size());
- assertEquals(123, propertyList.get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeVertexWithEmbeddedMap() throws Exception {
- final Graph graph = TinkerGraph.open();
- final Vertex v = graph.addVertex();
- final Map<String, Object> map = new HashMap<>();
- map.put("x", 500);
- map.put("y", "some");
-
- final ArrayList<Object> friends = new ArrayList<>();
- friends.add("x");
- friends.add(5);
- friends.add(map);
-
- v.property(VertexProperty.Cardinality.single, "friends", friends);
-
- final List list = IteratorUtils.list(graph.vertices());
-
- final ResponseMessage response = convert(list);
- assertCommon(response);
-
- final List<Map<String, Object>> vertexList = (List<Map<String, Object>>) response.getResult().getData();
- assertEquals(1, vertexList.size());
-
- final Map<String, Object> deserializedVertex = vertexList.get(0);
- 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 List<Map<String,Object>> friendsProperties = (List<Map<String,Object>>) properties.get("friends");
- assertEquals(1, friendsProperties.size());
-
- final List<Object> deserializedInnerList = (List<Object>) friendsProperties.get(0).get(GraphSONTokens.VALUE);
- assertEquals(3, deserializedInnerList.size());
- assertEquals("x", deserializedInnerList.get(0));
- assertEquals(5, deserializedInnerList.get(1));
-
- final Map<String, Object> deserializedInnerInnerMap = (Map<String, Object>) deserializedInnerList.get(2);
- assertEquals(2, deserializedInnerInnerMap.size());
- assertEquals(500, deserializedInnerInnerMap.get("x"));
- assertEquals("some", deserializedInnerInnerMap.get("y"));
- }
-
- @Test
- public void shouldSerializeToJsonMapWithElementForKey() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map<Vertex, Integer> map = new HashMap<>();
- map.put(g.V().has("name", "marko").next(), 1000);
-
- final ResponseMessage response = convert(map);
- assertCommon(response);
-
- final Map<String, Integer> deserializedMap = (Map<String, Integer>) response.getResult().getData();
- assertEquals(1, deserializedMap.size());
-
- // with no embedded types the key (which is a vertex) simply serializes out to an id
- // {"result":{"1":1000},"code":200,"requestId":"2d62161b-9544-4f39-af44-62ec49f9a595","type":0}
- assertEquals(new Integer(1000), deserializedMap.get("1"));
- }
-
- @Test
- public void shouldSerializeToJsonTree() throws Exception {
- final TinkerGraph graph = TinkerFactory.createClassic();
- final GraphTraversalSource g = graph.traversal();
- final Map t = g.V(1).out().properties("name").tree().next();
-
- final ResponseMessage response = convert(t);
- assertCommon(response);
-
- final Map<String, Map<String, Map>> deserializedMap = (Map<String, Map<String, Map>>) response.getResult().getData();
-
- assertEquals(1, deserializedMap.size());
-
- //check the first object and it's properties
- Map<String,Object> vertex = deserializedMap.get("1").get("key");
- Map<String,List<Map>> vertexProperties = (Map<String, List<Map>>)vertex.get("properties");
- assertEquals(1, (int)vertex.get("id"));
- assertEquals("marko", vertexProperties.get("name").get(0).get("value"));
-
- //check objects tree structure
- //check Vertex property
- Map<String, Map<String, Map>> subTreeMap = deserializedMap.get("1").get("value");
- Map<String, Map<String, Map>> subTreeMap2 = subTreeMap.get("2").get("value");
- Map<String, String> vertexPropertiesDeep = subTreeMap2.get("3").get("key");
- assertEquals("vadas", vertexPropertiesDeep.get("value"));
- assertEquals("name", vertexPropertiesDeep.get("label"));
-
- // check subitem
- Map<String,Object> vertex2 = subTreeMap.get("3").get("key");
- Map<String,List<Map>> vertexProperties2 = (Map<String, List<Map>>)vertex2.get("properties");
-
- assertEquals("lop", vertexProperties2.get("name").get(0).get("value"));
- }
-
- @Test
- public void shouldSerializeFullResponseMessage() throws Exception {
- final UUID id = UUID.randomUUID();
-
- final Map<String, Object> metaData = new HashMap<>();
- metaData.put("test", "this");
- metaData.put("one", 1);
-
- final Map<String, Object> attributes = new HashMap<>();
- attributes.put("test", "that");
- attributes.put("two", 2);
-
- final ResponseMessage response = ResponseMessage.build(id)
- .responseMetaData(metaData)
- .code(ResponseStatusCode.SUCCESS)
- .result("some-result")
- .statusAttributes(attributes)
- .statusMessage("worked")
- .create();
-
- final ByteBuf bb = serializer.serializeResponseAsBinary(response, allocator);
- final ResponseMessage deserialized = serializer.deserializeResponse(bb);
-
- assertEquals(id, deserialized.getRequestId());
- assertEquals("this", deserialized.getResult().getMeta().get("test"));
- assertEquals(1, deserialized.getResult().getMeta().get("one"));
- assertEquals("some-result", deserialized.getResult().getData());
- assertEquals("that", deserialized.getStatus().getAttributes().get("test"));
- assertEquals(2, deserialized.getStatus().getAttributes().get("two"));
- assertEquals(ResponseStatusCode.SUCCESS.getValue(), deserialized.getStatus().getCode().getValue());
- assertEquals("worked", deserialized.getStatus().getMessage());
- }
-
- private void assertCommon(final ResponseMessage response) {
- assertEquals(requestId, response.getRequestId());
- assertEquals(ResponseStatusCode.SUCCESS, response.getStatus().getCode());
- }
-
- private ResponseMessage convert(final Object toSerialize) throws SerializationException {
- final ByteBuf bb = serializer.serializeResponseAsBinary(responseMessageBuilder.result(toSerialize).create(), allocator);
- return serializer.deserializeResponse(bb);
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index 71a086c..46d787a 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -25,14 +25,11 @@ import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
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.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
@@ -41,16 +38,12 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Iterator;
import java.util.stream.IntStream;
-import static org.junit.Assert.assertEquals;
-
/**
* Less of a test of functionality and more of a tool to help generate data files for TinkerPop.
*
@@ -181,29 +174,95 @@ public class IoDataGenerationTest {
os.close();
}
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
@Test
- public void shouldWriteAndReadClassicGraphAsGraphSONV2d0WithTypes() throws IOException {
- Graph g = TinkerFactory.createClassic();
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-V2d0-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create())
- .create().writeGraph(os, g);
+ public void shouldWriteModernGraphAsGraphSONWithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ .create().writeGraph(os, TinkerFactory.createModern());
os.close();
+ }
- Graph readG = TinkerGraph.open();
- final InputStream is = new FileInputStream(tempPath + "tinkerpop-classic-V2d0-typed.json");
- GraphSONReader.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().readGraph(is, readG);
- is.close();
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteCrewGraphAsGraphSONWithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ .create().writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
- assertEquals(approximateGraphsCheck(g, readG), true);
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphAsGraphSONV2d0NoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v2d0.json");
+ GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createClassic());
+ os.close();
}
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphAsGraphSOV2d0NNoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v2d0.json");
+ GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
/**
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteModernGraphAsGraphSONWithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed.json");
+ public void shouldWriteCrewGraphAsGraphSONV2d0NoTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v2d0.json");
+ GraphSONWriter.build().create().writeGraph(os, TinkerFactory.createTheCrew());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphNormalizedAsGraphSONV2d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-normalized-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).create()).create().writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphNormalizedAsGraphSONV2d0() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-normalized-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().normalize(true).create()).create().writeGraph(os, TinkerFactory.createModern());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteClassicGraphAsGraphSONV2d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-v2d0-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ .create().writeGraph(os, TinkerFactory.createClassic());
+ os.close();
+ }
+
+ /**
+ * No assertions. Just write out the graph for convenience.
+ */
+ @Test
+ public void shouldWriteModernGraphAsGraphSONV2d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-v2d0-typed.json");
GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
.create().writeGraph(os, TinkerFactory.createModern());
os.close();
@@ -213,8 +272,8 @@ public class IoDataGenerationTest {
* No assertions. Just write out the graph for convenience.
*/
@Test
- public void shouldWriteCrewGraphAsGraphSONWithTypes() throws IOException {
- final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed.json");
+ public void shouldWriteCrewGraphAsGraphSONV2d0WithTypes() throws IOException {
+ final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-v2d0-typed.json");
GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
.create().writeGraph(os, TinkerFactory.createTheCrew());
os.close();
@@ -292,86 +351,27 @@ public class IoDataGenerationTest {
GraphSONWriter.build().mapper(GraphSONMapper.build().create()).create().writeGraph(os2, g);
os2.close();
- final OutputStream os3 = new FileOutputStream(tempPath + "grateful-dead.xml");
- GraphMLWriter.build().create().writeGraph(os3, g);
+ final OutputStream os3 = new FileOutputStream(tempPath + "grateful-dead-v2d0.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.NO_TYPES).create())
+ .create()
+ .writeGraph(os3, g);
os3.close();
- final OutputStream os4 = new FileOutputStream(tempPath + "grateful-dead-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create()).create().writeGraph(os4, g);
+ final OutputStream os4 = new FileOutputStream(tempPath + "grateful-dead.xml");
+ GraphMLWriter.build().create().writeGraph(os4, g);
os4.close();
- }
- @Test
- public void shouldWriteGratefulDeadGraphSONV2d0() throws IOException {
- final TinkerGraph g = TinkerGraph.open();
- final TinkerGraph readG = TinkerGraph.open();
+ final OutputStream os5 = new FileOutputStream(tempPath + "grateful-dead-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create()).create().writeGraph(os5, g);
+ os5.close();
- final GraphReader reader = GryoReader.build().create();
- try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo")) {
- reader.readGraph(stream, g);
- }
- final OutputStream os2 = new FileOutputStream(tempPath + "grateful-dead-V2d0-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os2, g);
- os2.close();
-
- final InputStream is = new FileInputStream(tempPath + "grateful-dead-V2d0-typed.json");
- GraphSONReader.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0).typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create()).create().readGraph(is, readG);
- is.close();
-
- assertEquals(approximateGraphsCheck(g, readG), true);
- }
-
- /**
- * Checks sequentially vertices and egdes of both graphs. Will check sequentially Vertex IDs, Vertex Properties IDs
- * and values and classes. Then same for edges. To use when serializing a Graph and deserializing the supposedly
- * same Graph.
- */
- private boolean approximateGraphsCheck(Graph g1, Graph g2) {
- Iterator<Vertex> itV = g1.vertices();
- Iterator<Vertex> itVRead = g2.vertices();
-
- while (itV.hasNext()) {
- Vertex v = itV.next();
- Vertex vRead = itVRead.next();
- // Will only check IDs but that's 'good' enough.
- if (!v.equals(vRead)) {
- return false;
- }
-
- Iterator itVP = v.properties();
- Iterator itVPRead = vRead.properties();
- while (itVP.hasNext()) {
- VertexProperty vp = (VertexProperty) itVP.next();
- VertexProperty vpRead = (VertexProperty) itVPRead.next();
- if (!vp.value().equals(vpRead.value())) {
- return false;
- }
- }
- }
+ final OutputStream os6 = new FileOutputStream(tempPath + "grateful-dead-v2d0-typed.json");
+ GraphSONWriter.build().mapper(GraphSONMapper.build().version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES).create())
+ .create()
+ .writeGraph(os6, g);
+ os6.close();
-
- Iterator<Edge> itE = g1.edges();
- Iterator<Edge> itERead = g2.edges();
-
- while (itE.hasNext()) {
- Edge e = itE.next();
- Edge eRead = itERead.next();
- // Will only check IDs but that's good enough.
- if (!e.equals(eRead)) {
- return false;
- }
-
- Iterator itEP = e.properties();
- Iterator itEPRead = eRead.properties();
- while (itEP.hasNext()) {
- Property ep = (Property) itEP.next();
- Property epRead = (Property) itEPRead.next();
- if (!ep.value().equals(epRead.value())
- || !ep.equals(epRead)) {
- return false;
- }
- }
- }
- return true;
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9bf7ea5/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
index 2f87c8d..a4c03cb 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphGraphSONSerializerV2d0Test.java
@@ -56,37 +56,6 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
.create();
@Test
- public void shouldSerializeTinkerGraphToGraphSONWithPartialTypes() throws IOException {
- GraphWriter writer = getWriter(defaultMapperV2d0);
- try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
- writer.writeGraph(out, baseModern);
- String json = out.toString();
- assertEquals(json, "{\"id\":1,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":9,\"inV\":3,\"properties\":{\"weight\":0.4}}],\"knows\":[{\"id\":7,\"inV\":2,\"properties\":{\"weight\":0.5}},{\"id\":8,\"inV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},0],\"value\":\"marko\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},1],\"value\":29}]}}\n" +
- "{\"id\":2,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":7,\"outV\":1,\"properties\":{\"weight\":0.5}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},2],\"value\":\"vadas\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},3],\"value\":27}]}}\n" +
- "{\"id\":3,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":9,\"outV\":1,\"properties\":{\"weight\":0.4}},{\"id\":11,\"outV\":4,\"properties\":{\"weight\":0.4}},{\"id\":12,\"outV\":6,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},4],\"value\":\"lop\"}],\"lang\":[{\"id\":[{\"@class\":\"Long\"},5],\"value\":\"java\"}]}}\n" +
- "{\"id\":4,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":8,\"outV\":1,\"properties\":{\"weight\":1.0}}]},\"outE\":{\"created\":[{\"id\":10,\"inV\":5,\"properties\":{\"weight\":1.0}},{\"id\":11,\"inV\":3,\"properties\":{\"weight\":0.4}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},6],\"value\":\"josh\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},7],\"value\":32}]}}\n" +
- "{\"id\":5,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":10,\"outV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},8],\"value\":\"ripple\"}],\"lang\":[{\"id\":[{\"@class\":\"Long\"},9],\"value\":\"java\"}]}}\n" +
- "{\"id\":6,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":12,\"inV\":3,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":[{\"@class\":\"Long\"},10],\"value\":\"peter\"}],\"age\":[{\"id\":[{\"@class\":\"Long\"},11],\"value\":35}]}}\n");
-
- }
- }
-
- @Test
- public void shouldSerializeTinkerGraphToGraphSONWithoutTypes() throws IOException {
- GraphWriter writer = getWriter(noTypesMapperV2d0);
- try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
- writer.writeGraph(out, baseModern);
- String json = out.toString();
- assertEquals(json, "{\"id\":1,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":9,\"inV\":3,\"properties\":{\"weight\":0.4}}],\"knows\":[{\"id\":7,\"inV\":2,\"properties\":{\"weight\":0.5}},{\"id\":8,\"inV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":0,\"value\":\"marko\"}],\"age\":[{\"id\":1,\"value\":29}]}}\n" +
- "{\"id\":2,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":7,\"outV\":1,\"properties\":{\"weight\":0.5}}]},\"properties\":{\"name\":[{\"id\":2,\"value\":\"vadas\"}],\"age\":[{\"id\":3,\"value\":27}]}}\n" +
- "{\"id\":3,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":9,\"outV\":1,\"properties\":{\"weight\":0.4}},{\"id\":11,\"outV\":4,\"properties\":{\"weight\":0.4}},{\"id\":12,\"outV\":6,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":4,\"value\":\"lop\"}],\"lang\":[{\"id\":5,\"value\":\"java\"}]}}\n" +
- "{\"id\":4,\"label\":\"person\",\"inE\":{\"knows\":[{\"id\":8,\"outV\":1,\"properties\":{\"weight\":1.0}}]},\"outE\":{\"created\":[{\"id\":10,\"inV\":5,\"properties\":{\"weight\":1.0}},{\"id\":11,\"inV\":3,\"properties\":{\"weight\":0.4}}]},\"properties\":{\"name\":[{\"id\":6,\"value\":\"josh\"}],\"age\":[{\"id\":7,\"value\":32}]}}\n" +
- "{\"id\":5,\"label\":\"software\",\"inE\":{\"created\":[{\"id\":10,\"outV\":4,\"properties\":{\"weight\":1.0}}]},\"properties\":{\"name\":[{\"id\":8,\"value\":\"ripple\"}],\"lang\":[{\"id\":9,\"value\":\"java\"}]}}\n" +
- "{\"id\":6,\"label\":\"person\",\"outE\":{\"created\":[{\"id\":12,\"inV\":3,\"properties\":{\"weight\":0.2}}]},\"properties\":{\"name\":[{\"id\":10,\"value\":\"peter\"}],\"age\":[{\"id\":11,\"value\":35}]}}\n");
- }
- }
-
- @Test
public void shouldDeserializeGraphSONIntoTinkerGraphWithPartialTypes() throws IOException {
GraphWriter writer = getWriter(defaultMapperV2d0);
GraphReader reader = getReader(defaultMapperV2d0);
[19/50] [abbrv] tinkerpop git commit: TraversalExplanation now how
prettyPrint(), prettyPrint(int maxLineLength),
and toString(). Console will detect a TraversalExplaination and use
prettyPrint(TerminalFactory.get().getWidth()). If the TerminalFactory is
Posted by sp...@apache.org.
TraversalExplanation now how prettyPrint(), prettyPrint(int maxLineLength), and toString(). Console will detect a TraversalExplaination and use prettyPrint(TerminalFactory.get().getWidth()). If the TerminalFactory is 'bad' then a default reasonable value is use -- people say some Java versions give -1 for getWidth().
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/21a533d4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/21a533d4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/21a533d4
Branch: refs/heads/TINKERPOP-1274
Commit: 21a533d4f11e1d8b614230b1073ed0e0603ccaa3
Parents: a4771b6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 16 12:49:33 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 16 12:49:33 2016 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/Console.groovy | 12 ++++++---
.../traversal/util/TraversalExplanation.java | 28 +++++++++++++-------
.../util/TraversalExplanationTest.java | 23 ++++++++++++----
3 files changed, 46 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21a533d4/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 5108948..3d748eb 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.console
+import jline.TerminalFactory
import org.apache.commons.cli.Option
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
@@ -29,6 +30,7 @@ import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn
import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
import jline.console.history.FileHistory
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation
import org.apache.tinkerpop.gremlin.util.Gremlin
import org.apache.tinkerpop.gremlin.util.iterator.ArrayIterator
import org.codehaus.groovy.tools.shell.AnsiDetector
@@ -113,8 +115,8 @@ class Console {
groovy = new GremlinGroovysh(mediator)
- def commandsToRemove = groovy.getRegistry().commands().findAll{it instanceof SetCommand}
- commandsToRemove.each {groovy.getRegistry().remove(it)}
+ def commandsToRemove = groovy.getRegistry().commands().findAll { it instanceof SetCommand }
+ commandsToRemove.each { groovy.getRegistry().remove(it) }
groovy.register(new GremlinSetCommand(groovy))
groovy.register(new UninstallCommand(groovy, mediator))
groovy.register(new InstallCommand(groovy, mediator))
@@ -209,7 +211,7 @@ class Console {
io.out.println(buildResultPrompt() + ((null == object) ? NULL : object.toString()))
counter++;
}
- if(this.tempIterator.hasNext())
+ if (this.tempIterator.hasNext())
io.out.println(ELLIPSIS);
this.tempIterator = Collections.emptyIterator();
return null
@@ -249,6 +251,10 @@ class Console {
this.tempIterator = Collections.emptyIterator();
return null
}
+ } else if (result instanceof TraversalExplanation) {
+ final int width = TerminalFactory.get().getWidth() - 25
+ io.out.println(buildResultPrompt() + result.prettyPrint(width < 10 ? 100 : width))
+ return null
} else {
io.out.println(buildResultPrompt() + ((null == result) ? NULL : result.toString()))
return null
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21a533d4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
index 675291d..2baccdb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanation.java
@@ -78,14 +78,21 @@ public class TraversalExplanation implements Serializable {
return this.traversal;
}
+ @Override
+ public String toString() {
+ return this.prettyPrint(Integer.MAX_VALUE);
+ }
+
+ public String prettyPrint() {
+ return this.prettyPrint(100);
+ }
+
/**
* A pretty-print representation of the traversal explanation.
*
* @return a {@link String} representation of the traversal explanation
*/
- @Override
- public String toString() {
- final int maxLineLength = 75;
+ public String prettyPrint(final int maxLineLength) {
final String originalTraversal = "Original Traversal";
final String finalTraversal = "Final Traversal";
final int maxStrategyColumnLength = this.strategyTraversals.stream()
@@ -95,10 +102,13 @@ public class TraversalExplanation implements Serializable {
.max(Comparator.naturalOrder())
.orElse(15);
final int newLineIndent = maxStrategyColumnLength + 10;
- int maxTraversalColumnLength = Stream.concat(Stream.of(Pair.with(null, this.traversal)), this.strategyTraversals.stream())
+ final int maxTraversalColumn = maxLineLength - newLineIndent;
+ if (maxTraversalColumn < 1)
+ throw new IllegalArgumentException("The maximum line length is too small to present the " + TraversalExplanation.class.getSimpleName() + ": " + maxLineLength);
+ int largestTraversalColumn = Stream.concat(Stream.of(Pair.with(null, this.traversal)), this.strategyTraversals.stream())
.map(Pair::getValue1)
.map(Object::toString)
- .map(s -> wordWrap(s, maxLineLength, newLineIndent))
+ .map(s -> wordWrap(s, maxTraversalColumn, newLineIndent))
.flatMap(s -> Stream.of(s.split("\n")))
.map(String::trim)
.map(s -> s.trim().startsWith("[") ? s : " " + s) // 3 indent on new lines
@@ -107,7 +117,7 @@ public class TraversalExplanation implements Serializable {
.get();
final StringBuilder builder = new StringBuilder("Traversal Explanation\n");
- for (int i = 0; i < (maxStrategyColumnLength + 7 + maxTraversalColumnLength); i++) {
+ for (int i = 0; i < (maxStrategyColumnLength + 7 + largestTraversalColumn); i++) {
builder.append("=");
}
builder.append("\n");
@@ -115,7 +125,7 @@ public class TraversalExplanation implements Serializable {
for (int i = 0; i < maxStrategyColumnLength - originalTraversal.length() + 7; i++) {
builder.append(" ");
}
- builder.append(wordWrap(this.traversal.toString(), maxLineLength, newLineIndent));
+ builder.append(wordWrap(this.traversal.toString(), maxTraversalColumn, newLineIndent));
builder.append("\n\n");
for (final Pair<TraversalStrategy, Traversal.Admin<?, ?>> pairs : this.strategyTraversals) {
builder.append(pairs.getValue0());
@@ -127,7 +137,7 @@ public class TraversalExplanation implements Serializable {
for (int i = 0; i < 3; i++) {
builder.append(" ");
}
- builder.append(wordWrap(pairs.getValue1().toString(), maxLineLength, newLineIndent)).append("\n");
+ builder.append(wordWrap(pairs.getValue1().toString(), maxTraversalColumn, newLineIndent)).append("\n");
}
builder.append("\n");
builder.append(finalTraversal);
@@ -136,7 +146,7 @@ public class TraversalExplanation implements Serializable {
}
builder.append(wordWrap((this.strategyTraversals.size() > 0 ?
this.strategyTraversals.get(this.strategyTraversals.size() - 1).getValue1().toString() :
- this.traversal.toString()), maxLineLength, newLineIndent));
+ this.traversal.toString()), maxTraversalColumn, newLineIndent));
return builder.toString();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21a533d4/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
index 57841e4..3350a87 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalExplanationTest.java
@@ -49,12 +49,12 @@ public class TraversalExplanationTest {
@Test
public void shouldWordWrapCorrectly() {
GraphTraversal<?, ?> traversal = __.V().out().out();
- String toString = traversal.explain().toString();
+ String toString = traversal.explain().prettyPrint();
assertFalse(toString.contains("VertexStep(OUT,vertex),\n"));
//System.out.println(toString);
///
traversal = __.V().out().out().out().out();
- toString = traversal.explain().toString();
+ toString = traversal.explain().prettyPrint();
assertTrue(toString.contains("VertexStep(OUT,vertex),\n"));
//System.out.println(toString);
///
@@ -64,8 +64,8 @@ public class TraversalExplanationTest {
traversal.out();
}
traversal.asAdmin().setStrategies(TraversalStrategies.GlobalCache.getStrategies(Graph.class));
- toString = traversal.explain().toString();
- if (i < 4)
+ toString = traversal.explain().prettyPrint();
+ if (i < 3)
assertFalse(toString.contains("VertexStep(OUT,vertex),\n"));
else {
assertFalse(Stream.of(toString.split("\n"))
@@ -116,6 +116,19 @@ public class TraversalExplanationTest {
found++;
}
assertEquals(4, found);
- // System.out.println(traversal.explain());
+ //
+ found = 0;
+ for (final String line : traversal.explain().prettyPrint().split("]\n")) { // need to split cause of word wrap
+ //System.out.println(line + "\n\n");
+ if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(IN,vertex)"))
+ found++;
+ if (line.contains("IncidentToAdjacentStrategy") && line.contains("[VertexStep(OUT,vertex)"))
+ found++;
+ if (line.contains("AdjacentToIncidentStrategy") && line.contains("[VertexStep(BOTH,edge)"))
+ found++;
+ if (line.contains("RangeByIsCountStrategy") && line.contains("RangeGlobalStep(0,3)"))
+ found++;
+ }
+ assertEquals(4, found);
}
}
[18/50] [abbrv] tinkerpop git commit: Log `mvn clean install` install
into file and show the last 100 lines in case of an error.
Posted by sp...@apache.org.
Log `mvn clean install` install into file and show the last 100 lines in case of an error.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6edca751
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6edca751
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6edca751
Branch: refs/heads/TINKERPOP-1274
Commit: 6edca75100f152b62a79cd1df8fbe20328d9f911
Parents: 84f2d63
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 16 20:23:20 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 16 20:23:20 2016 +0200
----------------------------------------------------------------------
bin/validate-distribution.sh | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6edca751/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index fc45401..a6fb927 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -114,8 +114,17 @@ echo "OK"
if [ "${TYPE}" = "SOURCE" ]; then
cd ${DIR_NAME}
+LOG_DIR="${DIR_NAME}/target/validate-distribution"
+LOG_FILE="mvn-clean-install.log"
echo -n "* building project ... "
-mvn clean install 2>&1 > /dev/null || { echo "failed"; exit 1; }
+mkdir -p ${LOG_DIR}
+mvn clean install 2>&1 > "${LOG_DIR}/${LOG_FILE}" || {
+ echo "failed"
+ echo
+ tail -n100 target/validate-distribution/mvn-clean-install.log
+ echo -e "\n\e[1mThe full log file can be inspected under ${LOG_DIR}/${LOG_FILE}.\e[0m\n"
+ exit 1
+}
echo "OK"
exit 0
fi
[50/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1274'
of https://github.com/newkek/incubator-tinkerpop into TINKERPOP-1274
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1274' of https://github.com/newkek/incubator-tinkerpop into TINKERPOP-1274
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/10abe8e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/10abe8e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/10abe8e1
Branch: refs/heads/TINKERPOP-1274
Commit: 10abe8e14caa2312bc89e3289978ef417831b4ce
Parents: f5b64fa 16e26b5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 30 13:32:48 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 30 13:32:48 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 30 +-
DISCLAIMER | 7 -
README.asciidoc | 8 +-
bin/process-docs.sh | 2 +-
bin/publish-docs.sh | 15 +
bin/validate-distribution.sh | 9 +-
docs/preprocessor/awk/prepare.awk | 4 +
docs/preprocessor/preprocess-file.sh | 10 +-
docs/preprocessor/preprocess.sh | 44 +-
docs/src/dev/developer/administration.asciidoc | 5 +-
docs/src/dev/developer/contributing.asciidoc | 676 +-
.../developer/development-environment.asciidoc | 99 +
docs/src/dev/developer/for-committers.asciidoc | 394 +
docs/src/dev/developer/index.asciidoc | 12 +
docs/src/dev/provider/index.asciidoc | 82 +-
docs/src/recipes/between-vertices.asciidoc | 28 +-
docs/src/recipes/centrality.asciidoc | 168 +
docs/src/recipes/cycle-detection.asciidoc | 61 +
.../src/recipes/if-then-based-grouping.asciidoc | 13 +-
docs/src/recipes/index.asciidoc | 8 +-
docs/src/recipes/shortest-path.asciidoc | 19 +-
docs/src/recipes/style-guide.asciidoc | 81 +
.../src/reference/gremlin-applications.asciidoc | 10 +-
.../reference/implementations-hadoop.asciidoc | 80 +-
.../reference/implementations-intro.asciidoc | 2 +-
.../reference/implementations-neo4j.asciidoc | 77 +-
docs/src/reference/the-graph.asciidoc | 132 +-
docs/src/reference/the-traversal.asciidoc | 35 +-
.../tutorials/getting-started/index.asciidoc | 2 +-
.../gremlin-language-variants/index.asciidoc | 6 +-
.../upgrade/release-3.1.x-incubating.asciidoc | 2 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 46 +-
docs/static/images/betweeness-example.png | Bin 0 -> 8465 bytes
docs/static/images/graph-cycle.png | Bin 0 -> 774901 bytes
docs/static/images/neo4j-ha.png | Bin 0 -> 108249 bytes
docs/static/images/tinkerpop3.graffle | 23433 ++++++++---------
docs/static/resources/gremlin-jython.py | 2 +-
docs/static/resources/gremlin-python.py | 2 +-
.../process/computer/GiraphGraphComputer.java | 59 +-
.../process/computer/GiraphWorkerContext.java | 3 +-
gremlin-console/src/assembly/distribution.xml | 4 -
.../tinkerpop/gremlin/console/Console.groovy | 16 +-
.../groovy/plugin/DriverRemoteAcceptor.java | 10 +-
.../DriverRemoteAcceptorIntegrateTest.java | 8 +
.../gremlin/process/computer/GraphFilter.java | 11 +
.../gremlin/process/computer/ProgramPhase.java | 40 +
.../peerpressure/PeerPressureVertexProgram.java | 21 +-
.../computer/traversal/MasterExecutor.java | 65 +-
.../traversal/MemoryTraversalSideEffects.java | 28 +-
.../computer/traversal/SingleMessenger.java | 49 -
.../traversal/TraversalVertexProgram.java | 102 +-
.../computer/traversal/TraverserExecutor.java | 203 -
.../computer/traversal/WorkerExecutor.java | 245 +
.../traversal/step/VertexComputing.java | 6 +-
.../step/map/PageRankVertexProgramStep.java | 8 +-
.../step/map/PeerPressureVertexProgramStep.java | 16 +-
.../step/map/ProgramVertexProgramStep.java | 9 +-
.../step/map/TraversalVertexProgramStep.java | 13 +-
.../traversal/step/map/VertexProgramStep.java | 21 +-
.../optimization/GraphFilterStrategy.java | 3 +-
.../process/computer/util/EmptyMemory.java | 91 +
.../process/computer/util/SingleMessenger.java | 49 +
.../gremlin/process/remote/RemoteGraph.java | 20 +-
.../process/traversal/step/map/GroupStep.java | 311 +-
.../traversal/step/map/SelectOneStep.java | 2 +-
.../step/sideEffect/GroupSideEffectStep.java | 61 +-
.../traversal/step/sideEffect/SubgraphStep.java | 19 +-
.../traversal/step/util/ImmutablePath.java | 3 +-
.../process/traversal/step/util/Parameters.java | 18 +-
.../decoration/HaltedTraverserStrategy.java | 71 +
.../strategy/decoration/SubgraphStrategy.java | 40 +-
.../optimization/RangeByIsCountStrategy.java | 54 +-
.../traversal/util/DefaultTraversal.java | 5 +-
.../traversal/util/TraversalExplanation.java | 69 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../structure/io/graphml/GraphMLReader.java | 3 +-
.../structure/io/graphson/GraphSONMapper.java | 90 +-
.../structure/io/graphson/GraphSONModule.java | 90 +-
.../structure/io/graphson/GraphSONReader.java | 8 +-
.../io/graphson/GraphSONSerializerProvider.java | 15 +-
.../io/graphson/GraphSONSerializersV1d0.java | 2 +-
.../io/graphson/GraphSONSerializersV2d0.java | 480 +
.../io/graphson/GraphSONTypeDeserializer.java | 201 +
.../io/graphson/GraphSONTypeIdResolver.java | 140 +
.../graphson/GraphSONTypeResolverBuilder.java | 60 +
.../io/graphson/GraphSONTypeSerializer.java | 160 +
.../structure/io/graphson/GraphSONUtil.java | 29 +
.../structure/io/graphson/GraphSONWriter.java | 11 +-
.../io/graphson/JavaTimeSerializersV2d0.java | 323 +
.../io/graphson/JavaUtilSerializersV2d0.java | 116 +
.../structure/io/graphson/JsonParserConcat.java | 81 +
.../io/graphson/LegacyGraphSONReader.java | 4 +-
.../io/graphson/TinkerPopJacksonModule.java | 58 +
.../io/graphson/ToStringGraphSONSerializer.java | 41 +
.../gremlin/structure/io/gryo/GryoMapper.java | 439 +-
.../gremlin/structure/io/gryo/GryoPool.java | 1 +
.../structure/io/gryo/GryoSerializers.java | 52 +-
.../structure/io/gryo/JavaTimeSerializers.java | 125 +-
.../structure/io/gryo/PairSerializer.java | 11 +-
.../structure/io/gryo/TypeRegistration.java | 82 +
.../structure/io/gryo/URISerializer.java | 23 +-
.../structure/io/gryo/UUIDSerializer.java | 24 +-
.../structure/io/gryo/kryoshim/InputShim.java | 38 +
.../structure/io/gryo/kryoshim/KryoShim.java | 41 +
.../io/gryo/kryoshim/KryoShimService.java | 99 +
.../io/gryo/kryoshim/KryoShimServiceLoader.java | 215 +
.../structure/io/gryo/kryoshim/OutputShim.java | 40 +
.../io/gryo/kryoshim/SerializerShim.java | 36 +
.../io/gryo/kryoshim/package-info.java | 55 +
.../kryoshim/shaded/ShadedInputAdapter.java | 66 +
.../gryo/kryoshim/shaded/ShadedKryoAdapter.java | 67 +
.../kryoshim/shaded/ShadedOutputAdapter.java | 71 +
.../shaded/ShadedSerializerAdapter.java | 54 +
.../io/gryo/kryoshim/shaded/package-info.java | 25 +
.../util/star/DirectionalStarGraph.java | 39 +
.../star/StarGraphGraphSONDeserializer.java | 91 +
.../util/star/StarGraphGraphSONSerializer.java | 250 -
.../star/StarGraphGraphSONSerializerV1d0.java | 178 +
.../star/StarGraphGraphSONSerializerV2d0.java | 165 +
.../util/star/StarGraphGryoSerializer.java | 130 +-
.../util/star/StarGraphSerializer.java | 150 +
.../RangeByIsCountStrategyTest.java | 73 +-
.../util/TraversalExplanationTest.java | 61 +-
.../GraphSONMapperEmbeddedTypeTest.java | 19 +-
.../io/graphson/GraphSONMapperTest.java | 17 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 269 +
.../structure/io/gryo/GryoMapperTest.java | 63 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 86 +-
.../tinkerpop/gremlin/driver/ResultSet.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 3 +-
.../AbstractGraphSONMessageSerializerV2d0.java | 248 +
.../ser/AbstractGryoMessageSerializerV1d0.java | 311 +
.../GraphSONMessageSerializerGremlinV2d0.java | 68 +
.../ser/GraphSONMessageSerializerV2d0.java | 124 +
.../ser/GryoLiteMessageSerializerV1d0.java | 164 +
.../driver/ser/GryoMessageSerializerV1d0.java | 298 +-
.../tinkerpop/gremlin/driver/ser/SerTokens.java | 1 +
.../gremlin/driver/ser/Serializers.java | 5 +-
.../GraphSONMessageSerializerGremlinTest.java | 349 +
...raphSONMessageSerializerGremlinV1d0Test.java | 334 -
.../ser/GraphSONMessageSerializerV1d0Test.java | 9 +-
.../ser/GraphSONMessageSerializerV2d0Test.java | 485 +
.../ser/GryoBaseMessageSerializerV1d0Test.java | 520 +
.../ser/GryoLiteMessageSerializerV1d0Test.java | 150 +
.../ser/GryoMessageSerializerV1d0Test.java | 445 +-
.../step/branch/GroovyLocalTest.groovy | 8 +
.../traversal/step/map/GroovyMatchTest.groovy | 10 +
.../step/map/GroovyPageRankTest.groovy | 5 +
.../step/map/GroovyPeerPressureTest.groovy | 5 +
.../step/map/GroovyPropertiesTest.groovy | 6 +
.../traversal/step/map/GroovyVertexTest.groovy | 13 +-
.../step/sideEffect/GroovyGroupTest.groovy | 10 +
.../step/sideEffect/GroovySackTest.groovy | 2 +-
.../step/sideEffect/GroovySubgraphTest.groovy | 5 +
gremlin-groovy/pom.xml | 276 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 12 +-
.../gremlin/groovy/engine/ScriptEngines.java | 28 +-
.../jsr223/GremlinGroovyScriptEngine.java | 8 +-
.../ConfigurationCustomizerProvider.java | 83 +
.../groovy/jsr223/BaseScriptForTesting.java | 30 +
.../GremlinGroovyScriptEngineConfigTest.java | 40 +
.../ConfigurationCustomizerProviderTest.java | 78 +
gremlin-server/conf/gremlin-server-classic.yaml | 1 +
.../conf/gremlin-server-modern-readonly.yaml | 1 +
gremlin-server/conf/gremlin-server-modern.yaml | 1 +
gremlin-server/conf/gremlin-server-neo4j.yaml | 1 +
.../conf/gremlin-server-rest-secure.yaml | 2 -
gremlin-server/conf/gremlin-server-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-spark.yaml | 1 +
gremlin-server/conf/gremlin-server.yaml | 1 +
gremlin-server/src/assembly/distribution.xml | 4 -
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/op/session/Session.java | 6 +-
.../op/traversal/TraversalOpProcessor.java | 21 +-
.../gremlin/server/BaseScriptForTesting.java | 30 +
.../server/GremlinResultSetIntegrateTest.java | 16 +
.../server/GremlinServerIntegrateTest.java | 50 +-
.../remote/gremlin-server-integration.yaml | 1 +
.../server/gremlin-server-integration.yaml | 1 +
gremlin-test/pom.xml | 196 +-
.../traversal/TraversalInterruptionTest.java | 3 +-
.../traversal/step/branch/LocalTest.java | 38 +-
.../process/traversal/step/map/MatchTest.java | 67 +-
.../process/traversal/step/map/OrderTest.java | 1 +
.../traversal/step/map/PageRankTest.java | 26 +
.../traversal/step/map/PeerPressureTest.java | 31 +
.../process/traversal/step/map/ProgramTest.java | 49 +-
.../traversal/step/map/PropertiesTest.java | 53 +-
.../process/traversal/step/map/VertexTest.java | 27 +-
.../traversal/step/sideEffect/GroupTest.java | 77 +
.../traversal/step/sideEffect/SubgraphTest.java | 40 +-
.../decoration/SubgraphStrategyProcessTest.java | 22 +
.../gremlin/structure/io/IoGraphTest.java | 4 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 40 +
.../io/graphml/tinkerpop-no-edge-labels.xml | 25 +
.../computer/AbstractHadoopGraphComputer.java | 63 +-
.../hadoop/process/computer/HadoopCombine.java | 3 +-
.../hadoop/process/computer/HadoopMap.java | 3 +-
.../hadoop/process/computer/HadoopReduce.java | 3 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 124 +-
.../structure/io/HadoopPoolShimService.java | 75 +
.../hadoop/structure/io/HadoopPools.java | 1 +
.../structure/io/HadoopPoolsConfigurable.java | 4 +-
.../hadoop/structure/io/ObjectWritable.java | 25 +-
.../hadoop/structure/io/VertexWritable.java | 39 +-
.../structure/io/gryo/GryoRecordReader.java | 3 +-
.../structure/io/gryo/GryoRecordWriter.java | 4 +-
.../structure/io/script/ScriptInputFormat.java | 5 +
.../structure/io/script/ScriptOutputFormat.java | 6 +
...n.structure.io.gryo.kryoshim.KryoShimService | 1 +
.../gremlin/hadoop/HadoopGraphProvider.java | 3 +
.../groovy/plugin/HadoopGremlinPluginCheck.java | 189 +-
pom.xml | 3 +
.../spark/process/computer/SparkExecutor.java | 35 +-
.../process/computer/SparkGraphComputer.java | 81 +-
.../optimization/SparkInterceptorStrategy.java | 3 +-
.../SparkSingleIterationStrategy.java | 3 +-
.../SparkStarBarrierInterceptor.java | 6 +-
.../structure/io/gryo/GryoRegistrator.java | 238 +
.../spark/structure/io/gryo/GryoSerializer.java | 2 +-
.../io/gryo/IoRegistryAwareKryoSerializer.java | 116 +
.../io/gryo/ObjectWritableSerializer.java | 12 +-
.../io/gryo/VertexWritableSerializer.java | 12 +-
.../kryoshim/unshaded/UnshadedInputAdapter.java | 78 +
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 74 +
.../unshaded/UnshadedKryoShimService.java | 154 +
.../unshaded/UnshadedOutputAdapter.java | 83 +
.../unshaded/UnshadedSerializerAdapter.java | 57 +
...n.structure.io.gryo.kryoshim.KryoShimService | 1 +
...tratorGraphComputerProcessIntegrateTest.java | 33 +
...SparkHadoopGraphGryoRegistratorProvider.java | 52 +
.../computer/SparkHadoopGraphProvider.java | 8 +-
.../spark/structure/io/ToyGraphInputRDD.java | 3 +-
.../structure/TinkerIoRegistryV2d0.java | 227 +
.../decoration/HaltedTraverserStrategyTest.java | 102 +
.../structure/IoDataGenerationTest.java | 109 +-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 292 +
.../structure/TinkerGraphPlayTest.java | 26 +-
238 files changed, 24227 insertions(+), 15538 deletions(-)
----------------------------------------------------------------------
[03/50] [abbrv] tinkerpop git commit: This closes #333
Posted by sp...@apache.org.
This closes #333
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/842a58f3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/842a58f3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/842a58f3
Branch: refs/heads/TINKERPOP-1274
Commit: 842a58f31986fc429ff4894767632de9f55f0dde
Parents: 1a526eb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jun 15 07:22:46 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jun 15 07:22:46 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[43/50] [abbrv] tinkerpop git commit: Changed GraphSONMapper
constructor
Posted by sp...@apache.org.
Changed GraphSONMapper constructor
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3f89027f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3f89027f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3f89027f
Branch: refs/heads/TINKERPOP-1274
Commit: 3f89027f439fcabe50479765680dc07aded384af
Parents: 7309230
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Jun 29 15:16:03 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Thu Jun 30 10:39:47 2016 +0100
----------------------------------------------------------------------
.../structure/io/graphson/GraphSONMapper.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f89027f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index 8f20ef7..620855e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -63,15 +63,13 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private final GraphSONVersion version;
private final TypeInfo typeInfo;
- private GraphSONMapper(final List<SimpleModule> customModules, final boolean loadCustomSerializers,
- final boolean normalize, final boolean embedTypes, final GraphSONVersion version,
- final TypeInfo typeInfo) {
- this.customModules = customModules;
- this.loadCustomSerializers = loadCustomSerializers;
- this.normalize = normalize;
- this.embedTypes = embedTypes;
- this.version = version;
- this.typeInfo = typeInfo;
+ private GraphSONMapper(final Builder builder) {
+ this.customModules = builder.customModules;
+ this.loadCustomSerializers = builder.loadCustomModules;
+ this.normalize = builder.normalize;
+ this.embedTypes = builder.embedTypes;
+ this.version = builder.version;
+ this.typeInfo = builder.typeInfo;
}
@Override
@@ -240,7 +238,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
simpleModules.stream().map(Pair::getValue1).forEach(this.customModules::add);
});
- return new GraphSONMapper(customModules, loadCustomModules, normalize, embedTypes, version, typeInfo);
+ return new GraphSONMapper(this);
}
}
[40/50] [abbrv] tinkerpop git commit: TINKERPOP-1274: GraphSON 2.0.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
new file mode 100644
index 0000000..4702092
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaTimeSerializersV2d0.java
@@ -0,0 +1,311 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+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.StdSerializer;
+
+import java.io.IOException;
+import java.time.*;
+
+/**
+ * GraphSON serializers for classes in {@code java.time.*} for the version 2.0 of GraphSON.
+ */
+final class JavaTimeSerializersV2d0 {
+
+ private JavaTimeSerializersV2d0() {}
+
+ /**
+ * Base class for serializing the {@code java.time.*} to ISO-8061 formats.
+ */
+ static abstract class AbstractJavaTimeSerializer<T> extends StdSerializer<T> {
+
+ public AbstractJavaTimeSerializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ @Override
+ public void serialize(final T value, final JsonGenerator gen,
+ final SerializerProvider serializerProvider) throws IOException {
+ gen.writeString(value.toString());
+ }
+
+ @Override
+ public void serializeWithType(final T value, final JsonGenerator gen,
+ final SerializerProvider serializers, final TypeSerializer typeSer) throws IOException {
+ typeSer.writeTypePrefixForScalar(value, gen);
+ gen.writeString(value.toString());
+ typeSer.writeTypeSuffixForScalar(value, gen);
+ }
+ }
+ /**
+ * Base class for serializing the {@code java.time.*} from ISO-8061 formats.
+ */
+ abstract static class AbstractJavaTimeJacksonDeserializer<T> extends StdDeserializer<T> {
+ public AbstractJavaTimeJacksonDeserializer(final Class<T> clazz) {
+ super(clazz);
+ }
+
+ public abstract T parse(final String val);
+
+ @Override
+ public T deserialize(final JsonParser jsonParser, final DeserializationContext deserializationContext) throws IOException {
+ return parse(jsonParser.getText());
+ }
+ }
+
+ final static class DurationJacksonSerializer extends AbstractJavaTimeSerializer<Duration> {
+
+ public DurationJacksonSerializer() {
+ super(Duration.class);
+ }
+ }
+
+ final static class DurationJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Duration> {
+ public DurationJacksonDeserializer() {
+ super(Duration.class);
+ }
+
+ @Override
+ public Duration parse(final String val) {
+ return Duration.parse(val);
+ }
+ }
+
+ final static class InstantJacksonSerializer extends AbstractJavaTimeSerializer<Instant> {
+
+ public InstantJacksonSerializer() {
+ super(Instant.class);
+ }
+ }
+
+ final static class InstantJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Instant> {
+ public InstantJacksonDeserializer() {
+ super(Instant.class);
+ }
+
+ @Override
+ public Instant parse(final String val) {
+ return Instant.parse(val);
+ }
+ }
+
+ final static class LocalDateJacksonSerializer extends AbstractJavaTimeSerializer<LocalDate> {
+
+ public LocalDateJacksonSerializer() {
+ super(LocalDate.class);
+ }
+ }
+
+ final static class LocalDateJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDate> {
+ public LocalDateJacksonDeserializer() {
+ super(LocalDate.class);
+ }
+
+ @Override
+ public LocalDate parse(final String val) {
+ return LocalDate.parse(val);
+ }
+ }
+
+ final static class LocalDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalDateTime> {
+
+ public LocalDateTimeJacksonSerializer() {
+ super(LocalDateTime.class);
+ }
+ }
+
+ final static class LocalDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalDateTime> {
+ public LocalDateTimeJacksonDeserializer() {
+ super(LocalDateTime.class);
+ }
+
+ @Override
+ public LocalDateTime parse(final String val) {
+ return LocalDateTime.parse(val);
+ }
+ }
+
+ final static class LocalTimeJacksonSerializer extends AbstractJavaTimeSerializer<LocalTime> {
+
+ public LocalTimeJacksonSerializer() {
+ super(LocalTime.class);
+ }
+ }
+
+ final static class LocalTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<LocalTime> {
+ public LocalTimeJacksonDeserializer() {
+ super(LocalTime.class);
+ }
+
+ @Override
+ public LocalTime parse(final String val) {
+ return LocalTime.parse(val);
+ }
+ }
+
+ final static class MonthDayJacksonSerializer extends AbstractJavaTimeSerializer<MonthDay> {
+
+ public MonthDayJacksonSerializer() {
+ super(MonthDay.class);
+ }
+ }
+
+ final static class MonthDayJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<MonthDay> {
+ public MonthDayJacksonDeserializer() {
+ super(MonthDay.class);
+ }
+
+ @Override
+ public MonthDay parse(final String val) {
+ return MonthDay.parse(val);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetDateTime> {
+
+ public OffsetDateTimeJacksonSerializer() {
+ super(OffsetDateTime.class);
+ }
+ }
+
+ final static class OffsetDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetDateTime> {
+ public OffsetDateTimeJacksonDeserializer() {
+ super(OffsetDateTime.class);
+ }
+
+ @Override
+ public OffsetDateTime parse(final String val) {
+ return OffsetDateTime.parse(val);
+ }
+ }
+
+ final static class OffsetTimeJacksonSerializer extends AbstractJavaTimeSerializer<OffsetTime> {
+
+ public OffsetTimeJacksonSerializer() {
+ super(OffsetTime.class);
+ }
+ }
+
+ final static class OffsetTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<OffsetTime> {
+ public OffsetTimeJacksonDeserializer() {
+ super(OffsetTime.class);
+ }
+
+ @Override
+ public OffsetTime parse(final String val) {
+ return OffsetTime.parse(val);
+ }
+ }
+
+ final static class PeriodJacksonSerializer extends AbstractJavaTimeSerializer<Period> {
+
+ public PeriodJacksonSerializer() {
+ super(Period.class);
+ }
+ }
+
+ final static class PeriodJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Period> {
+ public PeriodJacksonDeserializer() {
+ super(Period.class);
+ }
+
+ @Override
+ public Period parse(final String val) {
+ return Period.parse(val);
+ }
+ }
+
+ final static class YearJacksonSerializer extends AbstractJavaTimeSerializer<Year> {
+
+ public YearJacksonSerializer() {
+ super(Year.class);
+ }
+ }
+
+ final static class YearJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<Year> {
+ public YearJacksonDeserializer() {
+ super(Year.class);
+ }
+
+ @Override
+ public Year parse(final String val) {
+ return Year.parse(val);
+ }
+ }
+
+ final static class YearMonthJacksonSerializer extends AbstractJavaTimeSerializer<YearMonth> {
+
+ public YearMonthJacksonSerializer() {
+ super(YearMonth.class);
+ }
+ }
+
+ final static class YearMonthJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<YearMonth> {
+ public YearMonthJacksonDeserializer() {
+ super(YearMonth.class);
+ }
+
+ @Override
+ public YearMonth parse(final String val) {
+ return YearMonth.parse(val);
+ }
+ }
+
+ final static class ZonedDateTimeJacksonSerializer extends AbstractJavaTimeSerializer<ZonedDateTime> {
+
+ public ZonedDateTimeJacksonSerializer() {
+ super(ZonedDateTime.class);
+ }
+ }
+
+ final static class ZonedDateTimeJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZonedDateTime> {
+ public ZonedDateTimeJacksonDeserializer() {
+ super(ZonedDateTime.class);
+ }
+
+ @Override
+ public ZonedDateTime parse(final String val) {
+ return ZonedDateTime.parse(val);
+ }
+ }
+
+ final static class ZoneOffsetJacksonSerializer extends AbstractJavaTimeSerializer<ZoneOffset> {
+
+ public ZoneOffsetJacksonSerializer() {
+ super(ZoneOffset.class);
+ }
+ }
+
+ final static class ZoneOffsetJacksonDeserializer extends AbstractJavaTimeJacksonDeserializer<ZoneOffset> {
+ public ZoneOffsetJacksonDeserializer() {
+ super(ZoneOffset.class);
+ }
+
+ @Override
+ public ZoneOffset parse(final String val) {
+ return ZoneOffset.of(val);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java
new file mode 100644
index 0000000..5dc095e
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JavaUtilSerializersV2d0.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializationFeature;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.ByteBufferSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * GraphSON serializers for classes in {@code java.util.*} for the version 2.0 of GraphSON.
+ */
+final class JavaUtilSerializersV2d0 {
+
+ private JavaUtilSerializersV2d0() {}
+
+ final static class MapEntryJacksonSerializer extends StdSerializer<Map.Entry> {
+
+ public MapEntryJacksonSerializer() {
+ super(Map.Entry.class);
+ }
+
+ @Override
+ public void serialize(final Map.Entry entry, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
+ throws IOException {
+ jsonGenerator.writeStartObject();
+ ser(entry, jsonGenerator, serializerProvider);
+ jsonGenerator.writeEndObject();
+ }
+
+ @Override
+ public void serializeWithType(final Map.Entry entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ typeSerializer.writeTypePrefixForObject(entry, jsonGenerator);
+ ser(entry, jsonGenerator, serializerProvider);
+ typeSerializer.writeTypeSuffixForObject(entry, jsonGenerator);
+ }
+
+ private static void ser(final Map.Entry entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ // this treatment of keys is consistent with the current GraphSONKeySerializer which extends the
+ // StdKeySerializer
+ final Object key = entry.getKey();
+ final Class cls = key.getClass();
+ String k;
+ if (cls == String.class)
+ k = (String) key;
+ else if (Element.class.isAssignableFrom(cls))
+ k = ((Element) key).id().toString();
+ else if(Date.class.isAssignableFrom(cls)) {
+ if (serializerProvider.isEnabled(SerializationFeature.WRITE_DATE_KEYS_AS_TIMESTAMPS))
+ k = String.valueOf(((Date) key).getTime());
+ else
+ k = serializerProvider.getConfig().getDateFormat().format((Date) key);
+ } else if(cls == Class.class)
+ k = ((Class) key).getName();
+ else
+ k = key.toString();
+
+ serializerProvider.defaultSerializeField(k, entry.getValue(), jsonGenerator);
+ }
+ }
+
+ final static class GraphSONByteBufferSerializer extends StdSerializer<ByteBuffer> {
+
+ ByteBufferSerializer byteBufferSerializer;
+
+ public GraphSONByteBufferSerializer() {
+ super(ByteBuffer.class);
+ byteBufferSerializer = new ByteBufferSerializer();
+ }
+
+ @Override
+ public void serialize(ByteBuffer byteBuffer, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+ ser(byteBuffer, jsonGenerator, serializerProvider);
+ }
+
+ @Override
+ public void serializeWithType(final ByteBuffer entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+
+ typeSerializer.writeCustomTypePrefixForScalar(entry, jsonGenerator, "ByteBuffer");
+ ser(entry, jsonGenerator, serializerProvider);
+ typeSerializer.writeCustomTypeSuffixForScalar(entry, jsonGenerator, "ByteBuffer");
+ }
+
+ private void ser(final ByteBuffer entry, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException {
+ byteBufferSerializer.serialize(entry, jsonGenerator, serializerProvider);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JsonParserConcat.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JsonParserConcat.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JsonParserConcat.java
new file mode 100644
index 0000000..73fe224
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/JsonParserConcat.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonParseException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.util.JsonParserSequence;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Utility class to easily concatenate multiple JsonParsers. This class had to be implemented because the class it is
+ * extending, {@link JsonParserSequence}, inevitably skips a token when switching from one empty parser to a new one.
+ * I.e. it is automatically calling {@link JsonParser#nextToken()} when switching to the new parser, ignoring
+ * the current token.
+ *
+ * This class is used for high performance in GraphSON when trying to detect types.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class JsonParserConcat extends JsonParserSequence {
+ protected JsonParserConcat(JsonParser[] parsers) {
+ super(parsers);
+ }
+
+ public static JsonParserConcat createFlattened(JsonParser first, JsonParser second) {
+ if (!(first instanceof JsonParserConcat) && !(second instanceof JsonParserConcat)) {
+ return new JsonParserConcat(new JsonParser[]{first, second});
+ } else {
+ ArrayList p = new ArrayList();
+ if (first instanceof JsonParserConcat) {
+ ((JsonParserConcat) first).addFlattenedActiveParsers(p);
+ } else {
+ p.add(first);
+ }
+
+ if (second instanceof JsonParserConcat) {
+ ((JsonParserConcat) second).addFlattenedActiveParsers(p);
+ } else {
+ p.add(second);
+ }
+ return new JsonParserConcat((JsonParser[]) p.toArray(new JsonParser[p.size()]));
+ }
+ }
+
+ @Override
+ public JsonToken nextToken() throws IOException, JsonParseException {
+ JsonToken t = this.delegate.nextToken();
+ if (t != null) {
+ return t;
+ } else {
+ do {
+ if (!this.switchToNext()) {
+ return null;
+ }
+ // call getCurrentToken() instead of nextToken() in JsonParserSequence.
+ t = this.delegate.getCurrentToken();
+ } while (t == null);
+
+ return t;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index f015193..852d82d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -18,13 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphson;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
@@ -37,11 +31,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
new file mode 100644
index 0000000..110b2a0
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TinkerPopJacksonModule.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.databind.JsonDeserializer;
+import org.apache.tinkerpop.shaded.jackson.databind.module.SimpleModule;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A {@link SimpleModule} extension that does the necessary work to make the automatic typed deserialization
+ * without full canonical class names work.
+ *
+ * Users of custom modules with the GraphSONMapper that want their objects to be deserialized automatically by the
+ * mapper, must extend this class with their module. It is the only required step.
+ *
+ * Using this basis module allows the serialization and deserialization of typed objects without having the whole
+ * canonical name of the serialized classes included in the Json payload. This is also necessary because Java
+ * does not provide an agnostic way to search in a classpath a find a class by its simple name. Although that could
+ * be done with an external library, later if we deem it necessary.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class TinkerPopJacksonModule extends SimpleModule {
+
+ private Map<String, Class> addedDeserializers = new LinkedHashMap<>();
+
+ public TinkerPopJacksonModule(String name) {
+ super(name);
+ }
+
+ @Override
+ public <T> SimpleModule addDeserializer(Class<T> type, JsonDeserializer<? extends T> deser) {
+ addedDeserializers.put(type.getSimpleName(), type);
+ return super.addDeserializer(type, deser);
+ }
+
+ public Map<String, Class> getAddedDeserializers() {
+ return addedDeserializers;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/ToStringGraphSONSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/ToStringGraphSONSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/ToStringGraphSONSerializer.java
new file mode 100644
index 0000000..fbd9e00
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/ToStringGraphSONSerializer.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.ToStringSerializer;
+
+import java.io.IOException;
+
+/**
+ * A different implementation of the {@link ToStringSerializer} that does not serialize types by calling
+ * `typeSerializer.writeTypePrefixForScalar()` for unknown objects, because it doesn't make sense when there is a
+ * custom types mechanism in place.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ */
+public class ToStringGraphSONSerializer extends ToStringSerializer {
+ @Override
+ public void serializeWithType(Object value, JsonGenerator gen, SerializerProvider provider, TypeSerializer typeSer) throws IOException {
+ this.serialize(value, gen, provider);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/DirectionalStarGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/DirectionalStarGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/DirectionalStarGraph.java
new file mode 100644
index 0000000..ed7b58c
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/DirectionalStarGraph.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Direction;
+
+public class DirectionalStarGraph {
+ private final Direction direction;
+ private final StarGraph starGraphToSerialize;
+
+ public DirectionalStarGraph(final StarGraph starGraphToSerialize, final Direction direction) {
+ this.direction = direction;
+ this.starGraphToSerialize = starGraphToSerialize;
+ }
+
+ public Direction getDirection() {
+ return direction;
+ }
+
+ public StarGraph getStarGraphToSerialize() {
+ return starGraphToSerialize;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
new file mode 100644
index 0000000..84a3fd4
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONDeserializer.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * Provides helper functions for reading vertex and edges from their serialized GraphSON forms.
+ */
+public class StarGraphGraphSONDeserializer {
+
+ /**
+ * A helper function for reading vertex edges from a serialized {@link org.apache.tinkerpop.gremlin.structure.util.star.StarGraph} (i.e. a {@link java.util.Map}) generated by
+ * {@link org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1d0}.
+ */
+ public static void readStarGraphEdges(final Function<Attachable<Edge>, Edge> edgeMaker,
+ final StarGraph starGraph,
+ final Map<String, Object> vertexData,
+ final String direction) throws IOException {
+ final Map<String, List<Map<String,Object>>> edgeDatas = (Map<String, List<Map<String,Object>>>) vertexData.get(direction);
+ for (Map.Entry<String, List<Map<String,Object>>> edgeData : edgeDatas.entrySet()) {
+ for (Map<String,Object> inner : edgeData.getValue()) {
+ final StarGraph.StarEdge starEdge;
+ if (direction.equals(GraphSONTokens.OUT_E))
+ starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addOutEdge(edgeData.getKey(), starGraph.addVertex(T.id, inner.get(GraphSONTokens.IN)), T.id, inner.get(GraphSONTokens.ID));
+ else
+ starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addInEdge(edgeData.getKey(), starGraph.addVertex(T.id, inner.get(GraphSONTokens.OUT)), T.id, inner.get(GraphSONTokens.ID));
+
+ if (inner.containsKey(GraphSONTokens.PROPERTIES)) {
+ final Map<String, Object> edgePropertyData = (Map<String, Object>) inner.get(GraphSONTokens.PROPERTIES);
+ for (Map.Entry<String, Object> epd : edgePropertyData.entrySet()) {
+ starEdge.property(epd.getKey(), epd.getValue());
+ }
+ }
+
+ if (edgeMaker != null) edgeMaker.apply(starEdge);
+ }
+ }
+ }
+
+ /**
+ * A helper function for reading a serialized {@link org.apache.tinkerpop.gremlin.structure.util.star.StarGraph} from a {@link java.util.Map} generated by
+ * {@link org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializerV1d0}.
+ */
+ public static StarGraph readStarGraphVertex(final Map<String, Object> vertexData) throws IOException {
+ final StarGraph starGraph = StarGraph.open();
+ starGraph.addVertex(T.id, vertexData.get(GraphSONTokens.ID), T.label, vertexData.get(GraphSONTokens.LABEL));
+ if (vertexData.containsKey(GraphSONTokens.PROPERTIES)) {
+ final Map<String, List<Map<String, Object>>> properties = (Map<String, List<Map<String, Object>>>) vertexData.get(GraphSONTokens.PROPERTIES);
+ for (Map.Entry<String, List<Map<String, Object>>> property : properties.entrySet()) {
+ for (Map<String, Object> p : property.getValue()) {
+ final StarGraph.StarVertexProperty vp = (StarGraph.StarVertexProperty) starGraph.getStarVertex().property(VertexProperty.Cardinality.list, property.getKey(), p.get(GraphSONTokens.VALUE), T.id, p.get(GraphSONTokens.ID));
+ if (p.containsKey(GraphSONTokens.PROPERTIES)) {
+ final Map<String, Object> edgePropertyData = (Map<String, Object>) p.get(GraphSONTokens.PROPERTIES);
+ for (Map.Entry<String, Object> epd : edgePropertyData.entrySet()) {
+ vp.property(epd.getKey(), epd.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ return starGraph;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
deleted file mode 100644
index 3d1a16a..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.star;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
-import org.apache.tinkerpop.gremlin.structure.util.Attachable;
-import org.apache.tinkerpop.gremlin.structure.util.Comparators;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
-import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
-import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
-import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
-import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
-import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.function.Function;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StarGraphGraphSONSerializer extends StdSerializer<StarGraphGraphSONSerializer.DirectionalStarGraph> {
- private final boolean normalize;
- public StarGraphGraphSONSerializer(final boolean normalize) {
- super(DirectionalStarGraph.class);
- this.normalize = normalize;
- }
-
- @Override
- public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
- ser(starGraph, jsonGenerator, serializerProvider, null);
- }
-
- @Override
- public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
- ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
- }
-
- private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
- final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
- jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
- if (directionalStarGraph.direction != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
- if (directionalStarGraph.direction != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
- if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
- for (final String k : keys) {
- final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
- jsonGenerator.writeArrayFieldStart(k);
- if (typeSerializer != null) {
- jsonGenerator.writeString(ArrayList.class.getName());
- jsonGenerator.writeStartArray();
- }
-
- final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
- for (final VertexProperty property : vertexProperties) {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
- GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
-
- final Iterator<Property> metaProperties = normalize ?
- IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
- if (metaProperties.hasNext()) {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- while (metaProperties.hasNext()) {
- final Property<Object> meta = metaProperties.next();
- GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
- }
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndArray();
- if (typeSerializer != null) jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndObject();
- }
- }
-
- private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer,
- final Direction direction) throws IOException, JsonProcessingException {
- // only write edges if there are some AND if the user requested them to be serialized AND if they match
- // the direction being serialized by the format
- final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
- final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
- final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
- final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
- && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
- if (writeEdges) {
- jsonGenerator.writeObjectFieldStart(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
- for (final String k : keys) {
- final List<Edge> edges = starEdges.get(k);
- jsonGenerator.writeArrayFieldStart(k);
- if (typeSerializer != null) {
- jsonGenerator.writeString(ArrayList.class.getName());
- jsonGenerator.writeStartArray();
- }
-
- final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
- for (final Edge edge : edgesToWrite) {
- jsonGenerator.writeStartObject();
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
- GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
- direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
- jsonGenerator, serializerProvider, typeSerializer);
-
- final Iterator<Property<Object>> edgeProperties = normalize ?
- IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
- if (edgeProperties.hasNext()) {
- jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- while (edgeProperties.hasNext()) {
- final Property<Object> meta = edgeProperties.next();
- GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
- }
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndObject();
- }
- jsonGenerator.writeEndArray();
- if (typeSerializer != null) jsonGenerator.writeEndArray();
- }
- jsonGenerator.writeEndObject();
- }
- }
-
- /**
- * A helper function for reading vertex edges from a serialized {@link StarGraph} (i.e. a {@link Map}) generated by
- * {@link StarGraphGraphSONSerializer}.
- */
- public static void readStarGraphEdges(final Function<Attachable<Edge>, Edge> edgeMaker,
- final StarGraph starGraph,
- final Map<String, Object> vertexData,
- final String direction) throws IOException {
- final Map<String, List<Map<String,Object>>> edgeDatas = (Map<String, List<Map<String,Object>>>) vertexData.get(direction);
- for (Map.Entry<String, List<Map<String,Object>>> edgeData : edgeDatas.entrySet()) {
- for (Map<String,Object> inner : edgeData.getValue()) {
- final StarGraph.StarEdge starEdge;
- if (direction.equals(GraphSONTokens.OUT_E))
- starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addOutEdge(edgeData.getKey(), starGraph.addVertex(T.id, inner.get(GraphSONTokens.IN)), T.id, inner.get(GraphSONTokens.ID));
- else
- starEdge = (StarGraph.StarEdge) starGraph.getStarVertex().addInEdge(edgeData.getKey(), starGraph.addVertex(T.id, inner.get(GraphSONTokens.OUT)), T.id, inner.get(GraphSONTokens.ID));
-
- if (inner.containsKey(GraphSONTokens.PROPERTIES)) {
- final Map<String, Object> edgePropertyData = (Map<String, Object>) inner.get(GraphSONTokens.PROPERTIES);
- for (Map.Entry<String, Object> epd : edgePropertyData.entrySet()) {
- starEdge.property(epd.getKey(), epd.getValue());
- }
- }
-
- if (edgeMaker != null) edgeMaker.apply(starEdge);
- }
- }
- }
-
- /**
- * A helper function for reading a serialized {@link StarGraph} from a {@link Map} generated by
- * {@link StarGraphGraphSONSerializer}.
- */
- public static StarGraph readStarGraphVertex(final Map<String, Object> vertexData) throws IOException {
- final StarGraph starGraph = StarGraph.open();
- starGraph.addVertex(T.id, vertexData.get(GraphSONTokens.ID), T.label, vertexData.get(GraphSONTokens.LABEL));
- if (vertexData.containsKey(GraphSONTokens.PROPERTIES)) {
- final Map<String, List<Map<String, Object>>> properties = (Map<String, List<Map<String, Object>>>) vertexData.get(GraphSONTokens.PROPERTIES);
- for (Map.Entry<String, List<Map<String, Object>>> property : properties.entrySet()) {
- for (Map<String, Object> p : property.getValue()) {
- final StarGraph.StarVertexProperty vp = (StarGraph.StarVertexProperty) starGraph.getStarVertex().property(VertexProperty.Cardinality.list, property.getKey(), p.get(GraphSONTokens.VALUE), T.id, p.get(GraphSONTokens.ID));
- if (p.containsKey(GraphSONTokens.PROPERTIES)) {
- final Map<String, Object> edgePropertyData = (Map<String, Object>) p.get(GraphSONTokens.PROPERTIES);
- for (Map.Entry<String, Object> epd : edgePropertyData.entrySet()) {
- vp.property(epd.getKey(), epd.getValue());
- }
- }
- }
- }
- }
-
- return starGraph;
- }
-
- private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
- Collections.sort(listToSort, comparator);
- return listToSort;
- }
-
- public static class DirectionalStarGraph {
- private final Direction direction;
- private final StarGraph starGraphToSerialize;
-
- public DirectionalStarGraph(final StarGraph starGraphToSerialize, final Direction direction) {
- this.direction = direction;
- this.starGraphToSerialize = starGraphToSerialize;
- }
-
- public Direction getDirection() {
- return direction;
- }
-
- public StarGraph getStarGraphToSerialize() {
- return starGraphToSerialize;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
new file mode 100644
index 0000000..bbd5591
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV1d0.java
@@ -0,0 +1,167 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV1d0 extends StdSerializer<DirectionalStarGraph> {
+ private final boolean normalize;
+ public StarGraphGraphSONSerializerV1d0(final boolean normalize) {
+ super(DirectionalStarGraph.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(starGraph, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+ if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+ for (final String k : keys) {
+ final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+ jsonGenerator.writeArrayFieldStart(k);
+ if (typeSerializer != null) {
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+ }
+
+ final List<VertexProperty> vertexProperties = normalize ? sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+ for (final VertexProperty property : vertexProperties) {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property> metaProperties = normalize ?
+ IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ if (metaProperties.hasNext()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ while (metaProperties.hasNext()) {
+ final Property<Object> meta = metaProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndArray();
+ if (typeSerializer != null) jsonGenerator.writeEndArray();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ // For some reason, this wasn't closed.
+ jsonGenerator.writeEndObject();
+ }
+
+ private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer,
+ final Direction direction) throws IOException, JsonProcessingException {
+ // only write edges if there are some AND if the user requested them to be serialized AND if they match
+ // the direction being serialized by the format
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+ final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+ final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+ && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+ if (writeEdges) {
+ jsonGenerator.writeObjectFieldStart(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+ for (final String k : keys) {
+ final List<Edge> edges = starEdges.get(k);
+ jsonGenerator.writeArrayFieldStart(k);
+ if (typeSerializer != null) {
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+ }
+
+ final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+ for (final Edge edge : edgesToWrite) {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+ direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+ jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property<Object>> edgeProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (edgeProperties.hasNext()) {
+ jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ while (edgeProperties.hasNext()) {
+ final Property<Object> meta = edgeProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ jsonGenerator.writeEndArray();
+ if (typeSerializer != null) jsonGenerator.writeEndArray();
+ }
+ jsonGenerator.writeEndObject();
+ }
+ }
+
+ static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+ Collections.sort(listToSort, comparator);
+ return listToSort;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
new file mode 100644
index 0000000..2e0bc53
--- /dev/null
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializerV2d0.java
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.util.star;
+
+import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
+import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
+import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
+import org.apache.tinkerpop.shaded.jackson.databind.ser.std.StdSerializer;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.function.Function;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class StarGraphGraphSONSerializerV2d0 extends StdSerializer<DirectionalStarGraph> {
+ private final boolean normalize;
+ public StarGraphGraphSONSerializerV2d0(final boolean normalize) {
+ super(DirectionalStarGraph.class);
+ this.normalize = normalize;
+ }
+
+ @Override
+ public void serialize(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(starGraph, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final DirectionalStarGraph starGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ ser(starGraph, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ private void ser(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, starGraph.starVertex.id, jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeStringField(GraphSONTokens.LABEL, starGraph.starVertex.label);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.IN);
+ if (directionalStarGraph.getDirection() != null) writeEdges(directionalStarGraph, jsonGenerator, serializerProvider, typeSerializer, Direction.OUT);
+ if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(starGraph, jsonGenerator, typeSerializer);
+ final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+ for (final String k : keys) {
+ final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+ jsonGenerator.writeFieldName(k);
+ GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+ final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+ for (final VertexProperty property : vertexProperties) {
+ GraphSONUtil.writeStartObject(property, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property> metaProperties = normalize ?
+ IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
+ if (metaProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(metaProperties, jsonGenerator, typeSerializer);
+
+ while (metaProperties.hasNext()) {
+ final Property<Object> meta = metaProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(metaProperties, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(property, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(starGraph, jsonGenerator, typeSerializer);
+ }
+
+ private void writeEdges(final DirectionalStarGraph directionalStarGraph, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer,
+ final Direction direction) throws IOException, JsonProcessingException {
+ // only write edges if there are some AND if the user requested them to be serialized AND if they match
+ // the direction being serialized by the format
+ final StarGraph starGraph = directionalStarGraph.getStarGraphToSerialize();
+ final Direction edgeDirectionToSerialize = directionalStarGraph.getDirection();
+ final Map<String, List<Edge>> starEdges = direction.equals(Direction.OUT) ? starGraph.starVertex.outEdges : starGraph.starVertex.inEdges;
+ final boolean writeEdges = null != starEdges && edgeDirectionToSerialize != null
+ && (edgeDirectionToSerialize == direction || edgeDirectionToSerialize == Direction.BOTH);
+ if (writeEdges) {
+ jsonGenerator.writeFieldName(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
+ GraphSONUtil.writeStartObject(directionalStarGraph, jsonGenerator, typeSerializer);
+ final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+ for (final String k : keys) {
+ final List<Edge> edges = starEdges.get(k);
+ jsonGenerator.writeFieldName(k);
+ GraphSONUtil.writeStartArray(k, jsonGenerator, typeSerializer);
+
+ final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+ for (final Edge edge : edgesToWrite) {
+ GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+ GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
+ GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
+ direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
+ jsonGenerator, serializerProvider, typeSerializer);
+
+ final Iterator<Property<Object>> edgeProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (edgeProperties.hasNext()) {
+ jsonGenerator.writeFieldName(GraphSONTokens.PROPERTIES);
+ GraphSONUtil.writeStartObject(edge, jsonGenerator, typeSerializer);
+ while (edgeProperties.hasNext()) {
+ final Property<Object> meta = edgeProperties.next();
+ GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(edge, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndArray(k, jsonGenerator, typeSerializer);
+ }
+ GraphSONUtil.writeEndObject(directionalStarGraph, jsonGenerator, typeSerializer);
+ }
+ }
+
+ private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+ Collections.sort(listToSort, comparator);
+ return listToSort;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b44ec666/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
new file mode 100644
index 0000000..6b5f7e9
--- /dev/null
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
@@ -0,0 +1,292 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.structure.io.graphson;
+
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.time.*;
+import java.util.*;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests automatic typed serialization/deserialization for GraphSON 2.0.
+ */
+public class GraphSONMapperV2d0PartialEmbeddedTypeTest {
+
+ private final ObjectMapper mapper = GraphSONMapper.build()
+ .version(GraphSONVersion.V2_0)
+ .typeInfo(GraphSONMapper.TypeInfo.PARTIAL_TYPES)
+ .create()
+ .createMapper();
+
+ @Test
+ public void shouldHandleDuration()throws Exception {
+ final Duration o = Duration.ZERO;
+ assertEquals(o, serializeDeserialize(o, Duration.class));
+ }
+ @Test
+ public void shouldHandleInstant()throws Exception {
+ final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
+ assertEquals(o, serializeDeserialize(o, Instant.class));
+ }
+
+ @Test
+ public void shouldHandleLocalDate()throws Exception {
+ final LocalDate o = LocalDate.now();
+ assertEquals(o, serializeDeserialize(o, LocalDate.class));
+ }
+
+ @Test
+ public void shouldHandleLocalDateTime()throws Exception {
+ final LocalDateTime o = LocalDateTime.now();
+ assertEquals(o, serializeDeserialize(o, LocalDateTime.class));
+ }
+
+ @Test
+ public void shouldHandleLocalTime()throws Exception {
+ final LocalTime o = LocalTime.now();
+ assertEquals(o, serializeDeserialize(o, LocalTime.class));
+ }
+
+ @Test
+ public void shouldHandleMonthDay()throws Exception {
+ final MonthDay o = MonthDay.now();
+ assertEquals(o, serializeDeserialize(o, MonthDay.class));
+ }
+
+ @Test
+ public void shouldHandleOffsetDateTime()throws Exception {
+ final OffsetDateTime o = OffsetDateTime.now();
+ assertEquals(o, serializeDeserialize(o, OffsetDateTime.class));
+ }
+
+ @Test
+ public void shouldHandleOffsetTime()throws Exception {
+ final OffsetTime o = OffsetTime.now();
+ assertEquals(o, serializeDeserialize(o, OffsetTime.class));
+ }
+
+ @Test
+ public void shouldHandlePeriod()throws Exception {
+ final Period o = Period.ofDays(3);
+ assertEquals(o, serializeDeserialize(o, Period.class));
+ }
+
+ @Test
+ public void shouldHandleYear()throws Exception {
+ final Year o = Year.now();
+ assertEquals(o, serializeDeserialize(o, Year.class));
+ }
+
+ @Test
+ public void shouldHandleYearMonth()throws Exception {
+ final YearMonth o = YearMonth.now();
+ assertEquals(o, serializeDeserialize(o, YearMonth.class));
+ }
+
+ @Test
+ public void shouldHandleZonedDateTime()throws Exception {
+ final ZonedDateTime o = ZonedDateTime.now();
+ assertEquals(o, serializeDeserialize(o, ZonedDateTime.class));
+ }
+
+ @Test
+ public void shouldHandleZonedOffset()throws Exception {
+ final ZoneOffset o = ZonedDateTime.now().getOffset();
+ assertEquals(o, serializeDeserialize(o, ZoneOffset.class));
+ }
+
+ @Test
+ public void shouldHandleDurationAuto() throws Exception {
+ final Duration o = Duration.ZERO;
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleInstantAuto() throws Exception {
+ final Instant o = Instant.ofEpochMilli(System.currentTimeMillis());
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleLocalDateAuto() throws Exception {
+ final LocalDate o = LocalDate.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleLocalDateTimeAuto() throws Exception {
+ final LocalDateTime o = LocalDateTime.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleLocalTimeAuto() throws Exception {
+ final LocalTime o = LocalTime.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleMonthDayAuto() throws Exception {
+ final MonthDay o = MonthDay.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleOffsetDateTimeAuto() throws Exception {
+ final OffsetDateTime o = OffsetDateTime.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleOffsetTimeAuto() throws Exception {
+ final OffsetTime o = OffsetTime.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandlePeriodAuto() throws Exception {
+ final Period o = Period.ofDays(3);
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleYearAuto() throws Exception {
+ final Year o = Year.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleYearMonthAuto() throws Exception {
+ final YearMonth o = YearMonth.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleZonedDateTimeAuto() throws Exception {
+ final ZonedDateTime o = ZonedDateTime.now();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldHandleZonedOffsetAuto() throws Exception {
+ final ZoneOffset o = ZonedDateTime.now().getOffset();
+ assertEquals(o, serializeDeserializeAuto(o));
+ }
+
+ @Test
+ public void shouldSerializeDeserializeNestedCollectionsAndMapAndTypedValuesCorrectly() throws Exception {
+ UUID uuid = UUID.randomUUID();
+ List myList = new ArrayList<>();
+
+ List myList2 = new ArrayList<>();
+ myList2.add(UUID.randomUUID());
+ myList2.add(33L);
+ myList2.add(84);
+ Map map2 = new HashMap<>();
+ map2.put("eheh", UUID.randomUUID());
+ map2.put("normal", "normal");
+ myList2.add(map2);
+
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("hello", "world");
+ map1.put("test", uuid);
+ map1.put("hehe", myList2);
+ myList.add(map1);
+
+ myList.add("kjkj");
+ myList.add(UUID.randomUUID());
+
+ assertEquals(myList, serializeDeserializeAuto(myList));
+ }
+
+ @Test
+ public void shouldFailIfTypeSpecifiedIsNotSameTypeInPayload() {
+ final ZoneOffset o = ZonedDateTime.now().getOffset();
+ final ByteArrayOutputStream stream = new ByteArrayOutputStream();
+ try {
+ mapper.writeValue(stream, o);
+ final InputStream inputStream = new ByteArrayInputStream(stream.toByteArray());
+ // What has been serialized is a ZoneOffset with the type, but the user explicitly requires another type.
+ mapper.readValue(inputStream, Instant.class);
+ fail("Should have failed decoding the value");
+ } catch (Exception e) {
+ assertThat(e.getMessage(), containsString("Could not deserialize the JSON value as required. Cannot deserialize the value with the detected type contained in the JSON (\"ZoneOffset\") to the type specified in parameter to the object mapper (class java.time.Instant). Those types are incompatible."));
+ }
+ }
+
+ @Test
+ public void shouldHandleRawPOJOs() throws Exception {
+ final FunObject funObject = new FunObject();
+ funObject.setVal("test");
+ assertEquals(funObject.toString(), serializeDeserialize(funObject, FunObject.class).toString());
+ assertEquals(funObject.getClass(), serializeDeserialize(funObject, FunObject.class).getClass());
+ }
+
+
+ // Class needs to be defined as statics as it's a nested class.
+ public static class FunObject {
+ private String val;
+
+ public FunObject() {
+ }
+
+ public String getVal() {
+ return this.val;
+ }
+
+ public void setVal(String s) {
+ this.val = s;
+ }
+
+ public String toString() {
+ return this.val;
+ }
+ }
+
+ public <T> T serializeDeserialize(final Object o, final Class<T> clazz) throws Exception {
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ mapper.writeValue(stream, o);
+
+ try (final InputStream inputStream = new ByteArrayInputStream(stream.toByteArray())) {
+ return mapper.readValue(inputStream, clazz);
+ }
+ }
+ }
+
+ public <T> T serializeDeserializeAuto(final Object o) throws Exception {
+ try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+ mapper.writeValue(stream, o);
+
+ try (final InputStream inputStream = new ByteArrayInputStream(stream.toByteArray())) {
+ // Object.class is the wildcard that triggers the auto discovery.
+ return (T)mapper.readValue(inputStream, Object.class);
+ }
+ }
+ }
+
+}
[25/50] [abbrv] tinkerpop git commit: removed NOTE: Neo4jGraph
currently does not support HA and added an image for the HA section. CTR.
Posted by sp...@apache.org.
removed NOTE: Neo4jGraph currently does not support HA and added an image for the HA section. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da26cf18
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da26cf18
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da26cf18
Branch: refs/heads/TINKERPOP-1274
Commit: da26cf1862b7827223205c5410731c96d3cca70a
Parents: b2cf6d8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 17 07:33:37 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 17 07:33:37 2016 -0600
----------------------------------------------------------------------
.../reference/implementations-neo4j.asciidoc | 5 +-
docs/static/images/neo4j-ha.png | Bin 0 -> 108249 bytes
docs/static/images/tinkerpop3.graffle | 23433 ++++++++---------
3 files changed, 11624 insertions(+), 11814 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da26cf18/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index 998eb74..d1fc30b 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -54,9 +54,6 @@ gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
----
-NOTE: Neo4j link:http://docs.neo4j.org/chunked/stable/ha.html[High Availability] is currently not supported by
-Neo4j-Gremlin.
-
TIP: To host Neo4j in <<gremlin-server,Gremlin Server>>, the dependencies must first be "installed" or otherwise
copied to the Gremlin Server path. The automated method for doing this would be to execute
`bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z`.
@@ -263,7 +260,7 @@ gremlin.neo4j.conf.relationship_auto_indexing=true
High Availability Configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-TinkerPop supports running Neo4j with its fault tolerant master-slave replication configuration, referred to as its
+image:neo4j-ha.png[width=400,float=right] TinkerPop supports running Neo4j with its fault tolerant master-slave replication configuration, referred to as its
link:http://neo4j.com/docs/operations-manual/current/#_neo4j_cluster_install[High Availability (HA) cluster]. From the
TinkerPop perspective, configuring for HA is not that different than configuring for embedded mode as shown above. The
main difference is the usage of HA configuration options that enable the cluster. Once connected to a cluster, usage
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da26cf18/docs/static/images/neo4j-ha.png
----------------------------------------------------------------------
diff --git a/docs/static/images/neo4j-ha.png b/docs/static/images/neo4j-ha.png
new file mode 100644
index 0000000..b21393c
Binary files /dev/null and b/docs/static/images/neo4j-ha.png differ
[32/50] [abbrv] tinkerpop git commit: Force startedIterating before
sleep
Posted by sp...@apache.org.
Force startedIterating before sleep
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0787e460
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0787e460
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0787e460
Branch: refs/heads/TINKERPOP-1274
Commit: 0787e46097cc09bb278ac1c787c4a50ece81cdb0
Parents: 82afed3
Author: Bryn Cooke <br...@gmail.com>
Authored: Mon Jun 27 22:14:37 2016 +0100
Committer: Bryn Cooke <br...@gmail.com>
Committed: Mon Jun 27 23:18:17 2016 +0100
----------------------------------------------------------------------
.../gremlin/process/traversal/TraversalInterruptionTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0787e460/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionTest.java
index c508df2..b0da10e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalInterruptionTest.java
@@ -76,10 +76,9 @@ public class TraversalInterruptionTest extends AbstractGremlinProcessTest {
final CountDownLatch startedIterating = new CountDownLatch(1);
final Thread t = new Thread(() -> {
try {
- final AtomicBoolean first = new AtomicBoolean(true);
final Traversal traversal = traversalAfterPause.apply(traversalBeforePause.apply(g).sideEffect(traverser -> {
// let the first iteration flow through
- if (!first.compareAndSet(true, false)) {
+ if (startedIterating.getCount() == 0) {
// ensure that the whole traversal doesn't iterate out before we get a chance to interrupt
// the next iteration should stop so we can force the interrupt to be handled by VertexStep
try {
[07/50] [abbrv] tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1332
Posted by sp...@apache.org.
Merge branch 'master' into TINKERPOP-1332
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4771b6c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4771b6c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4771b6c
Branch: refs/heads/TINKERPOP-1274
Commit: a4771b6c9f8c02a94f4735fea20b82d0ab1e1671
Parents: fc62efe c1b4dae
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Jun 15 07:07:52 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jun 15 07:07:52 2016 -0600
----------------------------------------------------------------------
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[23/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b2cf6d87
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b2cf6d87
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b2cf6d87
Branch: refs/heads/TINKERPOP-1274
Commit: b2cf6d8717a70148f0a9595217c30e6d2158afb4
Parents: 668bee3 45e19af
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jun 17 06:25:30 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jun 17 06:25:30 2016 -0400
----------------------------------------------------------------------
.../reference/implementations-neo4j.asciidoc | 74 ++++++++++++++++++++
1 file changed, 74 insertions(+)
----------------------------------------------------------------------