date:20180319

[1/2] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 764e888f2 -> 94484e278


TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/tp33
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new

tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 3aa733667 -> 8c87fcfb0


TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/tp32
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-19 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs


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

Branch: refs/heads/master
Commit: 94484e278481e0bb7add3400981993118d127fbe
Parents: 764e888 8c87fcf
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:23 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:23 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 2dac7c4,6d38ccc..02bf546
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G
  public class GherkinTestRunner
  {
  private static readonly IDictionary 
IgnoredScenarios =
 -new Dictionary();
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
++{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
 +};
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9bcb860,860c11d..9eb3021
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PWithinWrapsArgumentsInArray:
- reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
- break;
- case IgnoreReason.PNotDeserializationProblem:
- reasonSuffix = " because P.Not() cannot be deserialized 
by Gremlin Server (TINKERPOP-1922)";
+ case IgnoreReason.NoReason:
+ reasonSuffix = "";
  break;
  }
  return $"Scenario ignored" + reasonSuffix;
@@@ -56,11 -50,6 +53,10 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- PNotDeserializationProblem
+ NoReason
  }
  }

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

2018-03-19 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs


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

Branch: refs/heads/tp33
Commit: 94484e278481e0bb7add3400981993118d127fbe
Parents: 764e888 8c87fcf
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:23 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:23 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 2dac7c4,6d38ccc..02bf546
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G
  public class GherkinTestRunner
  {
  private static readonly IDictionary 
IgnoredScenarios =
 -new Dictionary();
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
++{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
 +};
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9bcb860,860c11d..9eb3021
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PWithinWrapsArgumentsInArray:
- reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
- break;
- case IgnoreReason.PNotDeserializationProblem:
- reasonSuffix = " because P.Not() cannot be deserialized 
by Gremlin Server (TINKERPOP-1922)";
+ case IgnoreReason.NoReason:
+ reasonSuffix = "";
  break;
  }
  return $"Scenario ignored" + reasonSuffix;
@@@ -56,11 -50,6 +53,10 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- PNotDeserializationProblem
+ NoReason
  }
  }

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-03-19 Thread spmallette

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/fa9fa0d3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa9fa0d3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa9fa0d3

Branch: refs/heads/master
Commit: fa9fa0d3b74030f4c2078d67cc1a25d0f3a771ce
Parents: c8f5559 94484e2
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:31 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:31 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa9fa0d3/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa9fa0d3/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--

[1/3] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master c8f555935 -> fa9fa0d3b


TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/master
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new

[2/2] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

2018-03-19 Thread spmallette

TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/TINKERPOP-1920
Commit: 8c87fcfb06cc09b36e6c91bda88b61ea8ab68379
Parents: 3aa7336
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c87fcfb/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new P("without", args);
+if (args.Length == 1 && args[0] is ICollection

[1/2] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR [Forced Update!]

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1920 cfc04a835 -> 8c87fcfb0 (forced update)


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/TINKERPOP-1920
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections [Forced Update!]

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1920 75490b1dc -> cfc04a835 (forced update)


TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/TINKERPOP-1920
Commit: cfc04a835b27a7a3afd8353ceff9fed67dabdf39
Parents: eeea869
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:16:25 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfc04a83/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfc04a83/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..fd3b752 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("<%= method %>", ToGenericArray(collection));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfc04a83/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..e718bbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("within", ToGenericArray(collection));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)

tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 eeea8696e -> 3aa733667


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/tp32
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-19 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:
gremlin-console/src/main/static/NOTICE
gremlin-server/src/main/static/NOTICE


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

Branch: refs/heads/master
Commit: 764e888f20e6b366b43b8b180dd05adc38b21663
Parents: ff881c1 3aa7336
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:03 2018 -0400

--

--

[1/2] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 ff881c189 -> 764e888f2


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/tp33
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[1/3] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 281c2789e -> c8f555935


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/master
Commit: 3aa733667dc9e8e934bdcba8165298987e8d3af8
Parents: eeea869
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:16:33 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa73366/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

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

2018-03-19 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:
gremlin-console/src/main/static/NOTICE
gremlin-server/src/main/static/NOTICE


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

Branch: refs/heads/tp33
Commit: 764e888f20e6b366b43b8b180dd05adc38b21663
Parents: ff881c1 3aa7336
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:03 2018 -0400

--

--

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-03-19 Thread spmallette

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/c8f55593
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c8f55593
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c8f55593

Branch: refs/heads/master
Commit: c8f55593516cd9b69f3a8f41216ad92d7c2914e9
Parents: 281c278 764e888
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:10 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:10 2018 -0400

--

--

[4/4] tinkerpop git commit: Merge branch 'tp33'

2018-03-19 Thread spmallette

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/281c2789
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/281c2789
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/281c2789

Branch: refs/heads/master
Commit: 281c2789eb215c4ab601f7f01d2a57ddb441c0aa
Parents: 83f40a5 ff881c1
Author: Stephen Mallette 
Authored: Mon Mar 19 09:15:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:15:41 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-19 Thread spmallette

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/78fd0193
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78fd0193
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78fd0193

Branch: refs/heads/tp33
Commit: 78fd019373c42f439bdfbd54a4770c0ce25f5244
Parents: 0c930c0 7023eac
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:39 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-19 Thread spmallette

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/78fd0193
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78fd0193
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78fd0193

Branch: refs/heads/master
Commit: 78fd019373c42f439bdfbd54a4770c0ce25f5244
Parents: 0c930c0 7023eac
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:39 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[3/3] tinkerpop git commit: Fixed NOTICE after bump to netty 4.1.21.Final CTR

2018-03-19 Thread spmallette

Fixed NOTICE after bump to netty 4.1.21.Final CTR


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

Branch: refs/heads/tp33
Commit: ff881c189e657a982f9dc635101a01fe8549bfdb
Parents: 78fd019
Author: Stephen Mallette 
Authored: Mon Mar 19 09:15:12 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:15:12 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 91e622f..fed03e1 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ff881c18/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..f50caec 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.56
+Netty 4.1.21
 
-Copyright 2011 The Netty Project
+Copyright 2014 The Netty Project

[1/3] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 0c930c0bd -> ff881c189


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/tp33
Commit: 7023eacc880021a58fd8cc71aa84f926b57bd191
Parents: d3d1ccf
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:18 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

[1/4] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 83f40a5b0 -> 281c2789e


Updated NOTICE for netty after version bump to 4.0.56 CTR


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

Branch: refs/heads/master
Commit: 7023eacc880021a58fd8cc71aa84f926b57bd191
Parents: d3d1ccf
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:18 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:18 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index a6ffd91..91e622f 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
 Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7023eacc/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index ef4d547..72c10cc 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
 http://creativecommons.org/publicdomain/zero/1.0/
 
 
-Netty 4.0.53
+Netty 4.0.56
 
-Copyright 2014 The Netty Project
+Copyright 2011 The Netty Project

tinkerpop git commit: Bind netty in spark to the project level version CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 a5374b661 -> 0c930c0bd


Bind netty in spark to the project level version CTR


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

Branch: refs/heads/tp33
Commit: 0c930c0bdc5807c8d82d858fe2756bba08bf6e0b
Parents: a5374b6
Author: Stephen Mallette 
Authored: Mon Mar 19 09:09:56 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:09:56 2018 -0400

--
 spark-gremlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c930c0b/spark-gremlin/pom.xml
--
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 906b7d2..91d7b50 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,7 +281,7 @@
 
 io.netty
 netty-all
-4.0.29.Final
+${netty.version}
 
 
 io.netty

[1/2] tinkerpop git commit: Bind netty in spark to the project level version CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 011044e5e -> 83f40a5b0


Bind netty in spark to the project level version CTR


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

Branch: refs/heads/master
Commit: 0c930c0bdc5807c8d82d858fe2756bba08bf6e0b
Parents: a5374b6
Author: Stephen Mallette 
Authored: Mon Mar 19 09:09:56 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:09:56 2018 -0400

--
 spark-gremlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c930c0b/spark-gremlin/pom.xml
--
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 906b7d2..91d7b50 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,7 +281,7 @@
 
 io.netty
 netty-all
-4.0.29.Final
+${netty.version}
 
 
 io.netty

[2/2] tinkerpop git commit: Merge branch 'tp33'

2018-03-19 Thread spmallette

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/83f40a5b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/83f40a5b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/83f40a5b

Branch: refs/heads/master
Commit: 83f40a5b021a0047626288af9e7d463f66a258bf
Parents: 011044e 0c930c0
Author: Stephen Mallette 
Authored: Mon Mar 19 09:10:27 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:10:27 2018 -0400

--
 spark-gremlin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/83f40a5b/spark-gremlin/pom.xml
--

[5/8] tinkerpop git commit: TINKERPOP-1854 Replace StartsWith check with an equality check

2018-03-19 Thread spmallette

TINKERPOP-1854 Replace StartsWith check with an equality check


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

Branch: refs/heads/TINKERPOP-1920
Commit: 4ebc68e89e0ba1606e06b42a32ec0bebe14fbdf5
Parents: 820adc4
Author: Florian Hockmann 
Authored: Sat Mar 17 16:24:09 2018 +0100
Committer: Florian Hockmann 
Committed: Sat Mar 17 16:24:09 2018 +0100

--
 .../Gherkin/TraversalEvaluation/TraversalParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ebc68e8/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
index 7e1486c..e3f6a3f 100644
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
@@ -398,7 +398,7 @@ namespace 
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
 {
 return ParseNumber(text, ref i);
 }
-if (text.Length >= i + 3 && text.Substring(i, 3).StartsWith("__."))
+if (text.Length >= i + 3 && text.Substring(i, 3) == "__.")
 {
 var startIndex = i;
 var tokens = ParseTokens(text, ref i);

[7/8] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

2018-03-19 Thread spmallette

TINKERPOP-1920 Fixed P.within/without() handling for collections


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

Branch: refs/heads/TINKERPOP-1920
Commit: e9c31d020435016a9ffdfd46fe13222c8940b712
Parents: eeea869
Author: Stephen Mallette 
Authored: Thu Mar 15 12:19:48 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 08:18:41 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  6 +-
 4 files changed, 38 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9c31d02/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8fcbe1a..0ec6f6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -42,6 +42,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Added `IndexedTraverserSet` which indexes on the value of a `Traverser` thus 
improving performance when used.
 * Utilized `IndexedTraverserSet` in `TraversalVertexProgram` to avoid extra 
iteration when doing `Vertex` lookups.
 * Bumped to Netty 4.0.56.Final.
+* Fixed .NET GraphSON serialization of `P.Within()` and `P.without()` when 
passing a `Collection` as an argument.
 * Fixed a bug in Gremlin Console which prevented handling of `gremlin.sh` 
flags that had an "=" between the flag and its arguments.
 * Fixed bug where `SparkMessenger` was not applying the `edgeFunction` from 
`MessageScope`.
 * Fixed a bug in `ComputerAwareStep` that didn't handle `reset()` properly and 
thus occasionally produced some extra traversers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9c31d02/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index ad037c1..a72c199 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -88,9 +94,18 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-return new P("<%= method %>", args);
+if (args.Length == 1 && args[0] is ICollection)
+return new P("<%= method %>", 
ToGenericArray((ICollection) args[0]));
+else
+return new P("<%= method %>", args);
 }
 <% } %>
+
+private static T[] ToGenericArray(ICollection collection)
+{
+return collection?.ToArray() ?? new T[0];;
+}
+
 /// 
 public override string ToString()
 {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9c31d02/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index e3a1e76..11079d3 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -22,6 +22,12 @@
 #endregion
 
 // THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
 namespace Gremlin.Net.Process.Traversal
 {
 #pragma warning disable 1591
@@ -148,12 +154,24 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-return new P("within", args);
+if (args.Length == 1 && args[0] is ICollection)
+return new P("within", ToGenericArray((ICollection) 
args[0]));
+else
+return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-return new P("without", args);
+if (args.Length == 1 && args[0] is ICollection)
+return new P("without",

[1/8] tinkerpop git commit: TINKERPOP-1919 Add Lambda support to Gremlin.Net [Forced Update!]

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1920 a4f20a2e3 -> 75490b1dc (forced update)


TINKERPOP-1919 Add Lambda support to Gremlin.Net

This adds a Lambda class that can be used to construct Groovy or Python
lambdas. The Lambda class implements all interfaces that mirror Javas
functional interfaces like Function.


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

Branch: refs/heads/TINKERPOP-1920
Commit: 0cdaa3a2114670a34999aa56e0487a2e7ef998e1
Parents: 0bf9b2f
Author: Florian Hockmann 
Authored: Wed Mar 14 18:56:47 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 15 18:16:05 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc| 29 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 ++
 gremlin-dotnet/glv/generate.groovy  |  4 +-
 .../Process/Traversal/GraphTraversalSource.cs   | 52 +-
 .../Gremlin.Net/Process/Traversal/ISupplier.cs  | 32 +
 .../Process/Traversal/IUnaryOperator.cs | 33 +
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 72 
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  3 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../Gherkin/CommonSteps.cs  |  2 +-
 .../Gherkin/IgnoreException.cs  |  4 --
 .../TraversalEvaluation/TraversalParser.cs  |  2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  | 13 
 14 files changed, 282 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cdaa3a2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 94ee24f..8fcbe1a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added a `Lambda` class to Gremlin.Net that makes it possible to use Groovy 
and Python lambdas with Gremlin.Net.
 * Enums are now represented as classes in Gremlin.Net which allows to use them 
as arguments in more steps.
 * Bumped to Groovy 2.4.14.
 * Added `checkAdjacentVertices` option to `SubgraphStrategy`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cdaa3a2/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index ace8119..bf8c8b1 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -46,7 +46,7 @@ implementation of Gremlin and serves as the foundation by 
which all other Gremli
 === The Lambda Solution
 
 Supporting link:https://en.wikipedia.org/wiki/Anonymous_function[anonymous 
functions] across languages is difficult as
-most language do not support lambda introspection and thus, code analysis. In 
Gremlin-Java, Java8 lambdas can be leveraged.
+most languages do not support lambda introspection and thus, code analysis. In 
Gremlin-Java, Java8 lambdas can be leveraged.
 
 [source,java]
 g.V().out("knows").map(t -> t.get().value("name") + " is the friend name") <1>
@@ -281,7 +281,7 @@ re-construction machine-side.
 === The Lambda Solution
 
 Supporting link:https://en.wikipedia.org/wiki/Anonymous_function[anonymous 
functions] across languages is difficult as
-most language do not support lambda introspection and thus, code analysis. In 
Gremlin-Python,
+most languages do not support lambda introspection and thus, code analysis. In 
Gremlin-Python,
 a link:https://docs.python.org/2/reference/expressions.html#lambda[Python 
lambda] should be represented as a zero-arg callable
 that returns a string representation of a lambda. The default lambda language 
is `gremlin-python` and can be changed via
 `gremlin_python.statics.default_lambda_language`. When the lambda is 
represented in `Bytecode` its language is encoded
@@ -343,8 +343,10 @@ var g = graph.Traversal().WithRemote(new 
DriverRemoteConnection(new GremlinClien
 
 When a traversal from the `GraphTraversalSource` is iterated, the 
traversalâs `Bytecode` is sent over the wire via the registered
 `IRemoteConnection`. The bytecode is used to construct the equivalent 
traversal at the remote traversal source.
-Since Gremlin.Net currently doesn't support lambda expressions, all traversals 
can be translated to Gremlin-Java

[4/8] tinkerpop git commit: TINKERPOP-1854 Add lambda properties to ILambda interface

2018-03-19 Thread spmallette

TINKERPOP-1854 Add lambda properties to ILambda interface


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

Branch: refs/heads/TINKERPOP-1920
Commit: 820adc44f3e2c3359f9f345f554d2b936642e7f0
Parents: 7fbb779
Author: Florian Hockmann 
Authored: Fri Mar 16 18:52:49 2018 +0100
Committer: Florian Hockmann 
Committed: Fri Mar 16 18:52:49 2018 +0100

--
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 14 +++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../IO/GraphSON/StringBasedLambdaSerializer.cs  | 43 
 4 files changed, 58 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
index 12eb016..c1a0e44 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
@@ -29,6 +29,20 @@ namespace Gremlin.Net.Process.Traversal
 public interface ILambda : IFunction, IBiFunction, IPredicate, 
IUnaryOperator, IBinaryOperator, IComparator,
 IConsumer, ISupplier
 {
+/// 
+/// Gets the lambda expression.
+/// 
+string LambdaExpression { get; }
+
+/// 
+/// Gets the language of this lambda.
+/// 
+string Language { get; }
+
+/// 
+/// Gets the arguments of this lambda.
+/// 
+object Arguments { get;  }
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
index 0ef2bde..7185868 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
@@ -60,7 +60,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
 {typeof(Property), new PropertySerializer()},
 {typeof(VertexProperty), new VertexPropertySerializer()},
 {typeof(AbstractTraversalStrategy), new 
TraversalStrategySerializer()},
-{typeof(ILambda), new StringBasedLambdaSerializer()}
+{typeof(ILambda), new LambdaSerializer()}
 };
 
 /// 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/820adc44/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
--
diff --git 
a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs 
b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
new file mode 100644
index 000..45e4632
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/LambdaSerializer.cs
@@ -0,0 +1,43 @@
+ï»¿#region License
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#endregion
+
+using System.Collections.Generic;
+using Gremlin.Net.Process.Traversal;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+internal class LambdaSerializer : IGraphSONSerializer
+{
+public Dictionary Dictify(dynamic objectData, 
GraphSONWriter writer)
+{
+ILambda lambda = objectData;
+var valueDict = new Dictionary
+{
+{"script",

[8/8] tinkerpop git commit: TINKERPOP-1920 Minor refactorign of P and removed dead exceptions

2018-03-19 Thread spmallette

TINKERPOP-1920 Minor refactorign of P and removed dead exceptions


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

Branch: refs/heads/TINKERPOP-1920
Commit: 75490b1dc8f0a676891e77035e18683ca2777f87
Parents: e9c31d0
Author: Stephen Mallette 
Authored: Mon Mar 19 09:01:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:01:41 2018 -0400

--
 gremlin-dotnet/glv/P.template |  4 ++--
 gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs |  8 
 .../Gherkin/IgnoreException.cs| 10 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75490b1d/gremlin-dotnet/glv/P.template
--
diff --git a/gremlin-dotnet/glv/P.template b/gremlin-dotnet/glv/P.template
index a72c199..51f0cf7 100644
--- a/gremlin-dotnet/glv/P.template
+++ b/gremlin-dotnet/glv/P.template
@@ -94,8 +94,8 @@ namespace Gremlin.Net.Process.Traversal
 <% } %><% pmethods.findAll{ it in ["within", "without"] }.each { method -> %>
 public static P <%= toCSharpMethodName.call(method) %>(params object[] 
args)
 {
-if (args.Length == 1 && args[0] is ICollection)
-return new P("<%= method %>", 
ToGenericArray((ICollection) args[0]));
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("without", ToGenericArray(collection));
 else
 return new P("<%= method %>", args);
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75490b1d/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
index 11079d3..1743e05 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/P.cs
@@ -154,16 +154,16 @@ namespace Gremlin.Net.Process.Traversal
 
 public static P Within(params object[] args)
 {
-if (args.Length == 1 && args[0] is ICollection)
-return new P("within", ToGenericArray((ICollection) 
args[0]));
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("without", ToGenericArray(collection));
 else
 return new P("within", args);
 }
 
 public static P Without(params object[] args)
 {
-if (args.Length == 1 && args[0] is ICollection)
-return new P("without", ToGenericArray((ICollection) 
args[0]));
+if (args.Length == 1 && args[0] is ICollection collection)
+return new P("without", ToGenericArray(collection));
 else
 return new P("without", args);
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/75490b1d/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9aa5213..860c11d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -40,11 +40,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 string reasonSuffix = null;
 switch (reason)
 {
-case IgnoreReason.PWithinWrapsArgumentsInArray:
-reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
-break;
-case IgnoreReason.PNotDeserializationProblem:
-reasonSuffix = " because P.Not() cannot be deserialized by 
Gremlin Server (TINKERPOP-1922)";
+case IgnoreReason.NoReason:
+reasonSuffix = "";
 break;
 }
 return $"Scenario ignored" + reasonSuffix;
@@ -53,7 +50,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
 
 public enum IgnoreReason
 {
-PWithinWrapsArgumentsInArray,
-PNotDeserializationProblem
+NoReason
 }
 }
\ No newline at end of file

[2/8] tinkerpop git commit: TINKERPOP-1854 Make Lambda implementation internal

2018-03-19 Thread spmallette

TINKERPOP-1854 Make Lambda implementation internal


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

Branch: refs/heads/TINKERPOP-1920
Commit: 7fbb779010f028c8f3df6935969d29afefe0fb0f
Parents: 0cdaa3a
Author: Florian Hockmann 
Authored: Thu Mar 15 18:26:40 2018 +0100
Committer: Florian Hockmann 
Committed: Thu Mar 15 18:26:40 2018 +0100

--
 docs/src/reference/gremlin-variants.asciidoc|  4 +-
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 45 +++-
 .../Process/Traversal/StringBasedLambda.cs  | 42 ++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  2 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 ---
 .../IO/GraphSON/StringBasedLambdaSerializer.cs  | 43 +++
 6 files changed, 104 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fbb7790/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc 
b/docs/src/reference/gremlin-variants.asciidoc
index bf8c8b1..c19160a 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -451,8 +451,8 @@ g.V().Out().Map(Lambda.Python("lambda x: 
len(x.get().value('name'))")).Sum<
 <1> `Lambda.Groovy()` can be used to create a Groovy lambda. 
 <2> `Lambda.Python()` can be used to create a Python lambda.
 
-The `Lambda` class implements interfaces like `IFunction` and `IPredicate` 
that mirror their Java counterparts which makes it possible
-to use lambdas with Gremlin.Net for the same steps as in Gremlin-Java.
+The `ILambda` interface returned by these two methods inherits interfaces like 
`IFunction` and `IPredicate` that mirror
+their Java counterparts which makes it possible to use lambdas with 
Gremlin.Net for the same steps as in Gremlin-Java.
 
 [[gremlin-javascript]]
 == Gremlin-JavaScript

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fbb7790/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs 
b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
index 21849ef..12eb016 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Lambda.cs
@@ -26,47 +26,34 @@ namespace Gremlin.Net.Process.Traversal
 /// 
 /// Represents a lambda.
 /// 
-public class Lambda : IFunction, IBiFunction, IPredicate, IUnaryOperator, 
IBinaryOperator, IComparator, IConsumer,
-ISupplier
+public interface ILambda : IFunction, IBiFunction, IPredicate, 
IUnaryOperator, IBinaryOperator, IComparator,
+IConsumer, ISupplier
 {
-private const int DefaultArgument = -1;
-
-private Lambda(string expression, string language)
-{
-LambdaExpression = expression;
-Language = language;
-}
-
-/// 
-/// Gets the lambda expression.
-/// 
-public string LambdaExpression { get; }
-
-/// 
-/// Gets the language of this lambda.
-/// 
-public string Language { get; }
-
-internal object Arguments => DefaultArgument;
+}
 
+/// 
+/// Provides methods to create lambdas.
+/// 
+public static class Lambda
+{
 /// 
-/// Creates a new Groovy .
+/// Creates a new Groovy lambda.
 /// 
 /// The lambda expression.
-/// The created .
-public static Lambda Groovy(string expression)
+/// The created lambda.
+public static ILambda Groovy(string expression)
 {
-return new Lambda(expression, "gremlin-groovy");
+return new StringBasedLambda(expression, "gremlin-groovy");
 }
 
 /// 
-/// Creates a new Python .
+/// Creates a new Python lambda.
 /// 
 /// The lambda expression.
-/// The created .
-public static Lambda Python(string expression)
+/// The created lambda.
+public static ILambda Python(string expression)
 {
-return new Lambda(expression, "gremlin-python");
+return new StringBasedLambda(expression, "gremlin-python");
 }
 }
 }
\ No newline at end of file

[6/8] tinkerpop git commit: Merge branch 'TINKERPOP-1854' into tp32

2018-03-19 Thread spmallette

Merge branch 'TINKERPOP-1854' into tp32


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

Branch: refs/heads/TINKERPOP-1920
Commit: eeea8696e1de69dd6c918feed6ac4fc531ea61dc
Parents: d3d1ccf 4ebc68e
Author: Florian Hockmann 
Authored: Sun Mar 18 12:27:55 2018 +0100
Committer: Florian Hockmann 
Committed: Sun Mar 18 12:27:55 2018 +0100

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/reference/gremlin-variants.asciidoc| 29 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 ++
 gremlin-dotnet/glv/generate.groovy  |  4 +-
 .../Process/Traversal/GraphTraversalSource.cs   | 52 +-
 .../Gremlin.Net/Process/Traversal/ISupplier.cs  | 32 +
 .../Process/Traversal/IUnaryOperator.cs | 33 +
 .../src/Gremlin.Net/Process/Traversal/Lambda.cs | 73 
 .../Process/Traversal/StringBasedLambda.cs  | 42 +++
 .../Structure/IO/GraphSON/GraphSONWriter.cs |  3 +-
 .../Structure/IO/GraphSON/LambdaSerializer.cs   | 43 
 .../Gherkin/CommonSteps.cs  |  2 +-
 .../Gherkin/IgnoreException.cs  |  4 --
 .../TraversalEvaluation/TraversalParser.cs  |  2 +-
 .../IO/GraphSON/GraphSONWriterTests.cs  | 13 
 15 files changed, 325 insertions(+), 15 deletions(-)
--

[3/8] tinkerpop git commit: Cleaned up the sink dataset a bit.

2018-03-19 Thread spmallette

Cleaned up the sink dataset a bit.

Introduced more consistent,general property/label names. CTR


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

Branch: refs/heads/TINKERPOP-1920
Commit: d3d1ccfa673765085e6299cfbf0c17ccd3318e88
Parents: 0bf9b2f
Author: Stephen Mallette 
Authored: Thu Mar 15 18:37:28 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 18:37:28 2018 -0400

--
 data/tinkerpop-sink-typed.json |   4 ++--
 data/tinkerpop-sink-v2d0-typed.json|   4 ++--
 data/tinkerpop-sink-v2d0.json  |   4 ++--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed.json  |   4 ++--
 .../io/graphson/tinkerpop-sink-v2d0-typed.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink.json  |   4 ++--
 .../gremlin/structure/io/gryo/tinkerpop-sink.kryo  | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java   |  11 ---
 11 files changed, 20 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3d1ccfa/data/tinkerpop-sink-typed.json
--
diff --git a/data/tinkerpop-sink-typed.json b/data/tinkerpop-sink-typed.json
index bc56489..2e83384 100644
--- a/data/tinkerpop-sink-typed.json
+++ b/data/tinkerpop-sink-typed.json
@@ -1,3 +1,3 @@
-{"@class":"java.util.HashMap","id":2000,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
-{"@class":"java.util.HashMap","id":2001,"label":"message_passing_test","inE":{"@class":"java.util.HashMap","msg_pass_test_edge":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
+{"@class":"java.util.HashMap","id":2000,"label":"message","inE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"outV":2000}]]},"outE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"inV":2001},{"@class":"java.util.HashMap","id":5,"inV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"a"}]]}}
+{"@class":"java.util.HashMap","id":2001,"label":"message","inE":{"@class":"java.util.HashMap","link":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"outV":2000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"b"}]]}}
 
{"@class":"java.util.HashMap","id":1000,"label":"loops","inE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"outV":1000}]]},"outE":{"@class":"java.util.HashMap","self":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":1,"inV":1000}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"loop"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3d1ccfa/data/tinkerpop-sink-v2d0-typed.json
--
diff --git a/data/tinkerpop-sink-v2d0-typed.json 
b/data/tinkerpop-sink-v2d0-typed.json
index c0844a3..7a27853 100644
--- a/data/tinkerpop-sink-v2d0-typed.json
+++ b/data/tinkerpop-sink-v2d0-typed.json
@@ -1,3 +1,3 @@
-{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}

[1/2] tinkerpop git commit: Moved JavaTranslator benchmark to gremlin-tools CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master f7da641d3 -> 011044e5e


Moved JavaTranslator benchmark to gremlin-tools CTR


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

Branch: refs/heads/master
Commit: a5374b6611c966cf63c57f328d3f03b484bf6517
Parents: 2fd0f25
Author: Stephen Mallette 
Authored: Mon Mar 19 08:08:53 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 08:09:25 2018 -0400

--
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 2 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5374b66/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
deleted file mode 100644
index d33b574..000
--- 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.jsr223;
-
-import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@State(Scope.Thread)
-public class JavaTranslatorBenchmark extends AbstractBenchmarkBase {
-
-private final Graph graph = EmptyGraph.instance();
-private final GraphTraversalSource g = graph.traversal();
-private final JavaTranslator> translator = JavaTranslator.of(g);
-
-@Benchmark
-public GraphTraversal.Admin testTranslationShort() {
-return translator.translate(g.V().asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationMedium() {
-return 
translator.translate(g.V().out().in("link").out().in("link").asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationLong() {
-return translator.translate(g.V().match(
-as("a").has("song", "name", "HERE COMES SUNSHINE"),
-as("a").map(inE("followedBy").values("weight").mean()).as("b"),
-as("a").inE("followedBy").as("c"),
-
as("c").filter(values("weight").where(P.gte("b"))).outV().as("d")).
-select("d").by("name").asAdmin().getBytecode());
-}
-
-@Benchmark
-public

tinkerpop git commit: Moved JavaTranslator benchmark to gremlin-tools CTR

2018-03-19 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 2fd0f2558 -> a5374b661


Moved JavaTranslator benchmark to gremlin-tools CTR


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

Branch: refs/heads/tp33
Commit: a5374b6611c966cf63c57f328d3f03b484bf6517
Parents: 2fd0f25
Author: Stephen Mallette 
Authored: Mon Mar 19 08:08:53 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 08:09:25 2018 -0400

--
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 2 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5374b66/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
--
diff --git 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
 
b/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
deleted file mode 100644
index d33b574..000
--- 
a/gremlin-benchmark/src/main/java/org/apache/tinkerpop/jsr223/JavaTranslatorBenchmark.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.jsr223;
-
-import org.apache.tinkerpop.benchmark.util.AbstractBenchmarkBase;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SubgraphStrategy;
-import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.hasLabel;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.inE;
-import static 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.values;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@State(Scope.Thread)
-public class JavaTranslatorBenchmark extends AbstractBenchmarkBase {
-
-private final Graph graph = EmptyGraph.instance();
-private final GraphTraversalSource g = graph.traversal();
-private final JavaTranslator> translator = JavaTranslator.of(g);
-
-@Benchmark
-public GraphTraversal.Admin testTranslationShort() {
-return translator.translate(g.V().asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationMedium() {
-return 
translator.translate(g.V().out().in("link").out().in("link").asAdmin().getBytecode());
-}
-
-@Benchmark
-public GraphTraversal.Admin testTranslationLong() {
-return translator.translate(g.V().match(
-as("a").has("song", "name", "HERE COMES SUNSHINE"),
-as("a").map(inE("followedBy").values("weight").mean()).as("b"),
-as("a").inE("followedBy").as("c"),
-
as("c").filter(values("weight").where(P.gte("b"))).outV().as("d")).
-select("d").by("name").asAdmin().getBytecode());
-}
-
-@Benchmark
-public

[2/2] tinkerpop git commit: Merge branch 'tp33'

2018-03-19 Thread spmallette

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/011044e5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/011044e5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/011044e5

Branch: refs/heads/master
Commit: 011044e5e96367ae62f1889e2dd81eff50b38c9e
Parents: f7da641 a5374b6
Author: Stephen Mallette 
Authored: Mon Mar 19 08:09:36 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 08:09:36 2018 -0400

--
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 .../jsr223/JavaTranslatorBenchmark.java | 76 
 2 files changed, 76 insertions(+), 76 deletions(-)
--

[1/2] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

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

[3/3] tinkerpop git commit: Merge branch 'tp33'

[1/3] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[2/2] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[1/2] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR [Forced Update!]

tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections [Forced Update!]

tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

[1/2] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[1/3] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

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

[3/3] tinkerpop git commit: Merge branch 'tp33'

[4/4] tinkerpop git commit: Merge branch 'tp33'

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[3/3] tinkerpop git commit: Fixed NOTICE after bump to netty 4.1.21.Final CTR

[1/3] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

[1/4] tinkerpop git commit: Updated NOTICE for netty after version bump to 4.0.56 CTR

tinkerpop git commit: Bind netty in spark to the project level version CTR

[1/2] tinkerpop git commit: Bind netty in spark to the project level version CTR

[2/2] tinkerpop git commit: Merge branch 'tp33'

[5/8] tinkerpop git commit: TINKERPOP-1854 Replace StartsWith check with an equality check

[7/8] tinkerpop git commit: TINKERPOP-1920 Fixed P.within/without() handling for collections

[1/8] tinkerpop git commit: TINKERPOP-1919 Add Lambda support to Gremlin.Net [Forced Update!]

[4/8] tinkerpop git commit: TINKERPOP-1854 Add lambda properties to ILambda interface

[8/8] tinkerpop git commit: TINKERPOP-1920 Minor refactorign of P and removed dead exceptions

[2/8] tinkerpop git commit: TINKERPOP-1854 Make Lambda implementation internal

[6/8] tinkerpop git commit: Merge branch 'TINKERPOP-1854' into tp32

[3/8] tinkerpop git commit: Cleaned up the sink dataset a bit.

[1/2] tinkerpop git commit: Moved JavaTranslator benchmark to gremlin-tools CTR

tinkerpop git commit: Moved JavaTranslator benchmark to gremlin-tools CTR

[2/2] tinkerpop git commit: Merge branch 'tp33'

35 matches

Site Navigation

Mail list logo

Footer information