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/8cf71aea Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cf71aea Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cf71aea Branch: refs/heads/TINKERPOP-1682 Commit: 8cf71aea2439e76653894c779ba7f871a6c44248 Parents: f9f3d4f 5049339 Author: Florian Hockmann <f...@florian-hockmann.de> Authored: Tue Mar 13 21:02:58 2018 +0100 Committer: Florian Hockmann <f...@florian-hockmann.de> Committed: Tue Mar 13 21:02:58 2018 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-variants.asciidoc | 2 +- .../upgrade/release-3.2.x-incubating.asciidoc | 11 +++++ gremlin-dotnet/glv/Enum.template | 9 +++- gremlin-dotnet/glv/generate.groovy | 41 +++++++-------- .../Gremlin.Net/Process/Traversal/Barrier.cs | 9 +++- .../Process/Traversal/Cardinality.cs | 13 +++-- .../src/Gremlin.Net/Process/Traversal/Column.cs | 11 +++-- .../Gremlin.Net/Process/Traversal/Direction.cs | 13 +++-- .../Process/Traversal/EnumWrapper.cs | 52 ++++++++++++++++++++ .../Process/Traversal/GraphSONVersion.cs | 13 +++-- .../Process/Traversal/GraphTraversal.cs | 43 +++++++++------- .../Process/Traversal/GraphTraversalSource.cs | 14 ++++-- .../Process/Traversal/GryoVersion.cs | 11 +++-- .../Process/Traversal/IBiFunction.cs | 33 +++++++++++++ .../Process/Traversal/IBinaryOperator.cs | 34 +++++++++++++ .../Process/Traversal/IComparator.cs | 32 ++++++++++++ .../Gremlin.Net/Process/Traversal/IConsumer.cs | 33 +++++++++++++ .../Gremlin.Net/Process/Traversal/IFunction.cs | 32 ++++++++++++ .../Gremlin.Net/Process/Traversal/IPredicate.cs | 32 ++++++++++++ .../Gremlin.Net/Process/Traversal/Operator.cs | 29 ++++++----- .../src/Gremlin.Net/Process/Traversal/Order.cs | 13 +++-- .../src/Gremlin.Net/Process/Traversal/Pick.cs | 11 +++-- .../src/Gremlin.Net/Process/Traversal/Pop.cs | 15 ++++-- .../src/Gremlin.Net/Process/Traversal/Scope.cs | 11 +++-- .../src/Gremlin.Net/Process/Traversal/T.cs | 15 ++++-- .../Process/Traversal/TraversalPredicate.cs | 2 +- .../src/Gremlin.Net/Process/Traversal/__.cs | 26 +++++----- .../Structure/IO/GraphSON/EnumSerializer.cs | 5 +- .../Structure/IO/GraphSON/GraphSONWriter.cs | 2 +- .../TraversalEnumParameter.cs | 5 +- 31 files changed, 454 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/docs/src/reference/gremlin-variants.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/glv/generate.groovy ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs index 31187ac,0c92607..e55be6b --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs @@@ -26,11 -26,15 +26,16 @@@ namespace Gremlin.Net.Process.Traversa { #pragma warning disable 1591 - public enum GraphSONVersion + public class GraphSONVersion : EnumWrapper { - V1_0, - V2_0, - V3_0 + private GraphSONVersion(string enumValue) + : base("GraphSONVersion", enumValue) + { + } + + public static GraphSONVersion V1_0 => new GraphSONVersion("V1_0"); - public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0"); ++ public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0"); ++ public static GraphSONVersion V3_0 => new GraphSONVersion("V3_0"); } #pragma warning restore 1591 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs index f2b025a,fcc746e..93fc369 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs @@@ -26,10 -26,14 +26,15 @@@ namespace Gremlin.Net.Process.Traversa { #pragma warning disable 1591 - public enum GryoVersion + public class GryoVersion : EnumWrapper { - V1_0, - V3_0 + private GryoVersion(string enumValue) + : base("GryoVersion", enumValue) + { + } + - public static GryoVersion V1_0 => new GryoVersion("V1_0"); ++ public static GryoVersion V1_0 => new GryoVersion("V1_0"); ++ public static GryoVersion V3_0 => new GryoVersion("V3_0"); } #pragma warning restore 1591 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs index 197f58b,44ccb9b..c6a1817 --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs @@@ -26,11 -26,20 +26,16 @@@ namespace Gremlin.Net.Process.Traversa { #pragma warning disable 1591 - public enum Order + public class Order : EnumWrapper, IComparator { - Decr, - Incr, - Shuffle + private Order(string enumValue) + : base("Order", enumValue) + { + } + + public static Order Decr => new Order("decr"); + public static Order Incr => new Order("incr"); - public static Order KeyDecr => new Order("keyDecr"); - public static Order KeyIncr => new Order("keyIncr"); - public static Order Shuffle => new Order("shuffle"); - public static Order ValueDecr => new Order("valueDecr"); - public static Order ValueIncr => new Order("valueIncr"); ++ public static Order Shuffle => new Order("shuffle"); } #pragma warning restore 1591 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs ---------------------------------------------------------------------- diff --cc gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs index 5f3881d,8a157c5..d1915fc --- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs +++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs @@@ -26,12 -26,16 +26,17 @@@ namespace Gremlin.Net.Process.Traversa { #pragma warning disable 1591 - public enum Pop + public class Pop : EnumWrapper { - All, - First, - Last, - Mixed + private Pop(string enumValue) + : base("Pop", enumValue) + { + } + + public static Pop All => new Pop("all"); + public static Pop First => new Pop("first"); - public static Pop Last => new Pop("last"); ++ public static Pop Last => new Pop("last"); ++ public static Pop Mixed => new Pop("mixed"); } #pragma warning restore 1591 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf71aea/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs ----------------------------------------------------------------------