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

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

Branch: refs/heads/master
Commit: 2c373064021c9df5cf02906e73bdb9f37d6c9d6c
Parents: 4e46f71 c253e76
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 26 11:02:11 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 26 11:02:11 2018 -0400

----------------------------------------------------------------------
 .../gremlin/process/traversal/Compare.java      | 12 ++++
 .../gremlin/process/traversal/Contains.java     |  4 ++
 .../gremlin/process/traversal/Operator.java     | 73 ++++++++++++++++++-
 .../gremlin/process/traversal/Order.java        | 17 ++++-
 .../tinkerpop/gremlin/process/traversal/P.java  | 76 ++++++++++++++++++++
 .../gremlin/process/traversal/Pop.java          | 10 ++-
 .../gremlin/process/traversal/Scope.java        | 19 +++--
 .../gremlin/process/traversal/OrderTest.java    | 76 ++++++++++++++++++++
 8 files changed, 277 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c373064/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
----------------------------------------------------------------------
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
index 1f04ca6,04e7130..4fada2f
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
@@@ -49,16 -74,35 +74,35 @@@ public enum Operator implements BinaryO
              return NumberHelper.div((Number) a, (Number) b);
          }
      },
+ 
+     /**
+      * Selects the smaller of the values.
+      *
+      * @since 3.0.0-incubating
+      */
      min {
          public Object apply(final Object a, final Object b) {
 -            return NumberHelper.min((Number) a, (Number) b);
 +            return NumberHelper.min((Comparable) a, (Comparable) b);
          }
      },
+ 
+     /**
+      * Selects the larger of the values.
+      *
+      * @since 3.0.0-incubating
+      */
      max {
          public Object apply(final Object a, final Object b) {
 -            return NumberHelper.max((Number) a, (Number) b);
 +            return NumberHelper.max((Comparable) a, (Comparable) b);
          }
      },
+ 
+     /**
+      * The new incoming value (i.e. the second value to the function) is 
returned unchanged result in the assignment
+      * of that value to the object of the {@code Operator}.
+      *
+      * @since 3.1.0-incubating
+      */
      assign {
          public Object apply(final Object a, final Object b) {
              return b;