You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/12/21 13:00:40 UTC
[tinkerpop] branch master updated (b850428 -> 8f9da19)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from b850428 Merge branch 'tp33'
new fb734ea Fixed bug preventing TraversalExplanation from serializing with GraphSON CTR
new 8f9da19 Merge branch 'tp33'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java | 2 ++
.../gremlin/structure/io/graphson/GraphSONSerializersV2d0.java | 2 +-
.../gremlin/structure/io/graphson/GraphSONSerializersV3d0.java | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
[tinkerpop] 02/02: Merge branch 'tp33'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 8f9da19926d4affb4a06597a8bf5c349936c4f27
Merge: b850428 fb734ea
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Dec 21 08:00:25 2018 -0500
Merge branch 'tp33'
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java | 2 ++
.../gremlin/structure/io/graphson/GraphSONSerializersV2d0.java | 2 +-
.../gremlin/structure/io/graphson/GraphSONSerializersV3d0.java | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index e853cf4,876d6d2..844897d
--- 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
@@@ -141,9 -138,9 +141,10 @@@ abstract class GraphSONModule extends T
put(VertexProperty.class, "VertexProperty");
put(Metrics.class, "Metrics");
put(TraversalMetrics.class, "TraversalMetrics");
+ put(TraversalExplanation.class, "TraversalExplanation");
put(Traverser.class, "Traverser");
put(Tree.class, "Tree");
+ put(BulkSet.class, "BulkSet");
put(Bytecode.class, "Bytecode");
put(Bytecode.Binding.class, "Binding");
put(AndP.class, "P");
[tinkerpop] 01/02: Fixed bug preventing TraversalExplanation from
serializing with GraphSON CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit fb734ea8210b6d0fdfbe09e085302be014822d34
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Dec 21 08:00:05 2018 -0500
Fixed bug preventing TraversalExplanation from serializing with GraphSON CTR
---
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java | 2 ++
.../gremlin/structure/io/graphson/GraphSONSerializersV2d0.java | 2 +-
.../gremlin/structure/io/graphson/GraphSONSerializersV3d0.java | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 152e81a..2c4ffa3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -43,6 +43,7 @@ This release also includes changes from <<release-3-2-11, 3.2.11>>.
* Added `AnonymousTraversalSource` which provides a more unified means of constructing a `TraversalSource`.
* Added `DriverRemoteConnection.using(Client)` to provide users better control over the number of connections being created.
* Changed behavior of GraphSON deserializer in gremlin-python such that `g:Set` returns a Python `Set`.
+* Fixed bug that prevented `TraversalExplanation` from serializing properly with GraphSON.
* Changed behavior of `iterate()` in Python, Javascript and .NET to send `none()` thus avoiding unnecessary results being returned.
* Provided for a configurable class map cache in the `GremlinGroovyScriptEngine` and exposed that in Gremlin Server.
* `GraphProvider` instances can be annotated with `OptOut` configurations that will be applied in addition to the `OptOut` instances on a `Graph`.
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 39f1927..876d6d2 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
@@ -138,6 +138,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
put(VertexProperty.class, "VertexProperty");
put(Metrics.class, "Metrics");
put(TraversalMetrics.class, "TraversalMetrics");
+ put(TraversalExplanation.class, "TraversalExplanation");
put(Traverser.class, "Traverser");
put(Tree.class, "Tree");
put(Bytecode.class, "Bytecode");
@@ -352,6 +353,7 @@ abstract class GraphSONModule extends TinkerPopJacksonModule {
put(VertexProperty.class, "VertexProperty");
put(Metrics.class, "Metrics");
put(TraversalMetrics.class, "TraversalMetrics");
+ put(TraversalExplanation.class, "TraversalExplanation");
put(Traverser.class, "Traverser");
put(Tree.class, "Tree");
put(Bytecode.class, "Bytecode");
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 24cd3fc..6638853 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
@@ -286,7 +286,7 @@ class GraphSONSerializersV2d0 {
}
}
- final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+ final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
public TraversalExplanationJacksonSerializer() {
super(TraversalExplanation.class);
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
index 8d80478..0cc4ead 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java
@@ -285,7 +285,7 @@ class GraphSONSerializersV3d0 {
}
}
- final static class TraversalExplanationJacksonSerializer extends StdSerializer<TraversalExplanation> {
+ final static class TraversalExplanationJacksonSerializer extends StdScalarSerializer<TraversalExplanation> {
public TraversalExplanationJacksonSerializer() {
super(TraversalExplanation.class);
}