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/09/12 10:33:11 UTC
[1/4] tinkerpop git commit: Fix serialization of InetAddress with
GraphSON 2.0.
Repository: tinkerpop
Updated Branches:
refs/heads/master 920a902b2 -> a1ba98831
Fix serialization of InetAddress with 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/a056a13e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a056a13e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a056a13e
Branch: refs/heads/master
Commit: a056a13e08ad0985be4a36f36bfb547d3d85c5bc
Parents: ec76c26
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Fri Sep 9 19:03:49 2016 +0100
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Fri Sep 9 19:32:44 2016 +0100
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONTypeSerializer.java | 3 +++
.../gremlin/structure/io/graphson/GraphSONXModuleV2d0.java | 2 ++
.../structure/TinkerGraphGraphSONSerializerV2d0Test.java | 5 +++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a056a13e/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
index 1f6f07d..d1a70af 100644
--- 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
@@ -33,6 +33,7 @@ import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
import java.io.IOException;
+import java.net.InetAddress;
import java.nio.ByteBuffer;
/**
@@ -193,6 +194,8 @@ public class GraphSONTypeSerializer extends TypeSerializer {
return Property.class;
} else if (ByteBuffer.class.isAssignableFrom(c)) {
return ByteBuffer.class;
+ } else if (InetAddress.class.isAssignableFrom(c)) {
+ return InetAddress.class;
} else if (Traverser.class.isAssignableFrom(c)) {
return Traverser.class;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a056a13e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
index 5e7a9aa..336d11c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONXModuleV2d0.java
@@ -24,6 +24,7 @@ package org.apache.tinkerpop.gremlin.structure.io.graphson;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.Instant;
@@ -55,6 +56,7 @@ public final class GraphSONXModuleV2d0 extends GraphSONModule {
put(BigDecimal.class, "BigDecimal");
put(Byte.class, "Byte");
put(Character.class, "Char");
+ put(InetAddress.class, "InetAddress");
// Time serializers/deserializers
put(Duration.class, "Duration");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a056a13e/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 d6eda48..6d39838 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
@@ -44,6 +44,7 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.LocalDateTime;
@@ -227,6 +228,7 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
final Duration durationProp = Duration.ofHours(3);
final Long longProp = 2L;
final ByteBuffer byteBufferProp = ByteBuffer.wrap("testbb".getBytes());
+ final InetAddress inetAddressProp = InetAddress.getByName("10.10.10.10");
// One Java util type natively supported by Jackson
v.property("uuid", uuidProp);
@@ -236,6 +238,8 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
v.property("long", longProp);
// One Java util type added by GraphSON
v.property("bytebuffer", byteBufferProp);
+ v.property("inetaddress", inetAddressProp);
+
final GraphWriter writer = getWriter(defaultMapperV2d0);
final GraphReader reader = getReader(defaultMapperV2d0);
@@ -249,6 +253,7 @@ public class TinkerGraphGraphSONSerializerV2d0Test {
assertEquals(vRead.property("duration").value(), durationProp);
assertEquals(vRead.property("long").value(), longProp);
assertEquals(vRead.property("bytebuffer").value(), byteBufferProp);
+ assertEquals(vRead.property("inetaddress").value(), inetAddressProp);
}
}
[4/4] tinkerpop git commit: Prepare upgrade docs for 3.2.3 CTR
Posted by sp...@apache.org.
Prepare upgrade docs for 3.2.3 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a1ba9883
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a1ba9883
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a1ba9883
Branch: refs/heads/master
Commit: a1ba988310461beab66eeed5656e408071005beb
Parents: 74b4ee0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:32:50 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:32:50 2016 -0400
----------------------------------------------------------------------
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/a1ba9883/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 fd75072..873cdc8 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -22,6 +22,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Nine Inch Gremlins*
+TinkerPop 3.2.3
+---------------
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.3/CHANGELOG.asciidoc#release-3-2-3[changelog] for a complete list of all the modifications that are part of this release.
+
TinkerPop 3.2.2
---------------
[3/4] tinkerpop git commit: Prepare CHANGELOG for 3.2.3 CTR
Posted by sp...@apache.org.
Prepare CHANGELOG for 3.2.3 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/74b4ee08
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74b4ee08
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74b4ee08
Branch: refs/heads/master
Commit: 74b4ee0810b214297b19b627ff09ef6dd22e265c
Parents: 11915f7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:31:40 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:31:53 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74b4ee08/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c32a98c..64c2155 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,6 +22,12 @@ TinkerPop 3.2.0 (Nine Inch Gremlins)
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+[[release-3-2-3]]
+TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Added missing `InetAddress` to GraphSON extension module.
+
[[release-3-2-2]]
TinkerPop 3.2.2 (Release Date: September 6, 2016)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[2/4] tinkerpop git commit: Merge branch 'pr-403'
Posted by sp...@apache.org.
Merge branch 'pr-403'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11915f73
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11915f73
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11915f73
Branch: refs/heads/master
Commit: 11915f73ebaadccaacf9258ef141d2cb3dd719a9
Parents: 920a902 a056a13
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:28:32 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:28:32 2016 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONTypeSerializer.java | 3 +++
.../gremlin/structure/io/graphson/GraphSONXModuleV2d0.java | 2 ++
.../structure/TinkerGraphGraphSONSerializerV2d0Test.java | 5 +++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------