From df84bc9458eb1b965ae524d40d2c299d2165860f Mon Sep 17 00:00:00 2001 From: Daniel Kuppitz Date: Fri, 11 Nov 2016 13:06:42 +0100 Subject: [PATCH 1/2] Moved `NumberHelper` into `org.apache.tinkerpop.gremlin.util`. --- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/process/traversal/Operator.java | 2 ++ .../gremlin/process/traversal/SackFunctions.java | 6 +++--- .../process/traversal/step/map/MaxLocalStep.java | 2 +- .../process/traversal/step/map/MeanGlobalStep.java | 6 +++--- .../process/traversal/step/map/MeanLocalStep.java | 2 +- .../process/traversal/step/map/MinLocalStep.java | 2 +- .../process/traversal/step/map/SumGlobalStep.java | 2 +- .../process/traversal/step/map/SumLocalStep.java | 2 +- .../{process/traversal => util}/NumberHelper.java | 10 +--------- .../interceptor/SparkStarBarrierInterceptor.java | 2 +- 11 files changed, 16 insertions(+), 21 deletions(-) rename gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/{process/traversal => util}/NumberHelper.java (99%) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 8211eee2ab4..cf13ef9b56d 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Moved `NumberHelper` into the `org.apache.tinkerpop.gremlin.util` package. * Removed previously deprecated `Console` constructor that took a `String` as an argument from `gremlin-console`. * Removed previously deprecated `ConcurrentBindings` from `gremlin-groovy`. * Removed previously deprecated `ScriptExecutor` from `gremlin-groovy`. diff --git 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 index a52f34beba0..1f63e143d63 100644 --- 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 @@ -18,6 +18,8 @@ */ package org.apache.tinkerpop.gremlin.process.traversal; +import org.apache.tinkerpop.gremlin.util.NumberHelper; + import java.util.Collection; import java.util.Map; import java.util.function.BinaryOperator; diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/SackFunctions.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/SackFunctions.java index 2cac1e30630..4752bf0b320 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/SackFunctions.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/SackFunctions.java @@ -23,9 +23,9 @@ import java.util.function.Consumer; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.add; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.div; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.mul; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.add; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.div; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.mul; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java index dc4c5ce69e4..2baca281cf7 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Set; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.max; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.max; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java index 806d35c5066..2f1c1dc2128 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java @@ -18,7 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.map; -import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper; +import org.apache.tinkerpop.gremlin.util.NumberHelper; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.step.util.ReducingBarrierStep; @@ -31,8 +31,8 @@ import java.util.function.BinaryOperator; import java.util.function.Supplier; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.div; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.mul; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.div; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.mul; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java index fab03bbe1f4..99005c92bae 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java @@ -18,7 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.map; -import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper; +import org.apache.tinkerpop.gremlin.util.NumberHelper; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement; diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java index 116a5e1741c..e7e001c909c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.Set; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.min; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.min; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java index 074a4d5555d..7942d9b6433 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java @@ -29,7 +29,7 @@ import java.util.Set; import java.util.function.BinaryOperator; -import static org.apache.tinkerpop.gremlin.process.traversal.NumberHelper.mul; +import static org.apache.tinkerpop.gremlin.util.NumberHelper.mul; /** * @author Marko A. Rodriguez (http://markorodriguez.com) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java index c383b25f965..b062a7ed31c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java @@ -18,7 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.map; -import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper; +import org.apache.tinkerpop.gremlin.util.NumberHelper; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement; diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java similarity index 99% rename from gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java rename to gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java index b094f296928..153b0176d6d 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tinkerpop.gremlin.process.traversal; +package org.apache.tinkerpop.gremlin.util; import java.math.BigDecimal; import java.math.BigInteger; @@ -40,7 +40,6 @@ public class NumberHelper { final byte x = a.byteValue(), y = b.byteValue(); return x >= y ? x : y; }); - static final NumberHelper SHORT_NUMBER_HELPER = new NumberHelper( (a, b) -> a.shortValue() + b.shortValue(), (a, b) -> a.shortValue() - b.shortValue(), @@ -54,7 +53,6 @@ public class NumberHelper { final short x = a.shortValue(), y = b.shortValue(); return x >= y ? x : y; }); - static final NumberHelper INTEGER_NUMBER_HELPER = new NumberHelper( (a, b) -> a.intValue() + b.intValue(), (a, b) -> a.intValue() - b.intValue(), @@ -68,7 +66,6 @@ public class NumberHelper { final int x = a.intValue(), y = b.intValue(); return x >= y ? x : y; }); - static final NumberHelper LONG_NUMBER_HELPER = new NumberHelper( (a, b) -> a.longValue() + b.longValue(), (a, b) -> a.longValue() - b.longValue(), @@ -82,7 +79,6 @@ public class NumberHelper { final long x = a.longValue(), y = b.longValue(); return x >= y ? x : y; }); - static final NumberHelper BIG_INTEGER_NUMBER_HELPER = new NumberHelper( (a, b) -> bigIntegerValue(a).add(bigIntegerValue(b)), (a, b) -> bigIntegerValue(a).subtract(bigIntegerValue(b)), @@ -96,7 +92,6 @@ public class NumberHelper { final BigInteger x = bigIntegerValue(a), y = bigIntegerValue(b); return x.compareTo(y) >= 0 ? x : y; }); - static final NumberHelper FLOAT_NUMBER_HELPER = new NumberHelper( (a, b) -> a.floatValue() + b.floatValue(), (a, b) -> a.floatValue() - b.floatValue(), @@ -110,7 +105,6 @@ public class NumberHelper { final float x = a.floatValue(), y = b.floatValue(); return x >= y ? x : y; }); - static final NumberHelper DOUBLE_NUMBER_HELPER = new NumberHelper( (a, b) -> a.doubleValue() + b.doubleValue(), (a, b) -> a.doubleValue() - b.doubleValue(), @@ -124,7 +118,6 @@ public class NumberHelper { final double x = a.doubleValue(), y = b.doubleValue(); return x >= y ? x : y; }); - static final NumberHelper BIG_DECIMAL_NUMBER_HELPER = new NumberHelper( (a, b) -> bigDecimalValue(a).add(bigDecimalValue(b)), (a, b) -> bigDecimalValue(a).subtract(bigDecimalValue(b)), @@ -138,7 +131,6 @@ public class NumberHelper { final BigDecimal x = bigDecimalValue(a), y = bigDecimalValue(b); return x.compareTo(y) >= 0 ? x : y; }); - public final BiFunction add; public final BiFunction sub; public final BiFunction mul; diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java index 8585e0dcdcb..18a9f1edb02 100644 --- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java +++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java @@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.computer.ProgramPhase; import org.apache.tinkerpop.gremlin.process.computer.traversal.MemoryTraversalSideEffects; import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram; -import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper; +import org.apache.tinkerpop.gremlin.util.NumberHelper; import org.apache.tinkerpop.gremlin.process.traversal.Scope; import org.apache.tinkerpop.gremlin.process.traversal.Step; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; From 39fad07d5c5ad3a317c9ec88baf9647599f3cb37 Mon Sep 17 00:00:00 2001 From: Daniel Kuppitz Date: Mon, 14 Nov 2016 23:00:40 +0100 Subject: [PATCH 2/2] Made `NummberHelper` class `final`. --- .../java/org/apache/tinkerpop/gremlin/util/NumberHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java index 153b0176d6d..95ab189d332 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java @@ -25,7 +25,7 @@ /** * @author Daniel Kuppitz (http://gremlin.guru) */ -public class NumberHelper { +public final class NumberHelper { static final NumberHelper BYTE_NUMBER_HELPER = new NumberHelper( (a, b) -> a.byteValue() + b.byteValue(),