[5/8] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-03 Thread florianhockmann 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ca27786
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ca27786
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ca27786

Branch: refs/heads/tp33
Commit: 8ca277863861699ca2fa7913735687f6e65b486b
Parents: c10bde3 b440742
Author: Florian Hockmann 
Authored: Wed Oct 3 12:31:08 2018 +0200
Committer: Florian Hockmann 
Committed: Wed Oct 3 12:31:08 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/8ca27786/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ca27786/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
index 279c708,f63e20b..b79f0e6
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
@@@ -36,21 -37,21 +37,22 @@@ namespace Gremlin.Net.Drive
  {
  private readonly GraphSONReader _graphSONReader;
  private readonly GraphSONWriter _graphSONWriter;
 -private readonly JsonMessageSerializer _messageSerializer = new 
JsonMessageSerializer();
 +private readonly JsonMessageSerializer _messageSerializer;
  private readonly Uri _uri;
- private readonly WebSocketConnection _webSocketConnection = new 
WebSocketConnection();
+ private readonly WebSocketConnection _webSocketConnection;
  private readonly string _username;
  private readonly string _password;
  
  public Connection(Uri uri, string username, string password, 
GraphSONReader graphSONReader,
-   GraphSONWriter graphSONWriter, string mimeType)
 -GraphSONWriter graphSONWriter, Action 
webSocketConfiguration)
++GraphSONWriter graphSONWriter, string mimeType, 
Action webSocketConfiguration)
  {
  _uri = uri;
  _username = username;
  _password = password;
  _graphSONReader = graphSONReader;
  _graphSONWriter = graphSONWriter;
 +_messageSerializer = new JsonMessageSerializer(mimeType);
+ _webSocketConnection = new 
WebSocketConnection(webSocketConfiguration);
  }
  
  public async Task> 
SubmitAsync(RequestMessage requestMessage)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ca27786/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
index e2ff5b7,8b14ed9..7a6c2d5
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionFactory.cs
@@@ -30,22 -31,22 +31,24 @@@ namespace Gremlin.Net.Drive
  {
  private readonly GraphSONReader _graphSONReader;
  private readonly GraphSONWriter _graphSONWriter;
+ private readonly Action 
_webSocketConfiguration;
  private readonly GremlinServer _gremlinServer;
 +private readonly string _mimeType;
  
  public ConnectionFactory(GremlinServer gremlinServer, GraphSONReader 
graphSONReader,
-  GraphSONWriter graphSONWriter, string 
mimeType)
 -GraphSONWriter graphSONWriter, Action 
webSocketConfiguration)
++GraphSONWriter graphSONWriter, string mimeType, 
Action webSocketConfiguration)
  {
  _gremlinServer = gremlinServer;
 -_graphSONReader = graphSONReader;
 -_graphSONWriter = graphSONWriter;
 +_mimeType = mimeType;
 +_graphSONReader = graphSONReader ?? throw new 
ArgumentNullException(nameof(graphSONReader));
 +_graphSONWriter = graphSONWriter ?? throw new 
ArgumentNullException(nameof(graphSONWriter));
+ _webSocketConfiguration = webSocketConfiguration;
  }
  
  public Connection CreateConnection()
  {
  return new Connection(_gremlinServer.Uri, 
_gremlinServer.Username, _gremlinServer.Password, _graphSONReader,
-  _graphSONWriter, _mimeType);
 -

[5/8] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread florianhockmann 
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/055f1d5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/055f1d5e

Branch: refs/heads/master
Commit: 055f1d5ee33c6f0f49267ef48365eff9f0d0bafa
Parents: ee65d5f aac534e
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:28 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:28 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/pom.xml
--

[5/8] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-27 Thread spmallette 
Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71bc37fd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71bc37fd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71bc37fd

Branch: refs/heads/TINKERPOP-1956
Commit: 71bc37fdfe00bb8c6b75d8bf81834713abf8cd22
Parents: a38d68f 5fea198
Author: Stephen Mallette 
Authored: Fri Apr 27 08:35:55 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 27 08:35:55 2018 -0400

--
 docs/src/recipes/olap-spark-yarn.asciidoc   | 20 
 .../gremlin/process/traversal/Order.java|  9 -
 2 files changed, 16 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/docs/src/recipes/olap-spark-yarn.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71bc37fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 847cc57,c9111f0..0b88bba
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@@ -67,7 -66,82 +67,14 @@@ public enum Order implements Comparator
  public Order reversed() {
  return incr;
  }
- }, shuffle {
+ },
+ 
+ /**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueIncr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.naturalOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueDecr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#keys}.
 - */
 -@Deprecated
 -keyDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getKey(), ((Map.Entry) second).getKey());
 -}
 -
 -@Override
 -public Order reversed() {
 -return keyIncr;
 -}
 -},
 -
 -/**
 - * @since 3.0.0-incubating
 - * @deprecated As of release 3.1.1-incubating, replaced by {@link 
org.apache.tinkerpop.gremlin.structure.Column#values}.
 - */
 -@Deprecated
 -valueDecr {
 -@Override
 -public int compare(final Object first, final Object second) {
 -return 
Comparator.reverseOrder().compare(((Map.Entry) 
first).getValue(), ((Map.Entry) second).getValue());
 -}
 -
 -@Override
 -public Order reversed() {
 -return valueIncr;
 -}
 -},
 -
 -/**
+  * Order in a random fashion.
+  *
+  * @since 3.0.0-incubating
+  */
+ shuffle {
  @Override
  public int compare(final Object first, final Object second) {
  return RANDOM.nextBoolean() ? -1 : 1;