Skip to content

TINKERPOP-1399 NumberHelper needs to go into util and have a private constructor #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 2 commits into from
Nov 19, 2016
Merged

TINKERPOP-1399 NumberHelper needs to go into util and have a private constructor #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df84bc9
Moved `NumberHelper` into `org.apache.tinkerpop.gremlin.util`.
dkuppitz Nov 11, 2016
39fad07
Made `NummberHelper` class `final`.
dkuppitz Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 2 additions & 0 deletions gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/SackFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 2 additions & 10 deletions ...emlin/process/traversal/NumberHelper.java → .../tinkerpop/gremlin/util/NumberHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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)),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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)),
Expand All @@ -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<Number, Number, Number> add;
public final BiFunction<Number, Number, Number> sub;
public final BiFunction<Number, Number, Number> mul;
Expand Down
2 changes: 1 addition & 1 deletion ...ess/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down