Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/21d2444c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/21d2444c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/21d2444c Branch: refs/heads/master Commit: 21d2444c6f404d24ed47d08f03806d73244b5691 Parents: 7ac00a1 8ca2778 Author: Florian Hockmann <f...@florian-hockmann.de> Authored: Wed Oct 3 12:31:48 2018 +0200 Committer: Florian Hockmann <f...@florian-hockmann.de> Committed: Wed Oct 3 12:31:48 2018 +0200 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/Gremlin.Net/Driver/Connection.cs | 6 +++-- .../src/Gremlin.Net/Driver/ConnectionFactory.cs | 7 ++++-- .../src/Gremlin.Net/Driver/GremlinClient.cs | 11 +++++++-- .../Gremlin.Net/Driver/WebSocketConnection.cs | 9 +++++-- .../Driver/GremlinClientTests.cs | 25 ++++++++++++++++++++ 6 files changed, 51 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21d2444c/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21d2444c/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs index 822fc65,b79f0e6..92e0d35 --- a/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs @@@ -51,9 -52,10 +52,10 @@@ namespace Gremlin.Net.Drive _graphSONReader = graphSONReader; _graphSONWriter = graphSONWriter; _messageSerializer = new JsonMessageSerializer(mimeType); + _webSocketConnection = new WebSocketConnection(webSocketConfiguration); } - public async Task<IReadOnlyCollection<T>> SubmitAsync<T>(RequestMessage requestMessage) + public async Task<ResultSet<T>> SubmitAsync<T>(RequestMessage requestMessage) { await SendAsync(requestMessage).ConfigureAwait(false); return await ReceiveAsync<T>().ConfigureAwait(false); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21d2444c/gremlin-dotnet/src/Gremlin.Net/Driver/GremlinClient.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/21d2444c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/GremlinClientTests.cs ----------------------------------------------------------------------