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 2017/07/18 13:09:24 UTC
[47/50] [abbrv] tinkerpop git commit: TINKERPOP-1552 Fully defaulted
to GraphSON 2.x for gremlin .net
TINKERPOP-1552 Fully defaulted to GraphSON 2.x for gremlin .net
I thought I'd gotten all of those references to GraphSON 3.x reverted to 2.x before but I guess I'd missed a couple. It looks like we've copied the pattern gremlin-python has for its driver. I'm not sure I see the point of specifying a different reader/writer version. I tend to think that version should be driven purely by some specified mime type, but that's a different issue for sure. at least all tests are passing now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/202617d3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/202617d3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/202617d3
Branch: refs/heads/master
Commit: 202617d3c7b8242faf7e49375776c1531867325c
Parents: ab1dc62
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 18 08:56:22 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 18 08:56:22 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs | 4 ++--
.../Structure/IO/GraphSON/RequestMessageSerializer.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/202617d3/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
index 5db58e9..064770f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs
@@ -51,8 +51,8 @@ namespace Gremlin.Net.Driver
public GremlinClient(GremlinServer gremlinServer, GraphSONReader graphSONReader = null,
GraphSONWriter graphSONWriter = null, string mimeType = null)
{
- var reader = graphSONReader ?? new GraphSON3Reader();
- var writer = graphSONWriter ?? new GraphSON3Writer();
+ var reader = graphSONReader ?? new GraphSON2Reader();
+ var writer = graphSONWriter ?? new GraphSON2Writer();
var connectionFactory = new ConnectionFactory(gremlinServer, reader, writer, mimeType ?? DefaultMimeType);
_connectionPool = new ConnectionPool(connectionFactory);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/202617d3/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/RequestMessageSerializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/RequestMessageSerializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/RequestMessageSerializer.cs
index b796423..396de01 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/RequestMessageSerializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/RequestMessageSerializer.cs
@@ -33,7 +33,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
RequestMessage msg = objectData;
return new Dictionary<string, dynamic>
{
- {"requestId", writer.ToDict(msg.RequestId)},
+ {"requestId", msg.RequestId},
{"op", msg.Operation},
{"processor", msg.Processor},
{"args", writer.ToDict(msg.Arguments)}