From c96fd8e456bf6cbde58c474a04f5f3ad0ecda473 Mon Sep 17 00:00:00 2001 From: Emil Forslund Date: Tue, 8 May 2018 13:11:11 +0200 Subject: [PATCH] runtime-compute: Fix many warnings by avoiding ambigous method names --- .../runtime/compute/ToBigDecimal.java | 14 +- .../runtime/compute/ToBigDecimalNullable.java | 6 +- .../speedment/runtime/compute/ToBoolean.java | 14 +- .../runtime/compute/ToBooleanNullable.java | 6 +- .../com/speedment/runtime/compute/ToByte.java | 14 +- .../runtime/compute/ToByteNullable.java | 6 +- .../com/speedment/runtime/compute/ToChar.java | 12 +- .../runtime/compute/ToCharNullable.java | 6 +- .../speedment/runtime/compute/ToDouble.java | 9 +- .../runtime/compute/ToDoubleNullable.java | 6 +- .../com/speedment/runtime/compute/ToEnum.java | 4 +- .../runtime/compute/ToEnumNullable.java | 6 +- .../speedment/runtime/compute/ToFloat.java | 14 +- .../runtime/compute/ToFloatNullable.java | 6 +- .../com/speedment/runtime/compute/ToInt.java | 11 +- .../runtime/compute/ToIntNullable.java | 6 +- .../com/speedment/runtime/compute/ToLong.java | 11 +- .../runtime/compute/ToLongNullable.java | 6 +- .../speedment/runtime/compute/ToShort.java | 14 +- .../runtime/compute/ToShortNullable.java | 6 +- .../speedment/runtime/compute/ToString.java | 4 +- .../runtime/compute/ToStringNullable.java | 6 +- .../compute/expression/Expressions.java | 452 +++++++++--------- .../compute/internal/expression/AbsUtil.java | 48 +- .../compute/internal/expression/CastUtil.java | 48 +- .../internal/expression/ComposedUtil.java | 22 +- .../internal/expression/DivideUtil.java | 72 +-- .../internal/expression/MapperUtil.java | 36 +- .../internal/expression/MinusUtil.java | 60 +-- .../internal/expression/MultiplyUtil.java | 60 +-- .../internal/expression/NegateUtil.java | 44 +- .../internal/expression/OrElseGetUtil.java | 44 +- .../internal/expression/OrElseThrowUtil.java | 44 +- .../internal/expression/OrElseUtil.java | 22 +- .../compute/internal/expression/PlusUtil.java | 60 +-- .../compute/internal/expression/PowUtil.java | 48 +- .../compute/internal/expression/SignUtil.java | 14 +- .../compute/internal/expression/SqrtUtil.java | 12 +- 38 files changed, 633 insertions(+), 640 deletions(-) diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimal.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimal.java index 756b744253..d8a9d649d3 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimal.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimal.java @@ -78,22 +78,22 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castBigDecimalToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castBigDecimalToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castBigDecimalToLong(this); } @Override default ToBigDecimal abs() { - return AbsUtil.abs(this); + return AbsUtil.absBigDecimal(this); } @Override @@ -283,12 +283,12 @@ default ToDouble divide(ToDouble divisor) { @Override default ToBigDecimal map(UnaryOperator mapper) { - return MapperUtil.map(this, mapper); + return MapperUtil.mapBigDecimal(this, mapper); } @Override default ToDouble mapToDouble(ToDoubleFunction mapper) { - return MapperUtil.mapToDouble(this, mapper); + return MapperUtil.mapBigDecimalToDouble(this, mapper); } @Override @@ -305,6 +305,6 @@ default int compare(T first, T second) { default ToBigDecimal compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToBigDecimal(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java index 9a91eda26d..056a0464db 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java @@ -65,17 +65,17 @@ default ExpressionType expressionType() { @Override default ToBigDecimal orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.bigDecimalOrElseThrow(this); } @Override default ToBigDecimal orElseGet(ToBigDecimal getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.bigDecimalOrElseGet(this, getter); } @Override default ToBigDecimal orElse(BigDecimal value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.bigDecimalOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBoolean.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBoolean.java index 6f00112baa..08b0b03b5d 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBoolean.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBoolean.java @@ -17,11 +17,9 @@ import com.speedment.runtime.compute.trait.HasMap; import com.speedment.runtime.compute.trait.HasMapToDouble; -import java.math.BigDecimal; import static java.util.Objects.requireNonNull; import java.util.function.Function; import java.util.function.Predicate; -import java.util.function.UnaryOperator; /** * Expression that given an entity returns a {@code boolean} value. This @@ -77,27 +75,27 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castBooleanToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castBooleanToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castBooleanToLong(this); } @Override default ToDouble mapToDouble(BooleanToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapBooleanToDouble(this, operator); } @Override default ToBoolean map(BooleanUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapBoolean(this, operator); } @Override @@ -116,6 +114,6 @@ default int compare(T first, T second) { default ToBoolean compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToBoolean(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBooleanNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBooleanNullable.java index 9b1cf37036..756b66f9a6 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBooleanNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBooleanNullable.java @@ -70,17 +70,17 @@ default boolean applyAsBoolean(T object) throws NullPointerException { @Override default ToBoolean orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.booleanOrElseThrow(this); } @Override default ToBoolean orElseGet(ToBoolean getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.booleanOrElseGet(this, getter); } @Override default ToBoolean orElse(Boolean value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.booleanOrElse(this, value); } default ToDoubleNullable mapToDoubleIfPresent(BooleanToDoubleFunction mapper) { diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByte.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByte.java index ef58bdaa56..8a99830c21 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByte.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByte.java @@ -1,7 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.BooleanToDoubleFunction; -import com.speedment.common.function.BooleanUnaryOperator; import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.common.function.ByteUnaryOperator; import com.speedment.common.function.ToByteFunction; @@ -78,27 +76,27 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castByteToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castByteToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castByteToLong(this); } @Override default ToDouble mapToDouble(ByteToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapByteToDouble(this, operator); } @Override default ToByte map(ByteUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapByte(this, operator); } @Override @@ -308,6 +306,6 @@ default int compare(T first, T second) { default ToByte compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToByte(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByteNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByteNullable.java index 76bbdeb820..2e1dabc030 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByteNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByteNullable.java @@ -72,17 +72,17 @@ default byte applyAsByte(T object) throws NullPointerException { @Override default ToByte orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.byteOrElseThrow(this); } @Override default ToByte orElseGet(ToByte getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.byteOrElseGet(this, getter); } @Override default ToByte orElse(Byte value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.byteOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToChar.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToChar.java index c4fbc868b5..a0b4df3310 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToChar.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToChar.java @@ -1,7 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.BooleanToDoubleFunction; -import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.common.function.CharUnaryOperator; import com.speedment.common.function.ToCharFunction; import com.speedment.runtime.compute.expression.Expression; @@ -64,22 +62,22 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castCharToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castCharToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castCharToLong(this); } @Override default ToChar map(CharUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapChar(this, operator); } @Override @@ -108,6 +106,6 @@ default int compare(T first, T second) { default ToChar compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToChar(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToCharNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToCharNullable.java index f70ecfcfc5..970f58ba2d 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToCharNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToCharNullable.java @@ -68,17 +68,17 @@ default char applyAsChar(T object) throws NullPointerException { @Override default ToChar orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.charOrElseThrow(this); } @Override default ToChar orElseGet(ToChar getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.charOrElseGet(this, getter); } @Override default ToChar orElse(Character value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.charOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDouble.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDouble.java index 2d1aeb9fa1..40c9817e12 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDouble.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDouble.java @@ -1,6 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.BooleanUnaryOperator; import com.speedment.runtime.compute.expression.Expression; import com.speedment.runtime.compute.expression.ExpressionType; import com.speedment.runtime.compute.expression.Expressions; @@ -93,17 +92,17 @@ default ToDouble asDouble() { @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castDoubleToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castDoubleToLong(this); } @Override default ToDouble map(DoubleUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapDouble(this, operator); } @Override @@ -314,6 +313,6 @@ default int compare(T first, T second) { default ToDouble compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToDouble(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDoubleNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDoubleNullable.java index 3ddd7e1cfa..49cce65832 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDoubleNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDoubleNullable.java @@ -71,17 +71,17 @@ default double applyAsDouble(T object) throws NullPointerException { @Override default ToDouble orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.doubleOrElseThrow(this); } @Override default ToDouble orElseGet(ToDouble getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.doubleOrElseGet(this, getter); } @Override default ToDouble orElse(Double value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.doubleOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnum.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnum.java index 5ce2568047..5fd57d2d62 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnum.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnum.java @@ -90,7 +90,7 @@ default ToString asName() { @Override default ToEnum map(UnaryOperator mapper) { - return MapperUtil.map(this, mapper); + return MapperUtil.mapEnum(this, mapper); } @Override @@ -107,6 +107,6 @@ default int compare(T first, T second) { default ToEnum compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToEnum(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java index a6f4426780..cccee7bb04 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java @@ -101,17 +101,17 @@ default ToStringNullable asName() { @Override default ToEnum orThrow() { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.enumOrElseThrow(this); } @Override default ToEnum orElseGet(ToEnum getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.enumOrElseGet(this, getter); } @Override default ToEnum orElse(E value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.enumOrElse(this, value); } default ToDoubleNullable mapToDoubleIfPresent(ToDouble mapper) { diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloat.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloat.java index 6103dcddc0..8740594051 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloat.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloat.java @@ -1,7 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.BooleanUnaryOperator; -import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.common.function.FloatToDoubleFunction; import com.speedment.common.function.FloatUnaryOperator; import com.speedment.common.function.ToFloatFunction; @@ -78,27 +76,27 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castFloatToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castFloatToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castFloatToLong(this); } @Override default ToDouble mapToDouble(FloatToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapFloatToDouble(this, operator); } @Override default ToFloat map(FloatUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapFloat(this, operator); } @Override @@ -309,6 +307,6 @@ default int compare(T first, T second) { default ToFloat compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToFloat(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java index 68d0c1a915..c8090c8e74 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java @@ -72,17 +72,17 @@ default float applyAsFloat(T object) throws NullPointerException { @Override default ToFloat orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.floatOrElseThrow(this); } @Override default ToFloat orElseGet(ToFloat getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.floatOrElseGet(this, getter); } @Override default ToFloat orElse(Float value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.floatOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToInt.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToInt.java index ca22d2fda5..a658568022 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToInt.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToInt.java @@ -1,6 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.runtime.compute.expression.Expression; import com.speedment.runtime.compute.expression.ExpressionType; import com.speedment.runtime.compute.expression.Expressions; @@ -78,7 +77,7 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castIntToDouble(this); } @Override @@ -88,17 +87,17 @@ default ToInt asInt() { @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castIntToLong(this); } @Override default ToDouble mapToDouble(IntToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapIntToDouble(this, operator); } @Override default ToInt map(IntUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapInt(this, operator); } @Override @@ -308,6 +307,6 @@ default int compare(T first, T second) { default ToInt compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToInt(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java index 655189ad03..24e3ab428d 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java @@ -73,17 +73,17 @@ default int applyAsInt(T object) throws NullPointerException { @Override default ToInt orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.intOrElseThrow(this); } @Override default ToInt orElseGet(ToInt getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.intOrElseGet(this, getter); } @Override default ToInt orElse(Integer value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.intOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLong.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLong.java index 8f10a420dc..57a7588da0 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLong.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLong.java @@ -1,6 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.runtime.compute.expression.Expression; import com.speedment.runtime.compute.expression.ExpressionType; import com.speedment.runtime.compute.expression.Expressions; @@ -78,12 +77,12 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castLongToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castLongToInt(this); } @Override @@ -93,12 +92,12 @@ default ToLong asLong() { @Override default ToDouble mapToDouble(LongToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapLongToDouble(this, operator); } @Override default ToLong map(LongUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapLong(this, operator); } @Override @@ -309,6 +308,6 @@ default int compare(T first, T second) { default ToLong compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToLong(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java index db95c407aa..cd1524de2b 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java @@ -72,17 +72,17 @@ default long applyAsLong(T object) throws NullPointerException { @Override default ToLong orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.longOrElseThrow(this); } @Override default ToLong orElseGet(ToLong getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.longOrElseGet(this, getter); } @Override default ToLong orElse(Long value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.longOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShort.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShort.java index c6e7cc7b3c..1f7c7248ec 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShort.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShort.java @@ -1,7 +1,5 @@ package com.speedment.runtime.compute; -import com.speedment.common.function.BooleanUnaryOperator; -import com.speedment.common.function.ByteToDoubleFunction; import com.speedment.common.function.ShortToDoubleFunction; import com.speedment.common.function.ShortUnaryOperator; import com.speedment.common.function.ToShortFunction; @@ -79,27 +77,27 @@ default ExpressionType expressionType() { @Override default ToDouble asDouble() { - return CastUtil.castToDouble(this); + return CastUtil.castShortToDouble(this); } @Override default ToInt asInt() { - return CastUtil.castToInt(this); + return CastUtil.castShortToInt(this); } @Override default ToLong asLong() { - return CastUtil.castToLong(this); + return CastUtil.castShortToLong(this); } @Override default ToDouble mapToDouble(ShortToDoubleFunction operator) { - return MapperUtil.mapToDouble(this, operator); + return MapperUtil.mapShortToDouble(this, operator); } @Override default ToShort map(ShortUnaryOperator operator) { - return MapperUtil.map(this, operator); + return MapperUtil.mapShort(this, operator); } @Override @@ -309,6 +307,6 @@ default int compare(T first, T second) { default ToShort compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToShort(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java index b8dcfac27b..3533c1d61e 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java @@ -72,17 +72,17 @@ default short applyAsShort(T object) throws NullPointerException { @Override default ToShort orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.shortOrElseThrow(this); } @Override default ToShort orElseGet(ToShort getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.shortOrElseGet(this, getter); } @Override default ToShort orElse(Short value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.shortOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToString.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToString.java index 3ee4907624..b1972ad508 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToString.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToString.java @@ -65,7 +65,7 @@ default ExpressionType expressionType() { @Override default ToString map(UnaryOperator mapper) { - return MapperUtil.map(this, mapper); + return MapperUtil.mapString(this, mapper); } @Override @@ -92,6 +92,6 @@ default int compare(T first, T second) { default ToString compose(Function before) { @SuppressWarnings("unchecked") final Function casted = (Function) before; - return ComposedUtil.compose(casted, this); + return ComposedUtil.composeToString(casted, this); } } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java index 6bba1218b8..e96ce71a44 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java @@ -63,17 +63,17 @@ default ExpressionType expressionType() { @Override default ToString orThrow() throws NullPointerException { - return OrElseThrowUtil.orElseThrow(this); + return OrElseThrowUtil.stringOrElseThrow(this); } @Override default ToString orElseGet(ToString getter) { - return OrElseGetUtil.orElseGet(this, getter); + return OrElseGetUtil.stringOrElseGet(this, getter); } @Override default ToString orElse(String value) { - return OrElseUtil.orElse(this, value); + return OrElseUtil.stringOrElse(this, value); } @Override diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/expression/Expressions.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/expression/Expressions.java index 718f0fec59..d362638c4d 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/expression/Expressions.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/expression/Expressions.java @@ -169,7 +169,7 @@ public static ToDoubleNullable floatToDoubleNullable(ToFloatNullable e * @return the new expression */ public static ToByte abs(ToByte expression) { - return AbsUtil.abs(expression); + return AbsUtil.absByte(expression); } /** @@ -181,7 +181,7 @@ public static ToByte abs(ToByte expression) { * @return the new expression */ public static ToShort abs(ToShort expression) { - return AbsUtil.abs(expression); + return AbsUtil.absShort(expression); } /** @@ -193,7 +193,7 @@ public static ToShort abs(ToShort expression) { * @return the new expression */ public static ToInt abs(ToInt expression) { - return AbsUtil.abs(expression); + return AbsUtil.absInt(expression); } /** @@ -205,7 +205,7 @@ public static ToInt abs(ToInt expression) { * @return the new expression */ public static ToLong abs(ToLong expression) { - return AbsUtil.abs(expression); + return AbsUtil.absLong(expression); } /** @@ -217,7 +217,7 @@ public static ToLong abs(ToLong expression) { * @return the new expression */ public static ToFloat abs(ToFloat expression) { - return AbsUtil.abs(expression); + return AbsUtil.absFloat(expression); } /** @@ -229,7 +229,7 @@ public static ToFloat abs(ToFloat expression) { * @return the new expression */ public static ToDouble abs(ToDouble expression) { - return AbsUtil.abs(expression); + return AbsUtil.absDouble(expression); } /** @@ -243,7 +243,7 @@ public static ToDouble abs(ToDouble expression) { * @return the new expression */ public static ToByteNullable absOrNull(ToByteNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absByteOrNull(expression); } /** @@ -257,7 +257,7 @@ public static ToByteNullable absOrNull(ToByteNullable expression) { * @return the new expression */ public static ToShortNullable absOrNull(ToShortNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absShortOrNull(expression); } /** @@ -271,7 +271,7 @@ public static ToShortNullable absOrNull(ToShortNullable expression) { * @return the new expression */ public static ToIntNullable absOrNull(ToIntNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absIntOrNull(expression); } /** @@ -285,7 +285,7 @@ public static ToIntNullable absOrNull(ToIntNullable expression) { * @return the new expression */ public static ToLongNullable absOrNull(ToLongNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absLongOrNull(expression); } /** @@ -299,7 +299,7 @@ public static ToLongNullable absOrNull(ToLongNullable expression) { * @return the new expression */ public static ToFloatNullable absOrNull(ToFloatNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absFloatOrNull(expression); } /** @@ -313,7 +313,7 @@ public static ToFloatNullable absOrNull(ToFloatNullable expression) { * @return the new expression */ public static ToDoubleNullable absOrNull(ToDoubleNullable expression) { - return AbsUtil.absOrNull(expression); + return AbsUtil.absDoubleOrNull(expression); } //////////////////////////////////////////////////////////////////////////// @@ -331,7 +331,7 @@ public static ToDoubleNullable absOrNull(ToDoubleNullable expression) * @return the new expression */ public static ToByte sign(ToByte expression) { - return SignUtil.sign(expression); + return SignUtil.signByte(expression); } /** @@ -345,7 +345,7 @@ public static ToByte sign(ToByte expression) { * @return the new expression */ public static ToByte sign(ToShort expression) { - return SignUtil.sign(expression); + return SignUtil.signShort(expression); } /** @@ -359,7 +359,7 @@ public static ToByte sign(ToShort expression) { * @return the new expression */ public static ToByte sign(ToInt expression) { - return SignUtil.sign(expression); + return SignUtil.signInt(expression); } /** @@ -373,7 +373,7 @@ public static ToByte sign(ToInt expression) { * @return the new expression */ public static ToByte sign(ToLong expression) { - return SignUtil.sign(expression); + return SignUtil.signLong(expression); } /** @@ -387,7 +387,7 @@ public static ToByte sign(ToLong expression) { * @return the new expression */ public static ToByte sign(ToFloat expression) { - return SignUtil.sign(expression); + return SignUtil.signFloat(expression); } /** @@ -401,7 +401,7 @@ public static ToByte sign(ToFloat expression) { * @return the new expression */ public static ToByte sign(ToDouble expression) { - return SignUtil.sign(expression); + return SignUtil.signDouble(expression); } /** @@ -415,7 +415,7 @@ public static ToByte sign(ToDouble expression) { * @return the new expression */ public static ToByte sign(ToBigDecimal expression) { - return SignUtil.sign(expression); + return SignUtil.signBigDecimal(expression); } /** @@ -432,7 +432,7 @@ public static ToByte sign(ToBigDecimal expression) { */ public static ToByteNullable signOrNull(ToByteNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signByte(expression.orThrow()), expression.isNull()); } @@ -450,7 +450,7 @@ public static ToByteNullable signOrNull(ToByteNullable expression) { */ public static ToByteNullable signOrNull(ToShortNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signShort(expression.orThrow()), expression.isNull()); } @@ -468,7 +468,7 @@ public static ToByteNullable signOrNull(ToShortNullable expression) { */ public static ToByteNullable signOrNull(ToIntNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signInt(expression.orThrow()), expression.isNull()); } @@ -486,7 +486,7 @@ public static ToByteNullable signOrNull(ToIntNullable expression) { */ public static ToByteNullable signOrNull(ToLongNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signLong(expression.orThrow()), expression.isNull()); } @@ -504,7 +504,7 @@ public static ToByteNullable signOrNull(ToLongNullable expression) { */ public static ToByteNullable signOrNull(ToFloatNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signFloat(expression.orThrow()), expression.isNull()); } @@ -522,7 +522,7 @@ public static ToByteNullable signOrNull(ToFloatNullable expression) { */ public static ToByteNullable signOrNull(ToDoubleNullable expression) { return new ToByteNullableImpl<>( - SignUtil.sign(expression.orThrow()), + SignUtil.signDouble(expression.orThrow()), expression.isNull()); } @@ -539,7 +539,7 @@ public static ToByteNullable signOrNull(ToDoubleNullable expression) { * @return the new expression */ public static ToDouble sqrt(ToByte expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtByte(expression); } /** @@ -551,7 +551,7 @@ public static ToDouble sqrt(ToByte expression) { * @return the new expression */ public static ToDouble sqrt(ToShort expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtShort(expression); } /** @@ -563,7 +563,7 @@ public static ToDouble sqrt(ToShort expression) { * @return the new expression */ public static ToDouble sqrt(ToInt expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtInt(expression); } /** @@ -575,7 +575,7 @@ public static ToDouble sqrt(ToInt expression) { * @return the new expression */ public static ToDouble sqrt(ToLong expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtLong(expression); } /** @@ -587,7 +587,7 @@ public static ToDouble sqrt(ToLong expression) { * @return the new expression */ public static ToDouble sqrt(ToFloat expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtFloat(expression); } /** @@ -599,7 +599,7 @@ public static ToDouble sqrt(ToFloat expression) { * @return the new expression */ public static ToDouble sqrt(ToDouble expression) { - return SqrtUtil.sqrt(expression); + return SqrtUtil.sqrtDouble(expression); } /** @@ -614,7 +614,7 @@ public static ToDouble sqrt(ToDouble expression) { */ public static ToDoubleNullable sqrtOrNull(ToByteNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtByte(expression.orThrow()), expression.isNull() ); } @@ -631,7 +631,7 @@ public static ToDoubleNullable sqrtOrNull(ToByteNullable expression) { */ public static ToDoubleNullable sqrtOrNull(ToShortNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtShort(expression.orThrow()), expression.isNull() ); } @@ -648,7 +648,7 @@ public static ToDoubleNullable sqrtOrNull(ToShortNullable expression) */ public static ToDoubleNullable sqrtOrNull(ToIntNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtInt(expression.orThrow()), expression.isNull() ); } @@ -665,7 +665,7 @@ public static ToDoubleNullable sqrtOrNull(ToIntNullable expression) { */ public static ToDoubleNullable sqrtOrNull(ToLongNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtLong(expression.orThrow()), expression.isNull() ); } @@ -682,7 +682,7 @@ public static ToDoubleNullable sqrtOrNull(ToLongNullable expression) { */ public static ToDoubleNullable sqrtOrNull(ToFloatNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtFloat(expression.orThrow()), expression.isNull() ); } @@ -699,7 +699,7 @@ public static ToDoubleNullable sqrtOrNull(ToFloatNullable expression) */ public static ToDoubleNullable sqrtOrNull(ToDoubleNullable expression) { return new ToDoubleNullableImpl<>( - SqrtUtil.sqrt(expression.orThrow()), + SqrtUtil.sqrtDouble(expression.orThrow()), expression.isNull() ); } @@ -718,7 +718,7 @@ public static ToDoubleNullable sqrtOrNull(ToDoubleNullable expression) * @return the new expression */ public static ToDouble pow(ToByte expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.bytePowInt(expression, power); } /** @@ -731,7 +731,7 @@ public static ToDouble pow(ToByte expression, int power) { * @return the new expression */ public static ToDouble pow(ToByte expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.bytePowDouble(expression, power); } /** @@ -745,7 +745,7 @@ public static ToDouble pow(ToByte expression, double power) { * @return the new expression */ public static ToDouble pow(ToByte expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.bytePowInt(expression, power); } /** @@ -759,7 +759,7 @@ public static ToDouble pow(ToByte expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToByte expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.bytePowDouble(expression, power); } /** @@ -774,7 +774,7 @@ public static ToDouble pow(ToByte expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToByteNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.bytePowInt(expression.orThrow(), power), expression.isNull() ); } @@ -791,7 +791,7 @@ public static ToDouble pow(ToByte expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToByteNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.bytePowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -809,7 +809,7 @@ public static ToDouble pow(ToByte expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToByteNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.bytePowInt(expression.orThrow(), power), expression.isNull() ); } @@ -827,7 +827,7 @@ public static ToDouble pow(ToByte expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToByteNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.bytePowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -842,7 +842,7 @@ public static ToDouble pow(ToByte expression, ToDouble power) { * @return the new expression */ public static ToDouble pow(ToShort expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.shortPowInt(expression, power); } /** @@ -855,7 +855,7 @@ public static ToDouble pow(ToShort expression, int power) { * @return the new expression */ public static ToDouble pow(ToShort expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.shortPowDouble(expression, power); } /** @@ -869,7 +869,7 @@ public static ToDouble pow(ToShort expression, double power) { * @return the new expression */ public static ToDouble pow(ToShort expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.shortPowInt(expression, power); } /** @@ -883,7 +883,7 @@ public static ToDouble pow(ToShort expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToShort expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.shortPowDouble(expression, power); } /** @@ -898,7 +898,7 @@ public static ToDouble pow(ToShort expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToShortNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.shortPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -915,7 +915,7 @@ public static ToDouble pow(ToShort expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToShortNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.shortPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -933,7 +933,7 @@ public static ToDouble pow(ToShort expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToShortNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.shortPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -951,7 +951,7 @@ public static ToDouble pow(ToShort expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToShortNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.shortPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -966,7 +966,7 @@ public static ToDouble pow(ToShort expression, ToDouble power) { * @return the new expression */ public static ToDouble pow(ToInt expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.intPowInt(expression, power); } /** @@ -979,7 +979,7 @@ public static ToDouble pow(ToInt expression, int power) { * @return the new expression */ public static ToDouble pow(ToInt expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.intPowDouble(expression, power); } /** @@ -993,7 +993,7 @@ public static ToDouble pow(ToInt expression, double power) { * @return the new expression */ public static ToDouble pow(ToInt expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.intPowInt(expression, power); } /** @@ -1007,7 +1007,7 @@ public static ToDouble pow(ToInt expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToInt expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.intPowDouble(expression, power); } /** @@ -1022,7 +1022,7 @@ public static ToDouble pow(ToInt expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToIntNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.intPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1039,7 +1039,7 @@ public static ToDouble pow(ToInt expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToIntNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.intPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1057,7 +1057,7 @@ public static ToDouble pow(ToInt expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToIntNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.intPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1075,7 +1075,7 @@ public static ToDouble pow(ToInt expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToIntNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.intPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1090,7 +1090,7 @@ public static ToDouble pow(ToInt expression, ToDouble power) { * @return the new expression */ public static ToDouble pow(ToLong expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.longPowInt(expression, power); } /** @@ -1103,7 +1103,7 @@ public static ToDouble pow(ToLong expression, int power) { * @return the new expression */ public static ToDouble pow(ToLong expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.longPowDouble(expression, power); } /** @@ -1117,7 +1117,7 @@ public static ToDouble pow(ToLong expression, double power) { * @return the new expression */ public static ToDouble pow(ToLong expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.longPowInt(expression, power); } /** @@ -1131,7 +1131,7 @@ public static ToDouble pow(ToLong expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToLong expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.longPowDouble(expression, power); } /** @@ -1146,7 +1146,7 @@ public static ToDouble pow(ToLong expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToLongNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.longPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1163,7 +1163,7 @@ public static ToDouble pow(ToLong expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToLongNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.longPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1181,7 +1181,7 @@ public static ToDouble pow(ToLong expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToLongNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.longPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1199,7 +1199,7 @@ public static ToDouble pow(ToLong expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToLongNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.longPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1214,7 +1214,7 @@ public static ToDouble pow(ToLong expression, ToDouble power) { * @return the new expression */ public static ToDouble pow(ToFloat expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.floatPowInt(expression, power); } /** @@ -1227,7 +1227,7 @@ public static ToDouble pow(ToFloat expression, int power) { * @return the new expression */ public static ToDouble pow(ToFloat expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.floatPowDouble(expression, power); } /** @@ -1241,7 +1241,7 @@ public static ToDouble pow(ToFloat expression, double power) { * @return the new expression */ public static ToDouble pow(ToFloat expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.floatPowInt(expression, power); } /** @@ -1255,7 +1255,7 @@ public static ToDouble pow(ToFloat expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToFloat expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.floatPowDouble(expression, power); } /** @@ -1270,7 +1270,7 @@ public static ToDouble pow(ToFloat expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToFloatNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.floatPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1287,7 +1287,7 @@ public static ToDouble pow(ToFloat expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToFloatNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.floatPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1305,7 +1305,7 @@ public static ToDouble pow(ToFloat expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToFloatNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.floatPowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1323,7 +1323,7 @@ public static ToDouble pow(ToFloat expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToFloatNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.floatPowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1338,7 +1338,7 @@ public static ToDouble pow(ToFloat expression, ToDouble power) { * @return the new expression */ public static ToDouble pow(ToDouble expression, int power) { - return PowUtil.pow(expression, power); + return PowUtil.doublePowInt(expression, power); } /** @@ -1351,7 +1351,7 @@ public static ToDouble pow(ToDouble expression, int power) { * @return the new expression */ public static ToDouble pow(ToDouble expression, double power) { - return PowUtil.pow(expression, power); + return PowUtil.doublePowDouble(expression, power); } /** @@ -1365,7 +1365,7 @@ public static ToDouble pow(ToDouble expression, double power) { * @return the new expression */ public static ToDouble pow(ToDouble expression, ToInt power) { - return PowUtil.pow(expression, power); + return PowUtil.doublePowInt(expression, power); } /** @@ -1379,7 +1379,7 @@ public static ToDouble pow(ToDouble expression, ToInt power) { * @return the new expression */ public static ToDouble pow(ToDouble expression, ToDouble power) { - return PowUtil.pow(expression, power); + return PowUtil.doublePowDouble(expression, power); } /** @@ -1394,7 +1394,7 @@ public static ToDouble pow(ToDouble expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToDoubleNullable expression, int power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.doublePowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1411,7 +1411,7 @@ public static ToDouble pow(ToDouble expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToDoubleNullable expression, double power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.doublePowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1429,7 +1429,7 @@ public static ToDouble pow(ToDouble expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToDoubleNullable expression, ToInt power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.doublePowInt(expression.orThrow(), power), expression.isNull() ); } @@ -1447,7 +1447,7 @@ public static ToDouble pow(ToDouble expression, ToDouble power) { public static ToDoubleNullable powOrNull(ToDoubleNullable expression, ToDouble power) { return new ToDoubleNullableImpl<>( - PowUtil.pow(expression.orThrow(), power), + PowUtil.doublePowDouble(expression.orThrow(), power), expression.isNull() ); } @@ -1465,7 +1465,7 @@ public static ToDouble pow(ToDouble expression, ToDouble power) { * @return the new expression */ public static ToByte negate(ToByte expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateByte(expression); } /** @@ -1477,7 +1477,7 @@ public static ToByte negate(ToByte expression) { * @return the new expression */ public static ToShort negate(ToShort expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateShort(expression); } /** @@ -1489,7 +1489,7 @@ public static ToShort negate(ToShort expression) { * @return the new expression */ public static ToInt negate(ToInt expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateInt(expression); } /** @@ -1501,7 +1501,7 @@ public static ToInt negate(ToInt expression) { * @return the new expression */ public static ToLong negate(ToLong expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateLong(expression); } /** @@ -1513,7 +1513,7 @@ public static ToLong negate(ToLong expression) { * @return the new expression */ public static ToFloat negate(ToFloat expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateFloat(expression); } /** @@ -1525,7 +1525,7 @@ public static ToFloat negate(ToFloat expression) { * @return the new expression */ public static ToDouble negate(ToDouble expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateDouble(expression); } /** @@ -1537,7 +1537,7 @@ public static ToDouble negate(ToDouble expression) { * @return the new expression */ public static ToBigDecimal negate(ToBigDecimal expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateBigDecimal(expression); } @@ -1550,7 +1550,7 @@ public static ToBigDecimal negate(ToBigDecimal expression) { * @return the new expression */ public static ToBoolean negate(ToBoolean expression) { - return NegateUtil.negate(expression); + return NegateUtil.negateBoolean(expression); } /** @@ -1563,7 +1563,7 @@ public static ToBoolean negate(ToBoolean expression) { * @return the new expression */ public static ToByteNullable negateOrNull(ToByteNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateByteOrNull(expression); } /** @@ -1576,7 +1576,7 @@ public static ToByteNullable negateOrNull(ToByteNullable expression) { * @return the new expression */ public static ToShortNullable negateOrNull(ToShortNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateShortOrNull(expression); } /** @@ -1589,7 +1589,7 @@ public static ToShortNullable negateOrNull(ToShortNullable expression) * @return the new expression */ public static ToIntNullable negateOrNull(ToIntNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateIntOrNull(expression); } /** @@ -1602,7 +1602,7 @@ public static ToIntNullable negateOrNull(ToIntNullable expression) { * @return the new expression */ public static ToLongNullable negateOrNull(ToLongNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateLongOrNull(expression); } /** @@ -1615,7 +1615,7 @@ public static ToLongNullable negateOrNull(ToLongNullable expression) { * @return the new expression */ public static ToFloatNullable negateOrNull(ToFloatNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateFloatOrNull(expression); } /** @@ -1628,7 +1628,7 @@ public static ToFloatNullable negateOrNull(ToFloatNullable expression) * @return the new expression */ public static ToDoubleNullable negateOrNull(ToDoubleNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateDoubleOrNull(expression); } /** @@ -1641,7 +1641,7 @@ public static ToDoubleNullable negateOrNull(ToDoubleNullable expressio * @return the new expression */ public static ToBooleanNullable negateOrNull(ToBooleanNullable expression) { - return NegateUtil.negateOrNull(expression); + return NegateUtil.negateBooleanOrNull(expression); } //////////////////////////////////////////////////////////////////////////// @@ -1658,7 +1658,7 @@ public static ToBooleanNullable negateOrNull(ToBooleanNullable express * @return the new expression */ public static ToShort plus(ToByte first, byte second) { - return PlusUtil.plus(first, second); + return PlusUtil.bytePlusByte(first, second); } /** @@ -1671,7 +1671,7 @@ public static ToShort plus(ToByte first, byte second) { * @return the new expression */ public static ToInt plus(ToByte first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.bytePlusInt(first, second); } /** @@ -1684,7 +1684,7 @@ public static ToInt plus(ToByte first, int second) { * @return the new expression */ public static ToLong plus(ToByte first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.bytePlusLong(first, second); } /** @@ -1697,7 +1697,7 @@ public static ToLong plus(ToByte first, long second) { * @return the new expression */ public static ToShort plus(ToByte first, ToByte second) { - return PlusUtil.plus(first, second); + return PlusUtil.bytePlusByte(first, second); } /** @@ -1710,7 +1710,7 @@ public static ToShort plus(ToByte first, ToByte second) { * @return the new expression */ public static ToInt plus(ToShort first, byte second) { - return PlusUtil.plus(first, second); + return PlusUtil.shortPlusByte(first, second); } /** @@ -1723,7 +1723,7 @@ public static ToInt plus(ToShort first, byte second) { * @return the new expression */ public static ToInt plus(ToShort first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.shortPlusInt(first, second); } /** @@ -1736,7 +1736,7 @@ public static ToInt plus(ToShort first, int second) { * @return the new expression */ public static ToLong plus(ToShort first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.shortPlusLong(first, second); } /** @@ -1749,7 +1749,7 @@ public static ToLong plus(ToShort first, long second) { * @return the new expression */ public static ToShort plus(ToShort first, ToShort second) { - return PlusUtil.plus(first, second); + return PlusUtil.shortPlusShort(first, second); } /** @@ -1762,7 +1762,7 @@ public static ToShort plus(ToShort first, ToShort second) { * @return the new expression */ public static ToInt plus(ToInt first, byte second) { - return PlusUtil.plus(first, second); + return PlusUtil.intPlusByte(first, second); } /** @@ -1775,7 +1775,7 @@ public static ToInt plus(ToInt first, byte second) { * @return the new expression */ public static ToInt plus(ToInt first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.intPlusInt(first, second); } /** @@ -1788,7 +1788,7 @@ public static ToInt plus(ToInt first, int second) { * @return the new expression */ public static ToLong plus(ToInt first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.intPlusLong(first, second); } /** @@ -1801,7 +1801,7 @@ public static ToLong plus(ToInt first, long second) { * @return the new expression */ public static ToInt plus(ToInt first, ToByte second) { - return PlusUtil.plus(first, second); + return PlusUtil.intPlusByte(first, second); } /** @@ -1814,7 +1814,7 @@ public static ToInt plus(ToInt first, ToByte second) { * @return the new expression */ public static ToInt plus(ToInt first, ToInt second) { - return PlusUtil.plus(first, second); + return PlusUtil.intPlusInt(first, second); } /** @@ -1827,7 +1827,7 @@ public static ToInt plus(ToInt first, ToInt second) { * @return the new expression */ public static ToLong plus(ToLong first, byte second) { - return PlusUtil.plus(first, second); + return PlusUtil.longPlusByte(first, second); } /** @@ -1840,7 +1840,7 @@ public static ToLong plus(ToLong first, byte second) { * @return the new expression */ public static ToLong plus(ToLong first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.longPlusInt(first, second); } /** @@ -1853,7 +1853,7 @@ public static ToLong plus(ToLong first, int second) { * @return the new expression */ public static ToLong plus(ToLong first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.longPlusLong(first, second); } /** @@ -1866,7 +1866,7 @@ public static ToLong plus(ToLong first, long second) { * @return the new expression */ public static ToLong plus(ToLong first, ToInt second) { - return PlusUtil.plus(first, second); + return PlusUtil.longPlusInt(first, second); } /** @@ -1879,7 +1879,7 @@ public static ToLong plus(ToLong first, ToInt second) { * @return the new expression */ public static ToLong plus(ToLong first, ToLong second) { - return PlusUtil.plus(first, second); + return PlusUtil.longPlusLong(first, second); } /** @@ -1892,7 +1892,7 @@ public static ToLong plus(ToLong first, ToLong second) { * @return the new expression */ public static ToFloat plus(ToFloat first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusInt(first, second); } /** @@ -1905,7 +1905,7 @@ public static ToFloat plus(ToFloat first, int second) { * @return the new expression */ public static ToDouble plus(ToFloat first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusLong(first, second); } /** @@ -1918,7 +1918,7 @@ public static ToDouble plus(ToFloat first, long second) { * @return the new expression */ public static ToFloat plus(ToFloat first, float second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusFloat(first, second); } /** @@ -1931,7 +1931,7 @@ public static ToFloat plus(ToFloat first, float second) { * @return the new expression */ public static ToFloat plus(ToFloat first, ToInt second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusInt(first, second); } /** @@ -1944,7 +1944,7 @@ public static ToFloat plus(ToFloat first, ToInt second) { * @return the new expression */ public static ToDouble plus(ToFloat first, ToLong second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusLong(first, second); } /** @@ -1957,7 +1957,7 @@ public static ToDouble plus(ToFloat first, ToLong second) { * @return the new expression */ public static ToFloat plus(ToFloat first, ToFloat second) { - return PlusUtil.plus(first, second); + return PlusUtil.floatPlusFloat(first, second); } /** @@ -1970,7 +1970,7 @@ public static ToFloat plus(ToFloat first, ToFloat second) { * @return the new expression */ public static ToDouble plus(ToDouble first, int second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusInt(first, second); } /** @@ -1983,7 +1983,7 @@ public static ToDouble plus(ToDouble first, int second) { * @return the new expression */ public static ToDouble plus(ToDouble first, long second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusLong(first, second); } /** @@ -1996,7 +1996,7 @@ public static ToDouble plus(ToDouble first, long second) { * @return the new expression */ public static ToDouble plus(ToDouble first, double second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusDouble(first, second); } /** @@ -2009,7 +2009,7 @@ public static ToDouble plus(ToDouble first, double second) { * @return the new expression */ public static ToDouble plus(ToDouble first, ToInt second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusInt(first, second); } /** @@ -2022,7 +2022,7 @@ public static ToDouble plus(ToDouble first, ToInt second) { * @return the new expression */ public static ToDouble plus(ToDouble first, ToLong second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusLong(first, second); } /** @@ -2035,7 +2035,7 @@ public static ToDouble plus(ToDouble first, ToLong second) { * @return the new expression */ public static ToDouble plus(ToDouble first, ToDouble second) { - return PlusUtil.plus(first, second); + return PlusUtil.doublePlusDouble(first, second); } //////////////////////////////////////////////////////////////////////////// @@ -2052,7 +2052,7 @@ public static ToDouble plus(ToDouble first, ToDouble second) { * @return the new expression */ public static ToShort minus(ToByte first, byte second) { - return MinusUtil.minus(first, second); + return MinusUtil.byteMinusByte(first, second); } /** @@ -2065,7 +2065,7 @@ public static ToShort minus(ToByte first, byte second) { * @return the new expression */ public static ToInt minus(ToByte first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.byteMinusInt(first, second); } /** @@ -2078,7 +2078,7 @@ public static ToInt minus(ToByte first, int second) { * @return the new expression */ public static ToLong minus(ToByte first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.byteMinusLong(first, second); } /** @@ -2091,7 +2091,7 @@ public static ToLong minus(ToByte first, long second) { * @return the new expression */ public static ToShort minus(ToByte first, ToByte second) { - return MinusUtil.minus(first, second); + return MinusUtil.byteMinusByte(first, second); } /** @@ -2104,7 +2104,7 @@ public static ToShort minus(ToByte first, ToByte second) { * @return the new expression */ public static ToInt minus(ToShort first, byte second) { - return MinusUtil.minus(first, second); + return MinusUtil.shortMinusByte(first, second); } /** @@ -2117,7 +2117,7 @@ public static ToInt minus(ToShort first, byte second) { * @return the new expression */ public static ToInt minus(ToShort first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.shortMinusInt(first, second); } /** @@ -2130,7 +2130,7 @@ public static ToInt minus(ToShort first, int second) { * @return the new expression */ public static ToLong minus(ToShort first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.shortMinusLong(first, second); } /** @@ -2143,7 +2143,7 @@ public static ToLong minus(ToShort first, long second) { * @return the new expression */ public static ToShort minus(ToShort first, ToShort second) { - return MinusUtil.minus(first, second); + return MinusUtil.shortMinusShort(first, second); } /** @@ -2156,7 +2156,7 @@ public static ToShort minus(ToShort first, ToShort second) { * @return the new expression */ public static ToInt minus(ToInt first, byte second) { - return MinusUtil.minus(first, second); + return MinusUtil.intMinusByte(first, second); } /** @@ -2169,7 +2169,7 @@ public static ToInt minus(ToInt first, byte second) { * @return the new expression */ public static ToInt minus(ToInt first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.intMinusInt(first, second); } /** @@ -2182,7 +2182,7 @@ public static ToInt minus(ToInt first, int second) { * @return the new expression */ public static ToLong minus(ToInt first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.intMinusLong(first, second); } /** @@ -2195,7 +2195,7 @@ public static ToLong minus(ToInt first, long second) { * @return the new expression */ public static ToInt minus(ToInt first, ToByte second) { - return MinusUtil.minus(first, second); + return MinusUtil.intMinusByte(first, second); } /** @@ -2208,7 +2208,7 @@ public static ToInt minus(ToInt first, ToByte second) { * @return the new expression */ public static ToInt minus(ToInt first, ToInt second) { - return MinusUtil.minus(first, second); + return MinusUtil.intMinusInt(first, second); } /** @@ -2221,7 +2221,7 @@ public static ToInt minus(ToInt first, ToInt second) { * @return the new expression */ public static ToLong minus(ToLong first, byte second) { - return MinusUtil.minus(first, second); + return MinusUtil.longMinusByte(first, second); } /** @@ -2234,7 +2234,7 @@ public static ToLong minus(ToLong first, byte second) { * @return the new expression */ public static ToLong minus(ToLong first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.longMinusInt(first, second); } /** @@ -2247,7 +2247,7 @@ public static ToLong minus(ToLong first, int second) { * @return the new expression */ public static ToLong minus(ToLong first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.longMinusLong(first, second); } /** @@ -2260,7 +2260,7 @@ public static ToLong minus(ToLong first, long second) { * @return the new expression */ public static ToLong minus(ToLong first, ToInt second) { - return MinusUtil.minus(first, second); + return MinusUtil.longMinusInt(first, second); } /** @@ -2273,7 +2273,7 @@ public static ToLong minus(ToLong first, ToInt second) { * @return the new expression */ public static ToLong minus(ToLong first, ToLong second) { - return MinusUtil.minus(first, second); + return MinusUtil.longMinusLong(first, second); } /** @@ -2286,7 +2286,7 @@ public static ToLong minus(ToLong first, ToLong second) { * @return the new expression */ public static ToFloat minus(ToFloat first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusInt(first, second); } /** @@ -2299,7 +2299,7 @@ public static ToFloat minus(ToFloat first, int second) { * @return the new expression */ public static ToDouble minus(ToFloat first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusLong(first, second); } /** @@ -2312,7 +2312,7 @@ public static ToDouble minus(ToFloat first, long second) { * @return the new expression */ public static ToFloat minus(ToFloat first, float second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusFloat(first, second); } /** @@ -2325,7 +2325,7 @@ public static ToFloat minus(ToFloat first, float second) { * @return the new expression */ public static ToFloat minus(ToFloat first, ToInt second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusInt(first, second); } /** @@ -2338,7 +2338,7 @@ public static ToFloat minus(ToFloat first, ToInt second) { * @return the new expression */ public static ToDouble minus(ToFloat first, ToLong second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusLong(first, second); } /** @@ -2351,7 +2351,7 @@ public static ToDouble minus(ToFloat first, ToLong second) { * @return the new expression */ public static ToFloat minus(ToFloat first, ToFloat second) { - return MinusUtil.minus(first, second); + return MinusUtil.floatMinusFloat(first, second); } /** @@ -2364,7 +2364,7 @@ public static ToFloat minus(ToFloat first, ToFloat second) { * @return the new expression */ public static ToDouble minus(ToDouble first, int second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusInt(first, second); } /** @@ -2377,7 +2377,7 @@ public static ToDouble minus(ToDouble first, int second) { * @return the new expression */ public static ToDouble minus(ToDouble first, long second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusLong(first, second); } /** @@ -2390,7 +2390,7 @@ public static ToDouble minus(ToDouble first, long second) { * @return the new expression */ public static ToDouble minus(ToDouble first, double second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusDouble(first, second); } /** @@ -2403,7 +2403,7 @@ public static ToDouble minus(ToDouble first, double second) { * @return the new expression */ public static ToDouble minus(ToDouble first, ToInt second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusInt(first, second); } /** @@ -2416,7 +2416,7 @@ public static ToDouble minus(ToDouble first, ToInt second) { * @return the new expression */ public static ToDouble minus(ToDouble first, ToLong second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusLong(first, second); } /** @@ -2429,7 +2429,7 @@ public static ToDouble minus(ToDouble first, ToLong second) { * @return the new expression */ public static ToDouble minus(ToDouble first, ToDouble second) { - return MinusUtil.minus(first, second); + return MinusUtil.doubleMinusDouble(first, second); } //////////////////////////////////////////////////////////////////////////// @@ -2446,7 +2446,7 @@ public static ToDouble minus(ToDouble first, ToDouble second) { * @return the new expression */ public static ToInt multiply(ToByte first, byte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.byteMultiplyByte(first, second); } /** @@ -2459,7 +2459,7 @@ public static ToInt multiply(ToByte first, byte second) { * @return the new expression */ public static ToInt multiply(ToByte first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.byteMultiplyInt(first, second); } /** @@ -2472,7 +2472,7 @@ public static ToInt multiply(ToByte first, int second) { * @return the new expression */ public static ToLong multiply(ToByte first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.byteMultiplyLong(first, second); } /** @@ -2485,7 +2485,7 @@ public static ToLong multiply(ToByte first, long second) { * @return the new expression */ public static ToInt multiply(ToByte first, ToByte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.byteMultiplyByte(first, second); } /** @@ -2498,7 +2498,7 @@ public static ToInt multiply(ToByte first, ToByte second) { * @return the new expression */ public static ToInt multiply(ToShort first, byte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.shortMultiplyByte(first, second); } /** @@ -2511,7 +2511,7 @@ public static ToInt multiply(ToShort first, byte second) { * @return the new expression */ public static ToInt multiply(ToShort first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.shortMultiplyInt(first, second); } /** @@ -2524,7 +2524,7 @@ public static ToInt multiply(ToShort first, int second) { * @return the new expression */ public static ToLong multiply(ToShort first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.shortMultiplyLong(first, second); } /** @@ -2537,7 +2537,7 @@ public static ToLong multiply(ToShort first, long second) { * @return the new expression */ public static ToInt multiply(ToShort first, ToShort second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.shortMultiplyShort(first, second); } /** @@ -2550,7 +2550,7 @@ public static ToInt multiply(ToShort first, ToShort second) { * @return the new expression */ public static ToInt multiply(ToInt first, byte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.intMultiplyByte(first, second); } /** @@ -2563,7 +2563,7 @@ public static ToInt multiply(ToInt first, byte second) { * @return the new expression */ public static ToInt multiply(ToInt first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.intMultiplyInt(first, second); } /** @@ -2576,7 +2576,7 @@ public static ToInt multiply(ToInt first, int second) { * @return the new expression */ public static ToLong multiply(ToInt first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.intMultiplyLong(first, second); } /** @@ -2589,7 +2589,7 @@ public static ToLong multiply(ToInt first, long second) { * @return the new expression */ public static ToInt multiply(ToInt first, ToByte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.intMultiplyByte(first, second); } /** @@ -2602,7 +2602,7 @@ public static ToInt multiply(ToInt first, ToByte second) { * @return the new expression */ public static ToInt multiply(ToInt first, ToInt second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.intMultiplyInt(first, second); } /** @@ -2615,7 +2615,7 @@ public static ToInt multiply(ToInt first, ToInt second) { * @return the new expression */ public static ToLong multiply(ToLong first, byte second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.longMultiplyByte(first, second); } /** @@ -2628,7 +2628,7 @@ public static ToLong multiply(ToLong first, byte second) { * @return the new expression */ public static ToLong multiply(ToLong first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.longMultiplyInt(first, second); } /** @@ -2641,7 +2641,7 @@ public static ToLong multiply(ToLong first, int second) { * @return the new expression */ public static ToLong multiply(ToLong first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.longMultiplyLong(first, second); } /** @@ -2654,7 +2654,7 @@ public static ToLong multiply(ToLong first, long second) { * @return the new expression */ public static ToLong multiply(ToLong first, ToInt second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.longMultiplyInt(first, second); } /** @@ -2667,7 +2667,7 @@ public static ToLong multiply(ToLong first, ToInt second) { * @return the new expression */ public static ToLong multiply(ToLong first, ToLong second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.longMultiplyLong(first, second); } /** @@ -2680,7 +2680,7 @@ public static ToLong multiply(ToLong first, ToLong second) { * @return the new expression */ public static ToFloat multiply(ToFloat first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyInt(first, second); } /** @@ -2693,7 +2693,7 @@ public static ToFloat multiply(ToFloat first, int second) { * @return the new expression */ public static ToDouble multiply(ToFloat first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyLong(first, second); } /** @@ -2706,7 +2706,7 @@ public static ToDouble multiply(ToFloat first, long second) { * @return the new expression */ public static ToFloat multiply(ToFloat first, float second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyFloat(first, second); } /** @@ -2719,7 +2719,7 @@ public static ToFloat multiply(ToFloat first, float second) { * @return the new expression */ public static ToFloat multiply(ToFloat first, ToInt second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyInt(first, second); } /** @@ -2732,7 +2732,7 @@ public static ToFloat multiply(ToFloat first, ToInt second) { * @return the new expression */ public static ToDouble multiply(ToFloat first, ToLong second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyLong(first, second); } /** @@ -2745,7 +2745,7 @@ public static ToDouble multiply(ToFloat first, ToLong second) { * @return the new expression */ public static ToFloat multiply(ToFloat first, ToFloat second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.floatMultiplyFloat(first, second); } /** @@ -2758,7 +2758,7 @@ public static ToFloat multiply(ToFloat first, ToFloat second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, int second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyInt(first, second); } /** @@ -2771,7 +2771,7 @@ public static ToDouble multiply(ToDouble first, int second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, long second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyLong(first, second); } /** @@ -2784,7 +2784,7 @@ public static ToDouble multiply(ToDouble first, long second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, double second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyDouble(first, second); } /** @@ -2797,7 +2797,7 @@ public static ToDouble multiply(ToDouble first, double second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, ToInt second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyInt(first, second); } /** @@ -2810,7 +2810,7 @@ public static ToDouble multiply(ToDouble first, ToInt second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, ToLong second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyLong(first, second); } /** @@ -2823,7 +2823,7 @@ public static ToDouble multiply(ToDouble first, ToLong second) { * @return the new expression */ public static ToDouble multiply(ToDouble first, ToDouble second) { - return MultiplyUtil.multiply(first, second); + return MultiplyUtil.doubleMultiplyDouble(first, second); } //////////////////////////////////////////////////////////////////////////// @@ -2841,7 +2841,7 @@ public static ToDouble multiply(ToDouble first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToByte first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideInt(first, second); } /** @@ -2855,7 +2855,7 @@ public static ToDouble divide(ToByte first, int second) { * @return the division expression */ public static ToDouble divide(ToByte first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideLong(first, second); } /** @@ -2869,7 +2869,7 @@ public static ToDouble divide(ToByte first, long second) { * @return the division expression */ public static ToDouble divide(ToByte first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideDouble(first, second); } /** @@ -2883,7 +2883,7 @@ public static ToDouble divide(ToByte first, double second) { * @return the division expression */ public static ToDouble divide(ToByte first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideInt(first, second); } /** @@ -2897,7 +2897,7 @@ public static ToDouble divide(ToByte first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToByte first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideLong(first, second); } /** @@ -2911,7 +2911,7 @@ public static ToDouble divide(ToByte first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToByte first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.byteDivideDouble(first, second); } /** @@ -2925,7 +2925,7 @@ public static ToDouble divide(ToByte first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToShort first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideInt(first, second); } /** @@ -2939,7 +2939,7 @@ public static ToDouble divide(ToShort first, int second) { * @return the division expression */ public static ToDouble divide(ToShort first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideLong(first, second); } /** @@ -2953,7 +2953,7 @@ public static ToDouble divide(ToShort first, long second) { * @return the division expression */ public static ToDouble divide(ToShort first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideDouble(first, second); } /** @@ -2967,7 +2967,7 @@ public static ToDouble divide(ToShort first, double second) { * @return the division expression */ public static ToDouble divide(ToShort first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideInt(first, second); } /** @@ -2981,7 +2981,7 @@ public static ToDouble divide(ToShort first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToShort first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideLong(first, second); } /** @@ -2995,7 +2995,7 @@ public static ToDouble divide(ToShort first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToShort first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.shortDivideDouble(first, second); } /** @@ -3009,7 +3009,7 @@ public static ToDouble divide(ToShort first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToInt first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideInt(first, second); } /** @@ -3023,7 +3023,7 @@ public static ToDouble divide(ToInt first, int second) { * @return the division expression */ public static ToDouble divide(ToInt first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideLong(first, second); } /** @@ -3037,7 +3037,7 @@ public static ToDouble divide(ToInt first, long second) { * @return the division expression */ public static ToDouble divide(ToInt first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideDouble(first, second); } /** @@ -3051,7 +3051,7 @@ public static ToDouble divide(ToInt first, double second) { * @return the division expression */ public static ToDouble divide(ToInt first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideInt(first, second); } /** @@ -3065,7 +3065,7 @@ public static ToDouble divide(ToInt first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToInt first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideLong(first, second); } /** @@ -3079,7 +3079,7 @@ public static ToDouble divide(ToInt first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToInt first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.intDivideDouble(first, second); } /** @@ -3093,7 +3093,7 @@ public static ToDouble divide(ToInt first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToLong first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideInt(first, second); } /** @@ -3107,7 +3107,7 @@ public static ToDouble divide(ToLong first, int second) { * @return the division expression */ public static ToDouble divide(ToLong first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideLong(first, second); } /** @@ -3121,7 +3121,7 @@ public static ToDouble divide(ToLong first, long second) { * @return the division expression */ public static ToDouble divide(ToLong first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideDouble(first, second); } /** @@ -3135,7 +3135,7 @@ public static ToDouble divide(ToLong first, double second) { * @return the division expression */ public static ToDouble divide(ToLong first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideInt(first, second); } /** @@ -3149,7 +3149,7 @@ public static ToDouble divide(ToLong first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToLong first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideLong(first, second); } /** @@ -3163,7 +3163,7 @@ public static ToDouble divide(ToLong first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToLong first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.longDivideDouble(first, second); } //////////////////////////////////////////////////////////////////////////// @@ -3181,7 +3181,7 @@ public static ToDouble divide(ToLong first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToFloat first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideInt(first, second); } /** @@ -3195,7 +3195,7 @@ public static ToDouble divide(ToFloat first, int second) { * @return the division expression */ public static ToDouble divide(ToFloat first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideLong(first, second); } /** @@ -3209,7 +3209,7 @@ public static ToDouble divide(ToFloat first, long second) { * @return the division expression */ public static ToDouble divide(ToFloat first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideDouble(first, second); } /** @@ -3223,7 +3223,7 @@ public static ToDouble divide(ToFloat first, double second) { * @return the division expression */ public static ToDouble divide(ToFloat first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideInt(first, second); } /** @@ -3237,7 +3237,7 @@ public static ToDouble divide(ToFloat first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToFloat first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideLong(first, second); } /** @@ -3251,7 +3251,7 @@ public static ToDouble divide(ToFloat first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToFloat first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.floatDivideDouble(first, second); } /** @@ -3265,7 +3265,7 @@ public static ToDouble divide(ToFloat first, ToDouble second) { * @return the division expression */ public static ToDouble divide(ToDouble first, int second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideInt(first, second); } /** @@ -3279,7 +3279,7 @@ public static ToDouble divide(ToDouble first, int second) { * @return the division expression */ public static ToDouble divide(ToDouble first, long second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideLong(first, second); } /** @@ -3293,7 +3293,7 @@ public static ToDouble divide(ToDouble first, long second) { * @return the division expression */ public static ToDouble divide(ToDouble first, double second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideDouble(first, second); } /** @@ -3307,7 +3307,7 @@ public static ToDouble divide(ToDouble first, double second) { * @return the division expression */ public static ToDouble divide(ToDouble first, ToInt second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideInt(first, second); } /** @@ -3321,7 +3321,7 @@ public static ToDouble divide(ToDouble first, ToInt second) { * @return the division expression */ public static ToDouble divide(ToDouble first, ToLong second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideLong(first, second); } /** @@ -3335,7 +3335,7 @@ public static ToDouble divide(ToDouble first, ToLong second) { * @return the division expression */ public static ToDouble divide(ToDouble first, ToDouble second) { - return DivideUtil.divide(first, second); + return DivideUtil.doubleDivideDouble(first, second); } //////////////////////////////////////////////////////////////////////////// diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/AbsUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/AbsUtil.java index 1c2f8614d8..3d5c5ff707 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/AbsUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/AbsUtil.java @@ -27,7 +27,7 @@ public final class AbsUtil { * @param the input type * @return the new expression */ - public static ToByte abs(ToByte expression) { + public static ToByte absByte(ToByte expression) { class AbsByte extends AbstractAbs> implements ToByte { private AbsByte(ToByte inner) { super(inner); @@ -51,7 +51,7 @@ public byte applyAsByte(T object) { * @param the input type * @return the new expression */ - public static ToShort abs(ToShort expression) { + public static ToShort absShort(ToShort expression) { class AbsShort extends AbstractAbs> implements ToShort { private AbsShort(ToShort inner) { super(inner); @@ -75,7 +75,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt abs(ToInt expression) { + public static ToInt absInt(ToInt expression) { class AbsInt extends AbstractAbs> implements ToInt { private AbsInt(ToInt inner) { super(inner); @@ -99,7 +99,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong abs(ToLong expression) { + public static ToLong absLong(ToLong expression) { class AbsLong extends AbstractAbs> implements ToLong { private AbsLong(ToLong inner) { super(inner); @@ -123,7 +123,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToFloat abs(ToFloat expression) { + public static ToFloat absFloat(ToFloat expression) { class AbsFloat extends AbstractAbs> implements ToFloat { private AbsFloat(ToFloat inner) { super(inner); @@ -147,7 +147,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble abs(ToDouble expression) { + public static ToDouble absDouble(ToDouble expression) { class AbsDouble extends AbstractAbs> implements ToDouble { private AbsDouble(ToDouble inner) { super(inner); @@ -163,7 +163,15 @@ public double applyAsDouble(T object) { return new AbsDouble(expression); } - public static ToBigDecimal abs(ToBigDecimal expression) { + /** + * Returns an expression that takes an expression and returns its absolute + * (removing the negation sign if any). + * + * @param expression the input expression + * @param the input type + * @return the new expression + */ + public static ToBigDecimal absBigDecimal(ToBigDecimal expression) { class AbsBigDecimal extends AbstractAbs> implements ToBigDecimal { private AbsBigDecimal(ToBigDecimal inner) { super(inner); @@ -178,8 +186,6 @@ public BigDecimal apply(T object) { return new AbsBigDecimal(expression); } - - /** * Returns an expression that takes an expression and returns its absolute * (removing the negation sign if any). If the result of the original @@ -190,9 +196,9 @@ public BigDecimal apply(T object) { * @param the input type * @return the new expression */ - public static ToByteNullable absOrNull(ToByteNullable expression) { + public static ToByteNullable absByteOrNull(ToByteNullable expression) { return new ToByteNullableImpl<>( - abs(expression.orThrow()), + absByte(expression.orThrow()), expression.isNull() ); } @@ -207,9 +213,9 @@ public static ToByteNullable absOrNull(ToByteNullable expression) { * @param the input type * @return the new expression */ - public static ToShortNullable absOrNull(ToShortNullable expression) { + public static ToShortNullable absShortOrNull(ToShortNullable expression) { return new ToShortNullableImpl<>( - abs(expression.orThrow()), + absShort(expression.orThrow()), expression.isNull() ); } @@ -224,9 +230,9 @@ public static ToShortNullable absOrNull(ToShortNullable expression) { * @param the input type * @return the new expression */ - public static ToIntNullable absOrNull(ToIntNullable expression) { + public static ToIntNullable absIntOrNull(ToIntNullable expression) { return new ToIntNullableImpl<>( - abs(expression.orThrow()), + absInt(expression.orThrow()), expression.isNull() ); } @@ -241,9 +247,9 @@ public static ToIntNullable absOrNull(ToIntNullable expression) { * @param the input type * @return the new expression */ - public static ToLongNullable absOrNull(ToLongNullable expression) { + public static ToLongNullable absLongOrNull(ToLongNullable expression) { return new ToLongNullableImpl<>( - abs(expression.orThrow()), + absLong(expression.orThrow()), expression.isNull() ); } @@ -258,9 +264,9 @@ public static ToLongNullable absOrNull(ToLongNullable expression) { * @param the input type * @return the new expression */ - public static ToFloatNullable absOrNull(ToFloatNullable expression) { + public static ToFloatNullable absFloatOrNull(ToFloatNullable expression) { return new ToFloatNullableImpl<>( - abs(expression.orThrow()), + absFloat(expression.orThrow()), expression.isNull() ); } @@ -275,9 +281,9 @@ public static ToFloatNullable absOrNull(ToFloatNullable expression) { * @param the input type * @return the new expression */ - public static ToDoubleNullable absOrNull(ToDoubleNullable expression) { + public static ToDoubleNullable absDoubleOrNull(ToDoubleNullable expression) { return new ToDoubleNullableImpl<>( - abs(expression.orThrow()), + absDouble(expression.orThrow()), expression.isNull() ); } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/CastUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/CastUtil.java index 61ff233c61..810f284f49 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/CastUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/CastUtil.java @@ -29,7 +29,7 @@ public final class CastUtil { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToByte original) { + public static ToDouble castByteToDouble(ToByte original) { class ByteToDouble extends CastToDouble> { private ByteToDouble(ToByte tToByte) { super(tToByte); @@ -52,7 +52,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToShort original) { + public static ToDouble castShortToDouble(ToShort original) { class ShortToDouble extends CastToDouble> { private ShortToDouble(ToShort tToShort) { super(tToShort); @@ -75,7 +75,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToInt original) { + public static ToDouble castIntToDouble(ToInt original) { class IntToDouble extends CastToDouble> { private IntToDouble(ToInt tToInt) { super(tToInt); @@ -98,7 +98,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToLong original) { + public static ToDouble castLongToDouble(ToLong original) { class LongToDouble extends CastToDouble> { private LongToDouble(ToLong tToLong) { super(tToLong); @@ -121,7 +121,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToFloat original) { + public static ToDouble castFloatToDouble(ToFloat original) { class FloatToDouble extends CastToDouble> { private FloatToDouble(ToFloat tToFloat) { super(tToFloat); @@ -143,7 +143,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToBigDecimal original) { + public static ToDouble castBigDecimalToDouble(ToBigDecimal original) { class BigDecimalToDouble extends CastToDouble> { private BigDecimalToDouble(ToBigDecimal tToBigDecimal) { super(tToBigDecimal); @@ -167,7 +167,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToBoolean original) { + public static ToDouble castBooleanToDouble(ToBoolean original) { class BooleanToDouble extends CastToDouble> { private BooleanToDouble(ToBoolean tToBoolean) { super(tToBoolean); @@ -190,7 +190,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToDouble} expression */ - public static ToDouble castToDouble(ToChar original) { + public static ToDouble castCharToDouble(ToChar original) { class CharToDouble extends CastToDouble> { private CharToDouble(ToChar tToChar) { super(tToChar); @@ -217,7 +217,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToByte original) { + public static ToInt castByteToInt(ToByte original) { class ByteToInt extends CastToInt> { private ByteToInt(ToByte tToByte) { super(tToByte); @@ -240,7 +240,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToShort original) { + public static ToInt castShortToInt(ToShort original) { class ShortToInt extends CastToInt> { private ShortToInt(ToShort tToShort) { super(tToShort); @@ -263,7 +263,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToLong original) { + public static ToInt castLongToInt(ToLong original) { class LongToInt extends CastToInt> { private LongToInt(ToLong tToLong) { super(tToLong); @@ -286,7 +286,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToFloat original) { + public static ToInt castFloatToInt(ToFloat original) { class FloatToInt extends CastToInt> { private FloatToInt(ToFloat tToFloat) { super(tToFloat); @@ -309,7 +309,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToDouble original) { + public static ToInt castDoubleToInt(ToDouble original) { class DoubleToInt extends CastToInt> { private DoubleToInt(ToDouble tToDouble) { super(tToDouble); @@ -332,7 +332,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToBigDecimal original) { + public static ToInt castBigDecimalToInt(ToBigDecimal original) { class BigDecimalToInt extends CastToInt> { private BigDecimalToInt(ToBigDecimal tToBigDecimal) { super(tToBigDecimal); @@ -355,7 +355,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToBoolean original) { + public static ToInt castBooleanToInt(ToBoolean original) { class BooleanToInt extends CastToInt> { private BooleanToInt(ToBoolean tToBoolean) { super(tToBoolean); @@ -378,7 +378,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToInt castToInt(ToChar original) { + public static ToInt castCharToInt(ToChar original) { class CharToInt extends CastToInt> { private CharToInt(ToChar tToChar) { super(tToChar); @@ -405,7 +405,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToByte original) { + public static ToLong castByteToLong(ToByte original) { class ByteToLong extends CastToLong> { private ByteToLong(ToByte tToByte) { super(tToByte); @@ -428,7 +428,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToShort original) { + public static ToLong castShortToLong(ToShort original) { class ShortToLong extends CastToLong> { private ShortToLong(ToShort tToShort) { super(tToShort); @@ -451,7 +451,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToInt original) { + public static ToLong castIntToLong(ToInt original) { class IntToLong extends CastToLong> { private IntToLong(ToInt tToInt) { super(tToInt); @@ -474,7 +474,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToFloat original) { + public static ToLong castFloatToLong(ToFloat original) { class FloatToLong extends CastToLong> { private FloatToLong(ToFloat tToFloat) { super(tToFloat); @@ -497,7 +497,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToDouble original) { + public static ToLong castDoubleToLong(ToDouble original) { class DoubleToLong extends CastToLong> { private DoubleToLong(ToDouble tToDouble) { super(tToDouble); @@ -521,7 +521,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToInt} expression */ - public static ToLong castToLong(ToBigDecimal original) { + public static ToLong castBigDecimalToLong(ToBigDecimal original) { class BigDecimalToLong extends CastToLong> { private BigDecimalToLong(ToBigDecimal tToBigDecimal) { super(tToBigDecimal); @@ -544,7 +544,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToBoolean original) { + public static ToLong castBooleanToLong(ToBoolean original) { class BooleanToLong extends CastToLong> { private BooleanToLong(ToBoolean tToBoolean) { super(tToBoolean); @@ -567,7 +567,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new {@link ToLong} expression */ - public static ToLong castToLong(ToChar original) { + public static ToLong castCharToLong(ToChar original) { class CharToLong extends CastToLong> { private CharToLong(ToChar tToChar) { super(tToChar); diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/ComposedUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/ComposedUtil.java index 7f92d5c7f4..b2eb932355 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/ComposedUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/ComposedUtil.java @@ -32,7 +32,7 @@ public final class ComposedUtil { * @return the composed expression */ public static ToByte - compose(Function first, ToByte second) { + composeToByte(Function first, ToByte second) { return new ComposedToByte<>(first, second); } @@ -60,7 +60,7 @@ public byte applyAsByte(T object) { * @return the composed expression */ public static ToShort - compose(Function first, ToShort second) { + composeToShort(Function first, ToShort second) { return new ComposedToShort<>(first, second); } @@ -88,7 +88,7 @@ public short applyAsShort(T object) { * @return the composed expression */ public static ToInt - compose(Function first, ToInt second) { + composeToInt(Function first, ToInt second) { return new ComposedToInt<>(first, second); } @@ -116,7 +116,7 @@ public int applyAsInt(T object) { * @return the composed expression */ public static ToLong - compose(Function first, ToLong second) { + composeToLong(Function first, ToLong second) { return new ComposedToLong<>(first, second); } @@ -144,7 +144,7 @@ public long applyAsLong(T object) { * @return the composed expression */ public static ToFloat - compose(Function first, ToFloat second) { + composeToFloat(Function first, ToFloat second) { return new ComposedToFloat<>(first, second); } @@ -172,7 +172,7 @@ public float applyAsFloat(T object) { * @return the composed expression */ public static ToDouble - compose(Function first, ToDouble second) { + composeToDouble(Function first, ToDouble second) { return new ComposedToDouble<>(first, second); } @@ -200,7 +200,7 @@ public double applyAsDouble(T object) { * @return the composed expression */ public static ToChar - compose(Function first, ToChar second) { + composeToChar(Function first, ToChar second) { return new ComposedToChar<>(first, second); } @@ -228,7 +228,7 @@ public char applyAsChar(T object) { * @return the composed expression */ public static ToBoolean - compose(Function first, ToBoolean second) { + composeToBoolean(Function first, ToBoolean second) { return new ComposedToBoolean<>(first, second); } @@ -256,7 +256,7 @@ public boolean applyAsBoolean(T object) { * @return the composed expression */ public static ToString - compose(Function first, ToString second) { + composeToString(Function first, ToString second) { return new ComposedToString<>(first, second); } @@ -284,7 +284,7 @@ public String apply(T object) { * @return the composed expression */ public static ToBigDecimal - compose(Function first, ToBigDecimal second) { + composeToBigDecimal(Function first, ToBigDecimal second) { return new ComposedToBigDecimal<>(first, second); } @@ -313,7 +313,7 @@ public BigDecimal apply(T object) { * @return the composed expression */ public static > ToEnum - compose(Function first, ToEnum second) { + composeToEnum(Function first, ToEnum second) { return new ComposedToEnum<>(first, second); } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/DivideUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/DivideUtil.java index 49eb2ea3b3..7a54bc63ce 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/DivideUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/DivideUtil.java @@ -32,7 +32,7 @@ public final class DivideUtil { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, int second) { + public static ToDouble byteDivideInt(ToByte first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -57,7 +57,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, long second) { + public static ToDouble byteDivideLong(ToByte first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -82,7 +82,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, double second) { + public static ToDouble byteDivideDouble(ToByte first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -106,7 +106,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, ToInt second) { + public static ToDouble byteDivideInt(ToByte first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -126,7 +126,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, ToLong second) { + public static ToDouble byteDivideLong(ToByte first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -146,7 +146,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToByte first, ToDouble second) { + public static ToDouble byteDivideDouble(ToByte first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { @@ -170,7 +170,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, int second) { + public static ToDouble shortDivideInt(ToShort first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -195,7 +195,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, long second) { + public static ToDouble shortDivideLong(ToShort first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -220,7 +220,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, double second) { + public static ToDouble shortDivideDouble(ToShort first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -244,7 +244,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, ToInt second) { + public static ToDouble shortDivideInt(ToShort first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -264,7 +264,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, ToLong second) { + public static ToDouble shortDivideLong(ToShort first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -284,7 +284,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToShort first, ToDouble second) { + public static ToDouble shortDivideDouble(ToShort first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { @@ -308,7 +308,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, int second) { + public static ToDouble intDivideInt(ToInt first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -333,7 +333,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, long second) { + public static ToDouble intDivideLong(ToInt first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -358,7 +358,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, double second) { + public static ToDouble intDivideDouble(ToInt first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -382,7 +382,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, ToInt second) { + public static ToDouble intDivideInt(ToInt first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -402,7 +402,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, ToLong second) { + public static ToDouble intDivideLong(ToInt first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -422,7 +422,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToInt first, ToDouble second) { + public static ToDouble intDivideDouble(ToInt first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { @@ -446,7 +446,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, int second) { + public static ToDouble longDivideInt(ToLong first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -471,7 +471,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, long second) { + public static ToDouble longDivideLong(ToLong first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -496,7 +496,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, double second) { + public static ToDouble longDivideDouble(ToLong first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -520,7 +520,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, ToInt second) { + public static ToDouble longDivideInt(ToLong first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -540,7 +540,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, ToLong second) { + public static ToDouble longDivideLong(ToLong first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -560,7 +560,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToLong first, ToDouble second) { + public static ToDouble longDivideDouble(ToLong first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { @@ -584,7 +584,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, int second) { + public static ToDouble floatDivideInt(ToFloat first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -609,7 +609,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, long second) { + public static ToDouble floatDivideLong(ToFloat first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -634,7 +634,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, double second) { + public static ToDouble floatDivideDouble(ToFloat first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -658,7 +658,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, ToInt second) { + public static ToDouble floatDivideInt(ToFloat first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -678,7 +678,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, ToLong second) { + public static ToDouble floatDivideLong(ToFloat first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -698,7 +698,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToFloat first, ToDouble second) { + public static ToDouble floatDivideDouble(ToFloat first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { @@ -722,7 +722,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, int second) { + public static ToDouble doubleDivideInt(ToDouble first, int second) { return new DivideObjToDouble, Integer>(first) { @Override public double applyAsDouble(T object) { @@ -747,7 +747,7 @@ public Integer second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, long second) { + public static ToDouble doubleDivideLong(ToDouble first, long second) { return new DivideObjToDouble, Long>(first) { @Override public double applyAsDouble(T object) { @@ -772,7 +772,7 @@ public Long second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, double second) { + public static ToDouble doubleDivideDouble(ToDouble first, double second) { return new DivideObjToDouble, Double>(first) { @Override public double applyAsDouble(T object) { @@ -796,7 +796,7 @@ public Double second() { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, ToInt second) { + public static ToDouble doubleDivideInt(ToDouble first, ToInt second) { return new DivideToDouble, ToInt>(first, second) { @Override public double applyAsDouble(T object) { @@ -816,7 +816,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, ToLong second) { + public static ToDouble doubleDivideLong(ToDouble first, ToLong second) { return new DivideToDouble, ToLong>(first, second) { @Override public double applyAsDouble(T object) { @@ -836,7 +836,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return the division expression */ - public static ToDouble divide(ToDouble first, ToDouble second) { + public static ToDouble doubleDivideDouble(ToDouble first, ToDouble second) { return new DivideToDouble, ToDouble>(first, second) { @Override public double applyAsDouble(T object) { diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java index d9bc418716..b5dd5a0f5a 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java @@ -29,7 +29,7 @@ public final class MapperUtil { * @param the input type * @return the new expression */ - public static ToBoolean map(ToBoolean expression, BooleanUnaryOperator mapper) { + public static ToBoolean mapBoolean(ToBoolean expression, BooleanUnaryOperator mapper) { return new ToBooleanMapper, BooleanUnaryOperator>(expression, mapper) { @Override public boolean applyAsBoolean(T object) { @@ -53,7 +53,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToBoolean expression, BooleanToDoubleFunction mapper) { + public static ToDouble mapBooleanToDouble(ToBoolean expression, BooleanToDoubleFunction mapper) { return new ToDoubleMapper, BooleanToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -77,7 +77,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToChar map(ToChar expression, CharUnaryOperator mapper) { + public static ToChar mapChar(ToChar expression, CharUnaryOperator mapper) { return new ToCharMapper, CharUnaryOperator>(expression, mapper) { @Override public char applyAsChar(T object) { @@ -101,7 +101,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToByte map(ToByte expression, ByteUnaryOperator mapper) { + public static ToByte mapByte(ToByte expression, ByteUnaryOperator mapper) { return new ToByteMapper, ByteUnaryOperator>(expression, mapper) { @Override public byte applyAsByte(T object) { @@ -125,7 +125,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToByte expression, ByteToDoubleFunction mapper) { + public static ToDouble mapByteToDouble(ToByte expression, ByteToDoubleFunction mapper) { return new ToDoubleMapper, ByteToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -149,7 +149,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToShort map(ToShort expression, ShortUnaryOperator mapper) { + public static ToShort mapShort(ToShort expression, ShortUnaryOperator mapper) { return new ToShortMapper, ShortUnaryOperator>(expression, mapper) { @Override public short applyAsShort(T object) { @@ -173,7 +173,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToShort expression, ShortToDoubleFunction mapper) { + public static ToDouble mapShortToDouble(ToShort expression, ShortToDoubleFunction mapper) { return new ToDoubleMapper, ShortToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -197,7 +197,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToInt map(ToInt expression, IntUnaryOperator mapper) { + public static ToInt mapInt(ToInt expression, IntUnaryOperator mapper) { return new ToIntMapper, IntUnaryOperator>(expression, mapper) { @Override public int applyAsInt(T object) { @@ -221,7 +221,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToInt expression, IntToDoubleFunction mapper) { + public static ToDouble mapIntToDouble(ToInt expression, IntToDoubleFunction mapper) { return new ToDoubleMapper, IntToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -245,7 +245,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToLong map(ToLong expression, LongUnaryOperator mapper) { + public static ToLong mapLong(ToLong expression, LongUnaryOperator mapper) { return new ToLongMapper, LongUnaryOperator>(expression, mapper) { @Override public long applyAsLong(T object) { @@ -269,7 +269,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToLong expression, LongToDoubleFunction mapper) { + public static ToDouble mapLongToDouble(ToLong expression, LongToDoubleFunction mapper) { return new ToDoubleMapper, LongToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -293,7 +293,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToFloat map(ToFloat expression, FloatUnaryOperator mapper) { + public static ToFloat mapFloat(ToFloat expression, FloatUnaryOperator mapper) { return new ToFloatMapper, FloatUnaryOperator>(expression, mapper) { @Override public float applyAsFloat(T object) { @@ -317,7 +317,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToFloat expression, FloatToDoubleFunction mapper) { + public static ToDouble mapFloatToDouble(ToFloat expression, FloatToDoubleFunction mapper) { return new ToDoubleMapper, FloatToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -341,7 +341,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble map(ToDouble expression, DoubleUnaryOperator mapper) { + public static ToDouble mapDouble(ToDouble expression, DoubleUnaryOperator mapper) { return new ToDoubleMapper, DoubleUnaryOperator>(expression, mapper) { @Override public double applyAsDouble(T object) { @@ -365,7 +365,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToString map(ToString expression, UnaryOperator mapper) { + public static ToString mapString(ToString expression, UnaryOperator mapper) { return new ToStringMapper, UnaryOperator>(expression, mapper) { @Override public String apply(T object) { @@ -389,7 +389,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static > ToEnum map(ToEnum expression, UnaryOperator mapper) { + public static > ToEnum mapEnum(ToEnum expression, UnaryOperator mapper) { return new ToEnumMapper, UnaryOperator>(expression, mapper) { @Override public E apply(T object) { @@ -418,7 +418,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToBigDecimal map(ToBigDecimal expression, UnaryOperator mapper) { + public static ToBigDecimal mapBigDecimal(ToBigDecimal expression, UnaryOperator mapper) { return new ToBigDecimalMapper, UnaryOperator>(expression, mapper) { @Override public BigDecimal apply(T object) { @@ -442,7 +442,7 @@ public MapperType mapperType() { * @param the input type * @return the new expression */ - public static ToDouble mapToDouble(ToBigDecimal expression, ToDoubleFunction mapper) { + public static ToDouble mapBigDecimalToDouble(ToBigDecimal expression, ToDoubleFunction mapper) { return new ToDoubleMapper, ToDoubleFunction>(expression, mapper) { @Override public double applyAsDouble(T object) { diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MinusUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MinusUtil.java index e558b1fd07..346f56daae 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MinusUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MinusUtil.java @@ -27,7 +27,7 @@ public final class MinusUtil { * @param the input type * @return the new expression */ - public static ToShort minus(ToByte first, byte second) { + public static ToShort byteMinusByte(ToByte first, byte second) { class ByteMinusByte extends AbstractMinusByte> implements ToShort { private ByteMinusByte(ToByte first, byte second) { super(first, second); @@ -51,7 +51,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToByte first, int second) { + public static ToInt byteMinusInt(ToByte first, int second) { class ByteMinusInt extends AbstractMinusInt> implements ToInt { private ByteMinusInt(ToByte first, int second) { super(first, second); @@ -75,7 +75,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToByte first, long second) { + public static ToLong byteMinusLong(ToByte first, long second) { class ByteMinusLong extends AbstractMinusLong> implements ToLong { private ByteMinusLong(ToByte first, long second) { super(first, second); @@ -99,7 +99,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToShort minus(ToByte first, ToByte second) { + public static ToShort byteMinusByte(ToByte first, ToByte second) { class ByteMinusByte extends AbstractMinus, ToByte> implements ToShort { private ByteMinusByte(ToByte first, ToByte second) { super(first, second); @@ -124,7 +124,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToShort first, byte second) { + public static ToInt shortMinusByte(ToShort first, byte second) { class ShortMinusShort extends AbstractMinusByte> implements ToInt { private ShortMinusShort(ToShort first, byte second) { super(first, second); @@ -148,7 +148,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToShort first, int second) { + public static ToInt shortMinusInt(ToShort first, int second) { class ShortMinusInt extends AbstractMinusInt> implements ToInt { private ShortMinusInt(ToShort first, int second) { super(first, second); @@ -172,7 +172,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToShort first, long second) { + public static ToLong shortMinusLong(ToShort first, long second) { class ShortMinusLong extends AbstractMinusLong> implements ToLong { private ShortMinusLong(ToShort first, long second) { super(first, second); @@ -196,7 +196,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToShort minus(ToShort first, ToShort second) { + public static ToShort shortMinusShort(ToShort first, ToShort second) { class ShortMinusShort extends AbstractMinus, ToShort> implements ToShort { private ShortMinusShort(ToShort first, ToShort second) { super(first, second); @@ -221,7 +221,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToInt first, byte second) { + public static ToInt intMinusByte(ToInt first, byte second) { class IntMinusByte extends AbstractMinusByte> implements ToInt { private IntMinusByte(ToInt first, byte second) { super(first, second); @@ -245,7 +245,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToInt first, int second) { + public static ToInt intMinusInt(ToInt first, int second) { class IntMinusInt extends AbstractMinusInt> implements ToInt { private IntMinusInt(ToInt first, int second) { super(first, second); @@ -269,7 +269,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToInt first, long second) { + public static ToLong intMinusLong(ToInt first, long second) { class IntMinusLong extends AbstractMinusLong> implements ToLong { private IntMinusLong(ToInt first, long second) { super(first, second); @@ -293,7 +293,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToInt first, ToByte second) { + public static ToInt intMinusByte(ToInt first, ToByte second) { class IntMinusByte extends AbstractMinus, ToByte> implements ToInt { private IntMinusByte(ToInt first, ToByte second) { super(first, second); @@ -319,7 +319,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt minus(ToInt first, ToInt second) { + public static ToInt intMinusInt(ToInt first, ToInt second) { class IntMinusInt extends AbstractMinus, ToInt> implements ToInt { private IntMinusInt(ToInt first, ToInt second) { super(first, second); @@ -344,7 +344,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToLong first, byte second) { + public static ToLong longMinusByte(ToLong first, byte second) { class LongMinusLong extends AbstractMinusByte> implements ToLong { private LongMinusLong(ToLong first, byte second) { super(first, second); @@ -368,7 +368,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToLong first, int second) { + public static ToLong longMinusInt(ToLong first, int second) { class LongMinusInt extends AbstractMinusInt> implements ToLong { private LongMinusInt(ToLong first, int second) { super(first, second); @@ -392,7 +392,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToLong first, long second) { + public static ToLong longMinusLong(ToLong first, long second) { class LongMinusLong extends AbstractMinusLong> implements ToLong { private LongMinusLong(ToLong first, long second) { super(first, second); @@ -416,7 +416,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToLong first, ToInt second) { + public static ToLong longMinusInt(ToLong first, ToInt second) { class LongMinusInt extends AbstractMinus, ToInt> implements ToLong { private LongMinusInt(ToLong first, ToInt second) { super(first, second); @@ -441,7 +441,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong minus(ToLong first, ToLong second) { + public static ToLong longMinusLong(ToLong first, ToLong second) { class LongMinusLong extends AbstractMinus, ToLong> implements ToLong { private LongMinusLong(ToLong first, ToLong second) { super(first, second); @@ -466,7 +466,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToFloat minus(ToFloat first, int second) { + public static ToFloat floatMinusInt(ToFloat first, int second) { class FloatMinusInt extends AbstractMinusInt> implements ToFloat { private FloatMinusInt(ToFloat first, int second) { super(first, second); @@ -490,7 +490,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToFloat first, long second) { + public static ToDouble floatMinusLong(ToFloat first, long second) { class FloatMinusLong extends AbstractMinusLong> implements ToDouble { private FloatMinusLong(ToFloat first, long second) { super(first, second); @@ -514,7 +514,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat minus(ToFloat first, float second) { + public static ToFloat floatMinusFloat(ToFloat first, float second) { class FloatMinusFloat extends AbstractMinusFloat> implements ToFloat { private FloatMinusFloat(ToFloat first, float second) { super(first, second); @@ -538,7 +538,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToFloat minus(ToFloat first, ToInt second) { + public static ToFloat floatMinusInt(ToFloat first, ToInt second) { class FloatMinusInt extends AbstractMinus, ToInt> implements ToFloat { private FloatMinusInt(ToFloat first, ToInt second) { super(first, second); @@ -563,7 +563,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToFloat first, ToLong second) { + public static ToDouble floatMinusLong(ToFloat first, ToLong second) { class FloatMinusLong extends AbstractMinus, ToLong> implements ToDouble { private FloatMinusLong(ToFloat first, ToLong second) { super(first, second); @@ -588,7 +588,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat minus(ToFloat first, ToFloat second) { + public static ToFloat floatMinusFloat(ToFloat first, ToFloat second) { class FloatMinusFloat extends AbstractMinus, ToFloat> implements ToFloat { private FloatMinusFloat(ToFloat first, ToFloat second) { super(first, second); @@ -613,7 +613,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, int second) { + public static ToDouble doubleMinusInt(ToDouble first, int second) { class DoubleMinusInt extends AbstractMinusInt> implements ToDouble { private DoubleMinusInt(ToDouble first, int second) { super(first, second); @@ -637,7 +637,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, long second) { + public static ToDouble doubleMinusLong(ToDouble first, long second) { class DoubleMinusLong extends AbstractMinusLong> implements ToDouble { private DoubleMinusLong(ToDouble first, long second) { super(first, second); @@ -661,7 +661,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, double second) { + public static ToDouble doubleMinusDouble(ToDouble first, double second) { class DoubleMinusDouble extends AbstractMinusDouble> implements ToDouble { private DoubleMinusDouble(ToDouble first, double second) { super(first, second); @@ -685,7 +685,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, ToInt second) { + public static ToDouble doubleMinusInt(ToDouble first, ToInt second) { class DoubleMinusInt extends AbstractMinus, ToInt> implements ToDouble { private DoubleMinusInt(ToDouble first, ToInt second) { super(first, second); @@ -710,7 +710,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, ToLong second) { + public static ToDouble doubleMinusLong(ToDouble first, ToLong second) { class DoubleMinusLong extends AbstractMinus, ToLong> implements ToDouble { private DoubleMinusLong(ToDouble first, ToLong second) { super(first, second); @@ -735,7 +735,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble minus(ToDouble first, ToDouble second) { + public static ToDouble doubleMinusDouble(ToDouble first, ToDouble second) { class DoubleMinusDouble extends AbstractMinus, ToDouble> implements ToDouble { private DoubleMinusDouble(ToDouble first, ToDouble second) { super(first, second); diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MultiplyUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MultiplyUtil.java index be43f975e4..54cfa68252 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MultiplyUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MultiplyUtil.java @@ -27,7 +27,7 @@ public final class MultiplyUtil { * @param the input type * @return the new expression */ - public static ToInt multiply(ToByte first, byte second) { + public static ToInt byteMultiplyByte(ToByte first, byte second) { class ByteMultiplyByte extends AbstractMultiplyByte> implements ToInt { private ByteMultiplyByte(ToByte first, byte second) { super(first, second); @@ -51,7 +51,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToByte first, int second) { + public static ToInt byteMultiplyInt(ToByte first, int second) { class ByteMultiplyInt extends AbstractMultiplyInt> implements ToInt { private ByteMultiplyInt(ToByte first, int second) { super(first, second); @@ -75,7 +75,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToByte first, long second) { + public static ToLong byteMultiplyLong(ToByte first, long second) { class ByteMultiplyLong extends AbstractMultiplyLong> implements ToLong { private ByteMultiplyLong(ToByte first, long second) { super(first, second); @@ -99,7 +99,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToByte first, ToByte second) { + public static ToInt byteMultiplyByte(ToByte first, ToByte second) { class ByteMultiplyByte extends AbstractMultiply, ToByte> implements ToInt { private ByteMultiplyByte(ToByte first, ToByte second) { super(first, second); @@ -124,7 +124,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToShort first, byte second) { + public static ToInt shortMultiplyByte(ToShort first, byte second) { class ShortMultiplyShort extends AbstractMultiplyByte> implements ToInt { private ShortMultiplyShort(ToShort first, byte second) { super(first, second); @@ -148,7 +148,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToShort first, int second) { + public static ToInt shortMultiplyInt(ToShort first, int second) { class ShortMultiplyInt extends AbstractMultiplyInt> implements ToInt { private ShortMultiplyInt(ToShort first, int second) { super(first, second); @@ -172,7 +172,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToShort first, long second) { + public static ToLong shortMultiplyLong(ToShort first, long second) { class ShortMultiplyLong extends AbstractMultiplyLong> implements ToLong { private ShortMultiplyLong(ToShort first, long second) { super(first, second); @@ -196,7 +196,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToShort first, ToShort second) { + public static ToInt shortMultiplyShort(ToShort first, ToShort second) { class ShortMultiplyShort extends AbstractMultiply, ToShort> implements ToInt { private ShortMultiplyShort(ToShort first, ToShort second) { super(first, second); @@ -221,7 +221,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToInt first, byte second) { + public static ToInt intMultiplyByte(ToInt first, byte second) { class IntMultiplyByte extends AbstractMultiplyByte> implements ToInt { private IntMultiplyByte(ToInt first, byte second) { super(first, second); @@ -245,7 +245,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToInt first, int second) { + public static ToInt intMultiplyInt(ToInt first, int second) { class IntMultiplyInt extends AbstractMultiplyInt> implements ToInt { private IntMultiplyInt(ToInt first, int second) { super(first, second); @@ -269,7 +269,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToInt first, long second) { + public static ToLong intMultiplyLong(ToInt first, long second) { class IntMultiplyLong extends AbstractMultiplyLong> implements ToLong { private IntMultiplyLong(ToInt first, long second) { super(first, second); @@ -293,7 +293,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToInt first, ToByte second) { + public static ToInt intMultiplyByte(ToInt first, ToByte second) { class IntMultiplyByte extends AbstractMultiply, ToByte> implements ToInt { private IntMultiplyByte(ToInt first, ToByte second) { super(first, second); @@ -319,7 +319,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt multiply(ToInt first, ToInt second) { + public static ToInt intMultiplyInt(ToInt first, ToInt second) { class IntMultiplyInt extends AbstractMultiply, ToInt> implements ToInt { private IntMultiplyInt(ToInt first, ToInt second) { super(first, second); @@ -344,7 +344,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToLong first, byte second) { + public static ToLong longMultiplyByte(ToLong first, byte second) { class LongMultiplyLong extends AbstractMultiplyByte> implements ToLong { private LongMultiplyLong(ToLong first, byte second) { super(first, second); @@ -368,7 +368,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToLong first, int second) { + public static ToLong longMultiplyInt(ToLong first, int second) { class LongMultiplyInt extends AbstractMultiplyInt> implements ToLong { private LongMultiplyInt(ToLong first, int second) { super(first, second); @@ -392,7 +392,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToLong first, long second) { + public static ToLong longMultiplyLong(ToLong first, long second) { class LongMultiplyLong extends AbstractMultiplyLong> implements ToLong { private LongMultiplyLong(ToLong first, long second) { super(first, second); @@ -416,7 +416,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToLong first, ToInt second) { + public static ToLong longMultiplyInt(ToLong first, ToInt second) { class LongMultiplyInt extends AbstractMultiply, ToInt> implements ToLong { private LongMultiplyInt(ToLong first, ToInt second) { super(first, second); @@ -441,7 +441,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong multiply(ToLong first, ToLong second) { + public static ToLong longMultiplyLong(ToLong first, ToLong second) { class LongMultiplyLong extends AbstractMultiply, ToLong> implements ToLong { private LongMultiplyLong(ToLong first, ToLong second) { super(first, second); @@ -466,7 +466,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToFloat multiply(ToFloat first, int second) { + public static ToFloat floatMultiplyInt(ToFloat first, int second) { class FloatMultiplyInt extends AbstractMultiplyInt> implements ToFloat { private FloatMultiplyInt(ToFloat first, int second) { super(first, second); @@ -490,7 +490,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToFloat first, long second) { + public static ToDouble floatMultiplyLong(ToFloat first, long second) { class FloatMultiplyLong extends AbstractMultiplyLong> implements ToDouble { private FloatMultiplyLong(ToFloat first, long second) { super(first, second); @@ -514,7 +514,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat multiply(ToFloat first, float second) { + public static ToFloat floatMultiplyFloat(ToFloat first, float second) { class FloatMultiplyFloat extends AbstractMultiplyFloat> implements ToFloat { private FloatMultiplyFloat(ToFloat first, float second) { super(first, second); @@ -538,7 +538,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToFloat multiply(ToFloat first, ToInt second) { + public static ToFloat floatMultiplyInt(ToFloat first, ToInt second) { class FloatMultiplyInt extends AbstractMultiply, ToInt> implements ToFloat { private FloatMultiplyInt(ToFloat first, ToInt second) { super(first, second); @@ -563,7 +563,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToFloat first, ToLong second) { + public static ToDouble floatMultiplyLong(ToFloat first, ToLong second) { class FloatMultiplyLong extends AbstractMultiply, ToLong> implements ToDouble { private FloatMultiplyLong(ToFloat first, ToLong second) { super(first, second); @@ -588,7 +588,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat multiply(ToFloat first, ToFloat second) { + public static ToFloat floatMultiplyFloat(ToFloat first, ToFloat second) { class FloatMultiplyFloat extends AbstractMultiply, ToFloat> implements ToFloat { private FloatMultiplyFloat(ToFloat first, ToFloat second) { super(first, second); @@ -613,7 +613,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, int second) { + public static ToDouble doubleMultiplyInt(ToDouble first, int second) { class DoubleMultiplyInt extends AbstractMultiplyInt> implements ToDouble { private DoubleMultiplyInt(ToDouble first, int second) { super(first, second); @@ -637,7 +637,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, long second) { + public static ToDouble doubleMultiplyLong(ToDouble first, long second) { class DoubleMultiplyLong extends AbstractMultiplyLong> implements ToDouble { private DoubleMultiplyLong(ToDouble first, long second) { super(first, second); @@ -661,7 +661,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, double second) { + public static ToDouble doubleMultiplyDouble(ToDouble first, double second) { class DoubleMultiplyDouble extends AbstractMultiplyDouble> implements ToDouble { private DoubleMultiplyDouble(ToDouble first, double second) { super(first, second); @@ -685,7 +685,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, ToInt second) { + public static ToDouble doubleMultiplyInt(ToDouble first, ToInt second) { class DoubleMultiplyInt extends AbstractMultiply, ToInt> implements ToDouble { private DoubleMultiplyInt(ToDouble first, ToInt second) { super(first, second); @@ -710,7 +710,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, ToLong second) { + public static ToDouble doubleMultiplyLong(ToDouble first, ToLong second) { class DoubleMultiplyLong extends AbstractMultiply, ToLong> implements ToDouble { private DoubleMultiplyLong(ToDouble first, ToLong second) { super(first, second); @@ -735,7 +735,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble multiply(ToDouble first, ToDouble second) { + public static ToDouble doubleMultiplyDouble(ToDouble first, ToDouble second) { class DoubleMultiplyDouble extends AbstractMultiply, ToDouble> implements ToDouble { private DoubleMultiplyDouble(ToDouble first, ToDouble second) { super(first, second); diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/NegateUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/NegateUtil.java index 7d72b580f1..056415178f 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/NegateUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/NegateUtil.java @@ -27,7 +27,7 @@ public final class NegateUtil { * @param the input type * @return the new expression */ - public static ToByte negate(ToByte expression) { + public static ToByte negateByte(ToByte expression) { class NegateByte extends AbstractNegate> implements ToByte { private NegateByte(ToByte inner) { super(inner); @@ -50,7 +50,7 @@ public byte applyAsByte(T object) { * @param the input type * @return the new expression */ - public static ToShort negate(ToShort expression) { + public static ToShort negateShort(ToShort expression) { class NegateShort extends AbstractNegate> implements ToShort { private NegateShort(ToShort inner) { super(inner); @@ -73,7 +73,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt negate(ToInt expression) { + public static ToInt negateInt(ToInt expression) { class NegateInt extends AbstractNegate> implements ToInt { private NegateInt(ToInt inner) { super(inner); @@ -96,7 +96,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong negate(ToLong expression) { + public static ToLong negateLong(ToLong expression) { class NegateLong extends AbstractNegate> implements ToLong { private NegateLong(ToLong inner) { super(inner); @@ -119,7 +119,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToFloat negate(ToFloat expression) { + public static ToFloat negateFloat(ToFloat expression) { class NegateFloat extends AbstractNegate> implements ToFloat { private NegateFloat(ToFloat inner) { super(inner); @@ -142,7 +142,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble negate(ToDouble expression) { + public static ToDouble negateDouble(ToDouble expression) { class NegateDouble extends AbstractNegate> implements ToDouble { private NegateDouble(ToDouble inner) { super(inner); @@ -165,7 +165,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToBigDecimal negate(ToBigDecimal expression) { + public static ToBigDecimal negateBigDecimal(ToBigDecimal expression) { class NegateBigDecimal implements ToBigDecimal, UnaryExpression> { private final ToBigDecimal inner; @@ -201,7 +201,7 @@ public BigDecimal apply(T object) { * @param the input type * @return the new expression */ - public static ToBoolean negate(ToBoolean expression) { + public static ToBoolean negateBoolean(ToBoolean expression) { class NegateBoolean extends AbstractNegate> implements ToBoolean { private NegateBoolean(ToBoolean inner) { super(inner); @@ -226,9 +226,9 @@ public boolean applyAsBoolean(T object) { * @param the input type * @return the new expression */ - public static ToByteNullable negateOrNull(ToByteNullable expression) { + public static ToByteNullable negateByteOrNull(ToByteNullable expression) { return new ToByteNullableImpl<>( - negate(expression.orThrow()), + negateByte(expression.orThrow()), expression.isNull() ); } @@ -243,9 +243,9 @@ public static ToByteNullable negateOrNull(ToByteNullable expression) { * @param the input type * @return the new expression */ - public static ToShortNullable negateOrNull(ToShortNullable expression) { + public static ToShortNullable negateShortOrNull(ToShortNullable expression) { return new ToShortNullableImpl<>( - negate(expression.orThrow()), + negateShort(expression.orThrow()), expression.isNull() ); } @@ -260,9 +260,9 @@ public static ToShortNullable negateOrNull(ToShortNullable expression) * @param the input type * @return the new expression */ - public static ToIntNullable negateOrNull(ToIntNullable expression) { + public static ToIntNullable negateIntOrNull(ToIntNullable expression) { return new ToIntNullableImpl<>( - negate(expression.orThrow()), + negateInt(expression.orThrow()), expression.isNull() ); } @@ -277,9 +277,9 @@ public static ToIntNullable negateOrNull(ToIntNullable expression) { * @param the input type * @return the new expression */ - public static ToLongNullable negateOrNull(ToLongNullable expression) { + public static ToLongNullable negateLongOrNull(ToLongNullable expression) { return new ToLongNullableImpl<>( - negate(expression.orThrow()), + negateLong(expression.orThrow()), expression.isNull() ); } @@ -294,9 +294,9 @@ public static ToLongNullable negateOrNull(ToLongNullable expression) { * @param the input type * @return the new expression */ - public static ToFloatNullable negateOrNull(ToFloatNullable expression) { + public static ToFloatNullable negateFloatOrNull(ToFloatNullable expression) { return new ToFloatNullableImpl<>( - negate(expression.orThrow()), + negateFloat(expression.orThrow()), expression.isNull() ); } @@ -311,9 +311,9 @@ public static ToFloatNullable negateOrNull(ToFloatNullable expression) * @param the input type * @return the new expression */ - public static ToDoubleNullable negateOrNull(ToDoubleNullable expression) { + public static ToDoubleNullable negateDoubleOrNull(ToDoubleNullable expression) { return new ToDoubleNullableImpl<>( - negate(expression.orThrow()), + negateDouble(expression.orThrow()), expression.isNull() ); } @@ -328,9 +328,9 @@ public static ToDoubleNullable negateOrNull(ToDoubleNullable expressio * @param the input type * @return the new expression */ - public static ToBooleanNullable negateOrNull(ToBooleanNullable expression) { + public static ToBooleanNullable negateBooleanOrNull(ToBooleanNullable expression) { return new ToBooleanNullableImpl<>( - negate(expression.orThrow()), + negateBoolean(expression.orThrow()), expression.isNull() ); } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseGetUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseGetUtil.java index 08f29f8667..384aba753a 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseGetUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseGetUtil.java @@ -31,12 +31,12 @@ public final class OrElseGetUtil { * @return the non-nullable expression */ public static ToDoubleOrElseGet - orElseGet(ToDoubleNullable expression, ToDouble defaultGetter) { + doubleOrElseGet(ToDoubleNullable expression, ToDouble defaultGetter) { return new ToDoubleOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToDoubleNullable.orElse(double)}. + * Internal class used when calling {@code ToDoubleNullable.doubleOrElse(double)}. * * @param the input entity type */ @@ -66,12 +66,12 @@ public double applyAsDouble(T object) { * @return the non-nullable expression */ public static ToFloatOrElseGet - orElseGet(ToFloatNullable expression, ToFloat defaultGetter) { + floatOrElseGet(ToFloatNullable expression, ToFloat defaultGetter) { return new ToFloatOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToFloatNullable.orElse(float)}. + * Internal class used when calling {@code ToFloatNullable.doubleOrElse(float)}. * * @param the input entity type */ @@ -101,12 +101,12 @@ public float applyAsFloat(T object) { * @return the non-nullable expression */ public static ToLongOrElseGet - orElseGet(ToLongNullable expression, ToLong defaultGetter) { + longOrElseGet(ToLongNullable expression, ToLong defaultGetter) { return new ToLongOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToLongNullable.orElse(long)}. + * Internal class used when calling {@code ToLongNullable.doubleOrElse(long)}. * * @param the input entity type */ @@ -136,12 +136,12 @@ public long applyAsLong(T object) { * @return the non-nullable expression */ public static ToIntOrElseGet - orElseGet(ToIntNullable expression, ToInt defaultGetter) { + intOrElseGet(ToIntNullable expression, ToInt defaultGetter) { return new ToIntOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToIntNullable.orElse(int)}. + * Internal class used when calling {@code ToIntNullable.doubleOrElse(int)}. * * @param the input entity type */ @@ -171,12 +171,12 @@ public int applyAsInt(T object) { * @return the non-nullable expression */ public static ToShortOrElseGet - orElseGet(ToShortNullable expression, ToShort defaultGetter) { + shortOrElseGet(ToShortNullable expression, ToShort defaultGetter) { return new ToShortOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToShortNullable.orElse(short)}. + * Internal class used when calling {@code ToShortNullable.doubleOrElse(short)}. * * @param the input entity type */ @@ -206,12 +206,12 @@ public short applyAsShort(T object) { * @return the non-nullable expression */ public static ToByteOrElseGet - orElseGet(ToByteNullable expression, ToByte defaultGetter) { + byteOrElseGet(ToByteNullable expression, ToByte defaultGetter) { return new ToByteOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToByteNullable.orElse(byte)}. + * Internal class used when calling {@code ToByteNullable.doubleOrElse(byte)}. * * @param the input entity type */ @@ -241,12 +241,12 @@ public byte applyAsByte(T object) { * @return the non-nullable expression */ public static ToCharOrElseGet - orElseGet(ToCharNullable expression, ToChar defaultGetter) { + charOrElseGet(ToCharNullable expression, ToChar defaultGetter) { return new ToCharOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToCharNullable.orElse(char)}. + * Internal class used when calling {@code ToCharNullable.doubleOrElse(char)}. * * @param the input entity type */ @@ -276,12 +276,12 @@ public char applyAsChar(T object) { * @return the non-nullable expression */ public static ToBooleanOrElseGet - orElseGet(ToBooleanNullable expression, ToBoolean defaultGetter) { + booleanOrElseGet(ToBooleanNullable expression, ToBoolean defaultGetter) { return new ToBooleanOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToBooleanNullable.orElse(boolean)}. + * Internal class used when calling {@code ToBooleanNullable.doubleOrElse(boolean)}. * * @param the input entity type */ @@ -311,12 +311,12 @@ public boolean applyAsBoolean(T object) { * @return the non-nullable expression */ public static ToStringOrElseGet - orElseGet(ToStringNullable expression, ToString defaultGetter) { + stringOrElseGet(ToStringNullable expression, ToString defaultGetter) { return new ToStringOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToStringNullable.orElse(string)}. + * Internal class used when calling {@code ToStringNullable.doubleOrElse(string)}. * * @param the input entity type */ @@ -346,13 +346,13 @@ public String apply(T object) { * @return the non-nullable expression */ public static ToBigDecimalOrElseGet - orElseGet(ToBigDecimalNullable expression, ToBigDecimal defaultGetter) { + bigDecimalOrElseGet(ToBigDecimalNullable expression, ToBigDecimal defaultGetter) { return new ToBigDecimalOrElseGetImpl<>(expression, defaultGetter); } /** * Internal class used when calling - * {@code ToBigDecimalNullable.orElse(bigDecimal)}. + * {@code ToBigDecimalNullable.doubleOrElse(bigDecimal)}. * * @param the input entity type */ @@ -383,12 +383,12 @@ public BigDecimal apply(T object) { * @return the non-nullable expression */ public static > ToEnumOrElseGet - orElseGet(ToEnumNullable expression, ToEnum defaultGetter) { + enumOrElseGet(ToEnumNullable expression, ToEnum defaultGetter) { return new ToEnumOrElseGetImpl<>(expression, defaultGetter); } /** - * Internal class used when calling {@code ToEnumNullable.orElse(enum)}. + * Internal class used when calling {@code ToEnumNullable.doubleOrElse(enum)}. * * @param the input entity type * @param the enum type diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseThrowUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseThrowUtil.java index 598cb840b1..1a33d5ce4e 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseThrowUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseThrowUtil.java @@ -29,12 +29,12 @@ public final class OrElseThrowUtil { * @return the non-nullable expression */ public static ToDoubleOrThrow - orElseThrow(ToDoubleNullable expression) { + doubleOrElseThrow(ToDoubleNullable expression) { return new ToDoubleOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToDoubleNullable.orElse(double)}. + * Internal class used when calling {@code ToDoubleNullable.doubleOrElse(double)}. * * @param the input entity type */ @@ -61,12 +61,12 @@ public double applyAsDouble(T object) { * @return the non-nullable expression */ public static ToFloatOrThrow - orElseThrow(ToFloatNullable expression) { + floatOrElseThrow(ToFloatNullable expression) { return new ToFloatOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToFloatNullable.orElse(float)}. + * Internal class used when calling {@code ToFloatNullable.doubleOrElse(float)}. * * @param the input entity type */ @@ -93,12 +93,12 @@ public float applyAsFloat(T object) { * @return the non-nullable expression */ public static ToLongOrThrow - orElseThrow(ToLongNullable expression) { + longOrElseThrow(ToLongNullable expression) { return new ToLongOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToLongNullable.orElse(long)}. + * Internal class used when calling {@code ToLongNullable.doubleOrElse(long)}. * * @param the input entity type */ @@ -125,12 +125,12 @@ public long applyAsLong(T object) { * @return the non-nullable expression */ public static ToIntOrThrow - orElseThrow(ToIntNullable expression) { + intOrElseThrow(ToIntNullable expression) { return new ToIntOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToIntNullable.orElse(int)}. + * Internal class used when calling {@code ToIntNullable.doubleOrElse(int)}. * * @param the input entity type */ @@ -157,12 +157,12 @@ public int applyAsInt(T object) { * @return the non-nullable expression */ public static ToShortOrThrow - orElseThrow(ToShortNullable expression) { + shortOrElseThrow(ToShortNullable expression) { return new ToShortOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToShortNullable.orElse(short)}. + * Internal class used when calling {@code ToShortNullable.doubleOrElse(short)}. * * @param the input entity type */ @@ -189,12 +189,12 @@ public short applyAsShort(T object) { * @return the non-nullable expression */ public static ToByteOrThrow - orElseThrow(ToByteNullable expression) { + byteOrElseThrow(ToByteNullable expression) { return new ToByteOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToByteNullable.orElse(byte)}. + * Internal class used when calling {@code ToByteNullable.doubleOrElse(byte)}. * * @param the input entity type */ @@ -221,12 +221,12 @@ public byte applyAsByte(T object) { * @return the non-nullable expression */ public static ToCharOrThrow - orElseThrow(ToCharNullable expression) { + charOrElseThrow(ToCharNullable expression) { return new ToCharOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToCharNullable.orElse(char)}. + * Internal class used when calling {@code ToCharNullable.doubleOrElse(char)}. * * @param the input entity type */ @@ -253,12 +253,12 @@ public char applyAsChar(T object) { * @return the non-nullable expression */ public static ToBooleanOrThrow - orElseThrow(ToBooleanNullable expression) { + booleanOrElseThrow(ToBooleanNullable expression) { return new ToBooleanOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToBooleanNullable.orElse(boolean)}. + * Internal class used when calling {@code ToBooleanNullable.doubleOrElse(boolean)}. * * @param the input entity type */ @@ -285,12 +285,12 @@ public boolean applyAsBoolean(T object) { * @return the non-nullable expression */ public static ToStringOrThrow - orElseThrow(ToStringNullable expression) { + stringOrElseThrow(ToStringNullable expression) { return new ToStringOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToStringNullable.orElse(String)}. + * Internal class used when calling {@code ToStringNullable.doubleOrElse(String)}. * * @param the input entity type */ @@ -317,13 +317,13 @@ public String apply(T object) { * @return the non-nullable expression */ public static ToBigDecimalOrThrow - orElseThrow(ToBigDecimalNullable expression) { + bigDecimalOrElseThrow(ToBigDecimalNullable expression) { return new ToBigDecimalOrElseThrowImpl<>(expression); } /** * Internal class used when calling - * {@code ToBigDecimalNullable.orElse(BigDecimal)}. + * {@code ToBigDecimalNullable.doubleOrElse(BigDecimal)}. * * @param the input entity type */ @@ -351,12 +351,12 @@ public BigDecimal apply(T object) { * @return the non-nullable expression */ public static > ToEnumOrThrow - orElseThrow(ToEnumNullable expression) { + enumOrElseThrow(ToEnumNullable expression) { return new ToEnumOrElseThrowImpl<>(expression); } /** - * Internal class used when calling {@code ToEnumNullable.orElse(Enum)}. + * Internal class used when calling {@code ToEnumNullable.doubleOrElse(Enum)}. * * @param the input entity type * @param the enum type diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseUtil.java index 5df4f8af6b..265075b35c 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/OrElseUtil.java @@ -30,7 +30,7 @@ public final class OrElseUtil { * @return the non-nullable expression */ public static ToDoubleOrElse - orElse(ToDoubleNullable expression, double defaultValue) { + doubleOrElse(ToDoubleNullable expression, double defaultValue) { return new ToDoubleOrElseImpl<>(expression, defaultValue); } @@ -86,7 +86,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToFloatOrElse - orElse(ToFloatNullable expression, float defaultValue) { + floatOrElse(ToFloatNullable expression, float defaultValue) { return new ToFloatOrElseImpl<>(expression, defaultValue); } @@ -142,7 +142,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToLongOrElse - orElse(ToLongNullable expression, long defaultValue) { + longOrElse(ToLongNullable expression, long defaultValue) { return new ToLongOrElseImpl<>(expression, defaultValue); } @@ -198,7 +198,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToIntOrElse - orElse(ToIntNullable expression, int defaultValue) { + intOrElse(ToIntNullable expression, int defaultValue) { return new ToIntOrElseImpl<>(expression, defaultValue); } @@ -254,7 +254,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToShortOrElse - orElse(ToShortNullable expression, short defaultValue) { + shortOrElse(ToShortNullable expression, short defaultValue) { return new ToShortOrElseImpl<>(expression, defaultValue); } @@ -310,7 +310,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToByteOrElse - orElse(ToByteNullable expression, byte defaultValue) { + byteOrElse(ToByteNullable expression, byte defaultValue) { return new ToByteOrElseImpl<>(expression, defaultValue); } @@ -366,7 +366,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToCharOrElse - orElse(ToCharNullable expression, char defaultValue) { + charOrElse(ToCharNullable expression, char defaultValue) { return new ToCharOrElseImpl<>(expression, defaultValue); } @@ -422,7 +422,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToBooleanOrElse - orElse(ToBooleanNullable expression, boolean defaultValue) { + booleanOrElse(ToBooleanNullable expression, boolean defaultValue) { return new ToBooleanOrElseImpl<>(expression, defaultValue); } @@ -478,7 +478,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToStringOrElse - orElse(ToStringNullable expression, String defaultValue) { + stringOrElse(ToStringNullable expression, String defaultValue) { return new ToStringOrElseImpl<>(expression, defaultValue); } @@ -535,7 +535,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static > ToEnumOrElse - orElse(ToEnumNullable expression, E defaultValue) { + enumOrElse(ToEnumNullable expression, E defaultValue) { return new ToEnumOrElseImpl<>(expression, defaultValue); } @@ -596,7 +596,7 @@ public final int hashCode() { * @return the non-nullable expression */ public static ToBigDecimalOrElse - orElse(ToBigDecimalNullable expression, BigDecimal defaultValue) { + bigDecimalOrElse(ToBigDecimalNullable expression, BigDecimal defaultValue) { return new ToBigDecimalOrElseImpl<>(expression, defaultValue); } diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PlusUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PlusUtil.java index 841a4c0f89..3ff9d126fd 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PlusUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PlusUtil.java @@ -27,7 +27,7 @@ public final class PlusUtil { * @param the input type * @return the new expression */ - public static ToShort plus(ToByte first, byte second) { + public static ToShort bytePlusByte(ToByte first, byte second) { class BytePlusByte extends AbstractPlusByte> implements ToShort { private BytePlusByte(ToByte first, byte second) { super(first, second); @@ -51,7 +51,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToByte first, int second) { + public static ToInt bytePlusInt(ToByte first, int second) { class BytePlusInt extends AbstractPlusInt> implements ToInt { private BytePlusInt(ToByte first, int second) { super(first, second); @@ -75,7 +75,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToByte first, long second) { + public static ToLong bytePlusLong(ToByte first, long second) { class BytePlusLong extends AbstractPlusLong> implements ToLong { private BytePlusLong(ToByte first, long second) { super(first, second); @@ -99,7 +99,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToShort plus(ToByte first, ToByte second) { + public static ToShort bytePlusByte(ToByte first, ToByte second) { class BytePlusByte extends AbstractPlus, ToByte> implements ToShort { private BytePlusByte(ToByte first, ToByte second) { super(first, second); @@ -124,7 +124,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToShort first, byte second) { + public static ToInt shortPlusByte(ToShort first, byte second) { class ShortPlusShort extends AbstractPlusByte> implements ToInt { private ShortPlusShort(ToShort first, byte second) { super(first, second); @@ -148,7 +148,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToShort first, int second) { + public static ToInt shortPlusInt(ToShort first, int second) { class ShortPlusInt extends AbstractPlusInt> implements ToInt { private ShortPlusInt(ToShort first, int second) { super(first, second); @@ -172,7 +172,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToShort first, long second) { + public static ToLong shortPlusLong(ToShort first, long second) { class ShortPlusLong extends AbstractPlusLong> implements ToLong { private ShortPlusLong(ToShort first, long second) { super(first, second); @@ -196,7 +196,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToShort plus(ToShort first, ToShort second) { + public static ToShort shortPlusShort(ToShort first, ToShort second) { class ShortPlusShort extends AbstractPlus, ToShort> implements ToShort { private ShortPlusShort(ToShort first, ToShort second) { super(first, second); @@ -221,7 +221,7 @@ public short applyAsShort(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToInt first, byte second) { + public static ToInt intPlusByte(ToInt first, byte second) { class IntPlusByte extends AbstractPlusByte> implements ToInt { private IntPlusByte(ToInt first, byte second) { super(first, second); @@ -245,7 +245,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToInt first, int second) { + public static ToInt intPlusInt(ToInt first, int second) { class IntPlusInt extends AbstractPlusInt> implements ToInt { private IntPlusInt(ToInt first, int second) { super(first, second); @@ -269,7 +269,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToInt first, long second) { + public static ToLong intPlusLong(ToInt first, long second) { class IntPlusLong extends AbstractPlusLong> implements ToLong { private IntPlusLong(ToInt first, long second) { super(first, second); @@ -293,7 +293,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToInt first, ToByte second) { + public static ToInt intPlusByte(ToInt first, ToByte second) { class IntPlusByte extends AbstractPlus, ToByte> implements ToInt { private IntPlusByte(ToInt first, ToByte second) { super(first, second); @@ -319,7 +319,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToInt plus(ToInt first, ToInt second) { + public static ToInt intPlusInt(ToInt first, ToInt second) { class IntPlusInt extends AbstractPlus, ToInt> implements ToInt { private IntPlusInt(ToInt first, ToInt second) { super(first, second); @@ -344,7 +344,7 @@ public int applyAsInt(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToLong first, byte second) { + public static ToLong longPlusByte(ToLong first, byte second) { class LongPlusLong extends AbstractPlusByte> implements ToLong { private LongPlusLong(ToLong first, byte second) { super(first, second); @@ -368,7 +368,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToLong first, int second) { + public static ToLong longPlusInt(ToLong first, int second) { class LongPlusInt extends AbstractPlusInt> implements ToLong { private LongPlusInt(ToLong first, int second) { super(first, second); @@ -392,7 +392,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToLong first, long second) { + public static ToLong longPlusLong(ToLong first, long second) { class LongPlusLong extends AbstractPlusLong> implements ToLong { private LongPlusLong(ToLong first, long second) { super(first, second); @@ -416,7 +416,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToLong first, ToInt second) { + public static ToLong longPlusInt(ToLong first, ToInt second) { class LongPlusInt extends AbstractPlus, ToInt> implements ToLong { private LongPlusInt(ToLong first, ToInt second) { super(first, second); @@ -441,7 +441,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToLong plus(ToLong first, ToLong second) { + public static ToLong longPlusLong(ToLong first, ToLong second) { class LongPlusLong extends AbstractPlus, ToLong> implements ToLong { private LongPlusLong(ToLong first, ToLong second) { super(first, second); @@ -466,7 +466,7 @@ public long applyAsLong(T object) { * @param the input type * @return the new expression */ - public static ToFloat plus(ToFloat first, int second) { + public static ToFloat floatPlusInt(ToFloat first, int second) { class FloatPlusInt extends AbstractPlusInt> implements ToFloat { private FloatPlusInt(ToFloat first, int second) { super(first, second); @@ -490,7 +490,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToFloat first, long second) { + public static ToDouble floatPlusLong(ToFloat first, long second) { class FloatPlusLong extends AbstractPlusLong> implements ToDouble { private FloatPlusLong(ToFloat first, long second) { super(first, second); @@ -514,7 +514,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat plus(ToFloat first, float second) { + public static ToFloat floatPlusFloat(ToFloat first, float second) { class FloatPlusFloat extends AbstractPlusFloat> implements ToFloat { private FloatPlusFloat(ToFloat first, float second) { super(first, second); @@ -538,7 +538,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToFloat plus(ToFloat first, ToInt second) { + public static ToFloat floatPlusInt(ToFloat first, ToInt second) { class FloatPlusInt extends AbstractPlus, ToInt> implements ToFloat { private FloatPlusInt(ToFloat first, ToInt second) { super(first, second); @@ -563,7 +563,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToFloat first, ToLong second) { + public static ToDouble floatPlusLong(ToFloat first, ToLong second) { class FloatPlusLong extends AbstractPlus, ToLong> implements ToDouble { private FloatPlusLong(ToFloat first, ToLong second) { super(first, second); @@ -588,7 +588,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToFloat plus(ToFloat first, ToFloat second) { + public static ToFloat floatPlusFloat(ToFloat first, ToFloat second) { class FloatPlusFloat extends AbstractPlus, ToFloat> implements ToFloat { private FloatPlusFloat(ToFloat first, ToFloat second) { super(first, second); @@ -613,7 +613,7 @@ public float applyAsFloat(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, int second) { + public static ToDouble doublePlusInt(ToDouble first, int second) { class DoublePlusInt extends AbstractPlusInt> implements ToDouble { private DoublePlusInt(ToDouble first, int second) { super(first, second); @@ -637,7 +637,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, long second) { + public static ToDouble doublePlusLong(ToDouble first, long second) { class DoublePlusLong extends AbstractPlusLong> implements ToDouble { private DoublePlusLong(ToDouble first, long second) { super(first, second); @@ -661,7 +661,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, double second) { + public static ToDouble doublePlusDouble(ToDouble first, double second) { class DoublePlusDouble extends AbstractPlusDouble> implements ToDouble { private DoublePlusDouble(ToDouble first, double second) { super(first, second); @@ -685,7 +685,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, ToInt second) { + public static ToDouble doublePlusInt(ToDouble first, ToInt second) { class DoublePlusInt extends AbstractPlus, ToInt> implements ToDouble { private DoublePlusInt(ToDouble first, ToInt second) { super(first, second); @@ -710,7 +710,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, ToLong second) { + public static ToDouble doublePlusLong(ToDouble first, ToLong second) { class DoublePlusLong extends AbstractPlus, ToLong> implements ToDouble { private DoublePlusLong(ToDouble first, ToLong second) { super(first, second); @@ -735,7 +735,7 @@ public double applyAsDouble(T object) { * @param the input type * @return the new expression */ - public static ToDouble plus(ToDouble first, ToDouble second) { + public static ToDouble doublePlusDouble(ToDouble first, ToDouble second) { class DoublePlusDouble extends AbstractPlus, ToDouble> implements ToDouble { private DoublePlusDouble(ToDouble first, ToDouble second) { super(first, second); diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PowUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PowUtil.java index 9179f8b000..3865bf217d 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PowUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/PowUtil.java @@ -32,7 +32,7 @@ public final class PowUtil { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToByte expression, int power) { + public static ToDouble bytePowInt(ToByte expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -74,7 +74,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToByte expression, double power) { + public static ToDouble bytePowDouble(ToByte expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -92,7 +92,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToByte expression, ToInt power) { + public static ToDouble bytePowInt(ToByte expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -121,7 +121,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToByte expression, ToDouble power) { + public static ToDouble bytePowDouble(ToByte expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -146,7 +146,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToShort expression, int power) { + public static ToDouble shortPowInt(ToShort expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -188,7 +188,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToShort expression, double power) { + public static ToDouble shortPowDouble(ToShort expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -206,7 +206,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToShort expression, ToInt power) { + public static ToDouble shortPowInt(ToShort expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -235,7 +235,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToShort expression, ToDouble power) { + public static ToDouble shortPowDouble(ToShort expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -260,7 +260,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToInt expression, int power) { + public static ToDouble intPowInt(ToInt expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -302,7 +302,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToInt expression, double power) { + public static ToDouble intPowDouble(ToInt expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -320,7 +320,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToInt expression, ToInt power) { + public static ToDouble intPowInt(ToInt expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -349,7 +349,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToInt expression, ToDouble power) { + public static ToDouble intPowDouble(ToInt expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -374,7 +374,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToLong expression, int power) { + public static ToDouble longPowInt(ToLong expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -416,7 +416,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToLong expression, double power) { + public static ToDouble longPowDouble(ToLong expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -434,7 +434,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToLong expression, ToInt power) { + public static ToDouble longPowInt(ToLong expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -463,7 +463,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToLong expression, ToDouble power) { + public static ToDouble longPowDouble(ToLong expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -488,7 +488,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToFloat expression, int power) { + public static ToDouble floatPowInt(ToFloat expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -530,7 +530,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToFloat expression, double power) { + public static ToDouble floatPowDouble(ToFloat expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -548,7 +548,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToFloat expression, ToInt power) { + public static ToDouble floatPowInt(ToFloat expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -577,7 +577,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToFloat expression, ToDouble power) { + public static ToDouble floatPowDouble(ToFloat expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -602,7 +602,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToDouble expression, int power) { + public static ToDouble doublePowInt(ToDouble expression, int power) { switch (power) { case 0: return ToDouble.constant(1); case 1: return expression.asDouble(); @@ -644,7 +644,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToDouble expression, double power) { + public static ToDouble doublePowDouble(ToDouble expression, double power) { return new DoublePower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -662,7 +662,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToDouble expression, ToInt power) { + public static ToDouble doublePowInt(ToDouble expression, ToInt power) { return new ToIntPower>(expression, power) { @Override public double applyAsDouble(T object) { @@ -691,7 +691,7 @@ public double applyAsDouble(T object) { * @param the type of the input * @return the new expression */ - public static ToDouble pow(ToDouble expression, ToDouble power) { + public static ToDouble doublePowDouble(ToDouble expression, ToDouble power) { return new ToDoublePower>(expression, power) { @Override public double applyAsDouble(T object) { diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SignUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SignUtil.java index acd130bb6f..c82af008d8 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SignUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SignUtil.java @@ -30,7 +30,7 @@ public final class SignUtil { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToBigDecimal expression) { + public static ToByte signBigDecimal(ToBigDecimal expression) { class BigDecimalSign extends AbstractSign> { private BigDecimalSign(ToBigDecimal tToBigDecimal) { super(tToBigDecimal); @@ -54,7 +54,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToDouble expression) { + public static ToByte signDouble(ToDouble expression) { class DoubleSign extends AbstractSign> { private DoubleSign(ToDouble tToDouble) { super(tToDouble); @@ -79,7 +79,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToFloat expression) { + public static ToByte signFloat(ToFloat expression) { class FloatSign extends AbstractSign> { private FloatSign(ToFloat tToFloat) { super(tToFloat); @@ -104,7 +104,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToLong expression) { + public static ToByte signLong(ToLong expression) { class LongSign extends AbstractSign> { private LongSign(ToLong tToLong) { super(tToLong); @@ -129,7 +129,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToInt expression) { + public static ToByte signInt(ToInt expression) { class IntSign extends AbstractSign> { private IntSign(ToInt tToInt) { super(tToInt); @@ -154,7 +154,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToShort expression) { + public static ToByte signShort(ToShort expression) { class ShortSign extends AbstractSign> { private ShortSign(ToShort tToShort) { super(tToShort); @@ -179,7 +179,7 @@ public byte applyAsByte(T object) { * @param the input entity type * @return sign of the result of the wrapped expression */ - public static ToByte sign(ToByte expression) { + public static ToByte signByte(ToByte expression) { class ByteSign extends AbstractSign> { private ByteSign(ToByte tToByte) { super(tToByte); diff --git a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SqrtUtil.java b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SqrtUtil.java index bd4ed539a7..bc2bd467c0 100644 --- a/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SqrtUtil.java +++ b/runtime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/internal/expression/SqrtUtil.java @@ -27,7 +27,7 @@ public final class SqrtUtil { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToByte other) { + public static ToDouble sqrtByte(ToByte other) { class ByteSqrt extends AbstractSqrt> { private ByteSqrt(ToByte tToByte) { super(tToByte); @@ -50,7 +50,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToShort other) { + public static ToDouble sqrtShort(ToShort other) { class ShortSqrt extends AbstractSqrt> { private ShortSqrt(ToShort tToShort) { super(tToShort); @@ -73,7 +73,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToInt other) { + public static ToDouble sqrtInt(ToInt other) { class IntSqrt extends AbstractSqrt> { private IntSqrt(ToInt tToInt) { super(tToInt); @@ -96,7 +96,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToLong other) { + public static ToDouble sqrtLong(ToLong other) { class LongSqrt extends AbstractSqrt> { private LongSqrt(ToLong tToLong) { super(tToLong); @@ -119,7 +119,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToFloat other) { + public static ToDouble sqrtFloat(ToFloat other) { class FloatSqrt extends AbstractSqrt> { private FloatSqrt(ToFloat tToFloat) { super(tToFloat); @@ -142,7 +142,7 @@ public double applyAsDouble(T object) { * @param the input entity type * @return expression for the square root */ - public static ToDouble sqrt(ToDouble other) { + public static ToDouble sqrtDouble(ToDouble other) { class DoubleSqrt extends AbstractSqrt> { private DoubleSqrt(ToDouble tToDouble) { super(tToDouble);