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/08/22 20:40:29 UTC
[44/48] tinkerpop git commit: Merge branch 'pr-386'
Merge branch 'pr-386'
Conflicts:
CHANGELOG.asciidoc
gremlin-server/conf/gremlin-server-min.yaml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de139edd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de139edd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de139edd
Branch: refs/heads/TINKERPOP-1278
Commit: de139edd78e7ecc85ffebca836410b0f60e3bb38
Parents: e50f716 115eb3c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 22 12:54:40 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 22 12:54:40 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
data/grateful-dead-typed.json | 422 +++++-----
data/grateful-dead-v2d0-typed.json | 808 +++++++++++++++++++
data/grateful-dead-v2d0.json | 808 +++++++++++++++++++
data/grateful-dead.json | 422 +++++-----
data/tinkerpop-classic-v2d0-typed.json | 6 +
data/tinkerpop-classic-v2d0.json | 6 +
data/tinkerpop-crew-v2d0-typed.json | 6 +
data/tinkerpop-crew-v2d0.json | 6 +
data/tinkerpop-modern-v2d0-typed.json | 6 +
data/tinkerpop-modern-v2d0.json | 6 +
docs/src/reference/the-graph.asciidoc | 139 +++-
.../upgrade/release-3.2.x-incubating.asciidoc | 20 +
.../traversal/util/DefaultTraversalMetrics.java | 8 +
.../process/traversal/util/MutableMetrics.java | 12 +
.../structure/io/graphson/GraphSONMapper.java | 167 +++-
.../structure/io/graphson/GraphSONModule.java | 232 +++++-
.../structure/io/graphson/GraphSONReader.java | 8 +-
.../io/graphson/GraphSONSerializerProvider.java | 15 +-
.../io/graphson/GraphSONSerializers.java | 465 -----------
.../io/graphson/GraphSONSerializersV1d0.java | 465 +++++++++++
.../io/graphson/GraphSONSerializersV2d0.java | 580 +++++++++++++
.../structure/io/graphson/GraphSONTokens.java | 3 +
.../io/graphson/GraphSONTypeDeserializer.java | 229 ++++++
.../io/graphson/GraphSONTypeIdResolver.java | 108 +++
.../graphson/GraphSONTypeResolverBuilder.java | 65 ++
.../io/graphson/GraphSONTypeSerializer.java | 197 +++++
.../structure/io/graphson/GraphSONUtil.java | 37 +
.../structure/io/graphson/GraphSONVersion.java | 3 +-
.../structure/io/graphson/GraphSONWriter.java | 11 +-
.../io/graphson/JavaTimeSerializers.java | 326 --------
.../io/graphson/JavaTimeSerializersV1d0.java | 326 ++++++++
.../io/graphson/JavaTimeSerializersV2d0.java | 323 ++++++++
.../io/graphson/JavaUtilSerializers.java | 86 --
.../io/graphson/JavaUtilSerializersV1d0.java | 86 ++
.../io/graphson/JavaUtilSerializersV2d0.java | 87 ++
.../structure/io/graphson/JsonParserConcat.java | 83 ++
.../io/graphson/LegacyGraphSONReader.java | 4 +-
.../io/graphson/TinkerPopJacksonModule.java | 48 ++
.../io/graphson/ToStringGraphSONSerializer.java | 41 +
.../gremlin/structure/io/graphson/TypeInfo.java | 29 +
.../structure/util/detached/DetachedEdge.java | 11 +-
.../structure/util/detached/DetachedVertex.java | 10 +-
.../util/star/DirectionalStarGraph.java | 39 +
.../star/StarGraphGraphSONDeserializer.java | 91 +++
.../util/star/StarGraphGraphSONSerializer.java | 250 ------
.../star/StarGraphGraphSONSerializerV1d0.java | 178 ++++
.../star/StarGraphGraphSONSerializerV2d0.java | 165 ++++
.../GraphSONMapperEmbeddedTypeTest.java | 55 +-
.../io/graphson/GraphSONMapperTest.java | 17 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 344 ++++++++
.../AbstractGraphSONMessageSerializerV2d0.java | 248 ++++++
.../GraphSONMessageSerializerGremlinV2d0.java | 69 ++
.../ser/GraphSONMessageSerializerV2d0.java | 125 +++
.../tinkerpop/gremlin/driver/ser/SerTokens.java | 1 +
...raphSONMessageSerializerGremlinTestV1d0.java | 334 ++++++++
...raphSONMessageSerializerGremlinTestV2d0.java | 341 ++++++++
...raphSONMessageSerializerGremlinV1d0Test.java | 334 --------
.../ser/GraphSONMessageSerializerV1d0Test.java | 9 +-
.../ser/GraphSONMessageSerializerV2d0Test.java | 507 ++++++++++++
gremlin-server/conf/gremlin-server-classic.yaml | 2 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 1 +
.../conf/gremlin-server-rest-modern.yaml | 1 +
.../conf/gremlin-server-rest-secure.yaml | 1 +
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/data/sample.kryo | Bin 2416053 -> 2436147 bytes
.../server/GremlinServerHttpIntegrateTest.java | 22 +
.../remote/gremlin-server-integration.yaml | 1 +
.../server/gremlin-server-integration.yaml | 1 +
.../io/graphson/grateful-dead-typed.json | 422 +++++-----
.../io/graphson/grateful-dead-v2d0-typed.json | 808 +++++++++++++++++++
.../io/graphson/grateful-dead-v2d0.json | 808 +++++++++++++++++++
.../structure/io/graphson/grateful-dead.json | 422 +++++-----
.../tinkerpop-classic-normalized-v2d0.json | 6 +
.../graphson/tinkerpop-classic-v2d0-typed.json | 6 +
.../io/graphson/tinkerpop-classic-v2d0.json | 6 +
.../io/graphson/tinkerpop-crew-v2d0-typed.json | 6 +
.../io/graphson/tinkerpop-crew-v2d0.json | 6 +
.../tinkerpop-modern-normalized-v2d0.json | 6 +
.../graphson/tinkerpop-modern-v2d0-typed.json | 6 +
.../io/graphson/tinkerpop-modern-v2d0.json | 6 +
tinkergraph-gremlin/pom.xml | 4 +-
.../structure/TinkerIoRegistryV2d0.java | 213 +++++
.../structure/IoDataGenerationTest.java | 115 ++-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 557 +++++++++++++
87 files changed, 10841 insertions(+), 2417 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de139edd/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 8117c12,f4515b7..5f49bea
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,8 +26,9 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
+ * Introduced GraphSON 2.0.
+ * Deprecated `embedTypes` on the builder for `GraphSONMapper`.
* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.