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 2020/05/19 13:40:10 UTC
[tinkerpop] branch master updated (de29e8c -> 98956ea)
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 de29e8c Merge branch 'TINKERPOP-1682'
new dd6b076 Added test assertions for boolean/string in GraphSON 3.0
new 45749cf Merge branch '3.3-dev' into 3.4-dev
new 98956ea Merge branch '3.4-dev'
The 3 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:
docs/src/dev/io/graphson.asciidoc | 3 ++-
.../io/graphson/GraphSONMapperEmbeddedTypeTest.java | 16 ++++++++++++++++
.../driver/ser/GraphSONMessageSerializerV3d0Test.java | 4 +++-
3 files changed, 21 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch '3.4-dev'
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 98956ea76153d28b1241a9b23bd79ae6cc6f4d6c
Merge: de29e8c 45749cf
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue May 19 09:39:52 2020 -0400
Merge branch '3.4-dev'
docs/src/dev/io/graphson.asciidoc | 3 ++-
.../io/graphson/GraphSONMapperEmbeddedTypeTest.java | 16 ++++++++++++++++
.../driver/ser/GraphSONMessageSerializerV3d0Test.java | 4 +++-
3 files changed, 21 insertions(+), 2 deletions(-)
[tinkerpop] 02/03: Merge branch '3.3-dev' into 3.4-dev
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 45749cf33756dcb688e72f29eb6bf4d70c794d0c
Merge: c197ad6 dd6b076
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue May 19 09:23:26 2020 -0400
Merge branch '3.3-dev' into 3.4-dev
docs/src/dev/io/graphson.asciidoc | 3 ++-
.../io/graphson/GraphSONMapperEmbeddedTypeTest.java | 16 ++++++++++++++++
.../driver/ser/GraphSONMessageSerializerV3d0Test.java | 4 +++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index f7dce28,7753219..d23bc9a
--- 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
@@@ -88,9 -86,25 +88,25 @@@ public class GraphSONMapperEmbeddedType
public String version;
@Test
+ public void shouldHandleBoolean() throws Exception {
+ assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+
+ final boolean b = true;
+ assertEquals(b, serializeDeserialize(mapper, b, Boolean.class));
+ }
+
+ @Test
+ public void shouldHandleString() throws Exception {
+ assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+
+ final String s = "simple";
+ assertEquals(s, serializeDeserialize(mapper, s, String.class));
+ }
+
+ @Test
public void shouldHandleTraversalExplanation() throws Exception {
assumeThat(version, not(startsWith("v1")));
-
+
final TraversalExplanation o = __().out().outV().outE().explain();
final TraversalExplanation deser = serializeDeserialize(mapper, o, TraversalExplanation.class);
assertEquals(o.prettyPrint(), deser.prettyPrint());
[tinkerpop] 01/03: Added test assertions for boolean/string in
GraphSON 3.0
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 dd6b07631743c140c6fc00ac2e0cec99b106b760
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue May 19 09:22:05 2020 -0400
Added test assertions for boolean/string in GraphSON 3.0
---
docs/src/dev/io/graphson.asciidoc | 3 ++-
.../io/graphson/GraphSONMapperEmbeddedTypeTest.java | 16 ++++++++++++++++
.../driver/ser/GraphSONMessageSerializerV3d0Test.java | 4 +++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index 5e3d030..732ddda 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -3818,7 +3818,8 @@ Version 3.0 of GraphSON was first introduced on TinkerPop 3.3.0 and is the defau
version. It is quite similar to GraphSON 2.0 and in most cases will appear compatible to the eye, however there are
some critical differences:
-* GraphSON 3.0 does not have an option to be typeless. Types are always embedded.
+* GraphSON 3.0 does not have an option to be typeless. Types are always embedded except for strings and boolean values
+which are inferred from JSON types.
* GraphSON 2.0 relied on JSON data types for collections like `Map` and `List`. In GraphSON 3.0, there is explicit
typed support for `Map`, `List` and `Set` as Gremlin relies on those types in quite specific ways that are not
directly compatible with the JSON definitions of those collections. In the case of `List` and `Set`, it was important
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 6c27770..7753219 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
@@ -86,6 +86,22 @@ public class GraphSONMapperEmbeddedTypeTest extends AbstractGraphSONTest {
public String version;
@Test
+ public void shouldHandleBoolean() throws Exception {
+ assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+
+ final boolean b = true;
+ assertEquals(b, serializeDeserialize(mapper, b, Boolean.class));
+ }
+
+ @Test
+ public void shouldHandleString() throws Exception {
+ assumeThat(version, either(startsWith("v2")).or(startsWith("v3")));
+
+ final String s = "simple";
+ assertEquals(s, serializeDeserialize(mapper, s, String.class));
+ }
+
+ @Test
public void shouldHandleTraversalExplanation() throws Exception {
assumeThat(version, not(startsWith("v1")));
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
index 88dfcf0..c6b5926 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV3d0Test.java
@@ -101,6 +101,7 @@ public class GraphSONMessageSerializerV3d0Test {
final Map<String, String> innerMap = new HashMap<>();
innerMap.put("a", "b");
+ map.put("w", true);
map.put("x", 1);
map.put("y", "some");
map.put("z", innerMap);
@@ -109,7 +110,8 @@ public class GraphSONMessageSerializerV3d0Test {
assertCommon(response);
final Map<String, Object> deserializedMap = (Map<String, Object>) response.getResult().getData();
- assertEquals(3, deserializedMap.size());
+ assertEquals(4, deserializedMap.size());
+ assertEquals(true, deserializedMap.get("w"));
assertEquals(1, deserializedMap.get("x"));
assertEquals("some", deserializedMap.get("y"));