Fixes
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80f3dd3f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80f3dd3f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80f3dd3f Branch: refs/heads/TINKERPOP-1730 Commit: 80f3dd3f8374e46a07a7fa49da420647f9c6cf08 Parents: a60e7d3 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Tue Sep 12 12:16:26 2017 +0200 Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com> Committed: Wed Sep 20 12:19:30 2017 +0200 ---------------------------------------------------------------------- gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs | 2 +- gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs | 2 +- .../src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs | 3 +-- .../Process/Traversal/DriverRemoteConnection/SideEffectTests.cs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs index 602b013..f1cb3ad 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseMessage.cs @@ -35,6 +35,6 @@ namespace Gremlin.Net.Driver.Messages public ResponseStatus Status { get; set; } [JsonProperty(PropertyName = "result")] - public ResponseResult<T> Result { get; set; } + public ResponseResult Result { get; set; } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs index 1fc8f7a..848473b 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Messages/ResponseResult.cs @@ -27,7 +27,7 @@ using Newtonsoft.Json.Linq; namespace Gremlin.Net.Driver.Messages { - internal class ResponseResult<T> + internal class ResponseResult { [JsonProperty(PropertyName = "data")] public JToken Data { get; set; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs index 8a0ed5e..4754135 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/Path3Deserializer.cs @@ -37,8 +37,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON .Select(x => new HashSet<string>(((ISet<object>)x).Cast<string>())) .ToList<ISet<string>>(); // "objects" is an object[] - object[] objectsProperty = reader.ToObject(graphsonObject["objects"]); - var objects = objectsProperty.ToArray(); + object[] objects = reader.ToObject(graphsonObject["objects"]); return new Path(labels, objects); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80f3dd3f/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs ---------------------------------------------------------------------- diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs index ca1c8d5..1ffb924 100644 --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs @@ -140,7 +140,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection Assert.Contains("m", keys); Assert.Contains("n", keys); var n = (IList<object>) t.SideEffects.Get("n"); - Assert.Equal(n.Select(tr => ((Traverser)tr).Object), new[] {"lop", "ripple"}); + Assert.Equal(new[] {"lop", "ripple"}, n.Select(tr => ((Traverser)tr).Object)); } [Fact]
