runtime-compute: Fix many warnings by avoiding ambigous method names

speedment · May 8, 2018 · c96fd8e · c96fd8e
1 parent 20389e0
commit c96fd8e
Show file tree

Hide file tree

Showing 38 changed files with 633 additions and 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
@@ -78,22 +78,22 @@ default ExpressionType expressionType() {
 
     @Override
     default ToDouble<T> asDouble() {
-        return CastUtil.castToDouble(this);
+        return CastUtil.castBigDecimalToDouble(this);
     }
 
     @Override
     default ToInt<T> asInt() {
-        return CastUtil.castToInt(this);
+        return CastUtil.castBigDecimalToInt(this);
     }
 
     @Override
     default ToLong<T> asLong() {
-        return CastUtil.castToLong(this);
+        return CastUtil.castBigDecimalToLong(this);
     }
 
     @Override
     default ToBigDecimal<T> abs() {
-        return AbsUtil.abs(this);
+        return AbsUtil.absBigDecimal(this);
     }
 
     @Override
@@ -283,12 +283,12 @@ default ToDouble<T> divide(ToDouble<T> divisor) {
 
     @Override
     default ToBigDecimal<T> map(UnaryOperator<BigDecimal> mapper) {
-        return MapperUtil.map(this, mapper);
+        return MapperUtil.mapBigDecimal(this, mapper);
     }
 
     @Override
     default ToDouble<T> mapToDouble(ToDoubleFunction<BigDecimal> mapper) {
-        return MapperUtil.mapToDouble(this, mapper);
+        return MapperUtil.mapBigDecimalToDouble(this, mapper);
     }
 
     @Override
@@ -305,6 +305,6 @@ default int compare(T first, T second) {
     default <V> ToBigDecimal<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToBigDecimal(casted, this);
     }
 }
diff --git a/...ent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java b/...ent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBigDecimalNullable.java
@@ -65,17 +65,17 @@ default ExpressionType expressionType() {
 
     @Override
     default ToBigDecimal<T> orThrow() throws NullPointerException {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.bigDecimalOrElseThrow(this);
     }
 
     @Override
     default ToBigDecimal<T> orElseGet(ToBigDecimal<T> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.bigDecimalOrElseGet(this, getter);
     }
 
     @Override
     default ToBigDecimal<T> 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
@@ -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<T> asDouble() {
-        return CastUtil.castToDouble(this);
+        return CastUtil.castBooleanToDouble(this);
     }
 
     @Override
     default ToInt<T> asInt() {
-        return CastUtil.castToInt(this);
+        return CastUtil.castBooleanToInt(this);
     }
 
     @Override
     default ToLong<T> asLong() {
-        return CastUtil.castToLong(this);
+        return CastUtil.castBooleanToLong(this);
     }
 
     @Override
     default ToDouble<T> mapToDouble(BooleanToDoubleFunction operator) {
-        return MapperUtil.mapToDouble(this, operator);
+        return MapperUtil.mapBooleanToDouble(this, operator);
     }
 
     @Override
     default ToBoolean<T> 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 <V> ToBoolean<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToBoolean(casted, this);
     }
 }
diff --git a/...parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToBooleanNullable.java b/...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<T> orThrow() throws NullPointerException {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.booleanOrElseThrow(this);
     }
 
     @Override
     default ToBoolean<T> orElseGet(ToBoolean<T> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.booleanOrElseGet(this, getter);
     }
 
     @Override
     default ToBoolean<T> orElse(Boolean value) {
-        return OrElseUtil.orElse(this, value);
+        return OrElseUtil.booleanOrElse(this, value);
     }
 
     default ToDoubleNullable<T> 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
@@ -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<T> asDouble() {
-        return CastUtil.castToDouble(this);
+        return CastUtil.castByteToDouble(this);
     }
 
     @Override
     default ToInt<T> asInt() {
-        return CastUtil.castToInt(this);
+        return CastUtil.castByteToInt(this);
     }
 
     @Override
     default ToLong<T> asLong() {
-        return CastUtil.castToLong(this);
+        return CastUtil.castByteToLong(this);
     }
 
     @Override
     default ToDouble<T> mapToDouble(ByteToDoubleFunction operator) {
-        return MapperUtil.mapToDouble(this, operator);
+        return MapperUtil.mapByteToDouble(this, operator);
     }
 
     @Override
     default ToByte<T> 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 <V> ToByte<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToByte(casted, this);
     }
 }
diff --git a/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToByteNullable.java b/...me-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<T> orThrow() throws NullPointerException {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.byteOrElseThrow(this);
     }
 
     @Override
     default ToByte<T> orElseGet(ToByte<T> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.byteOrElseGet(this, getter);
     }
 
     @Override
     default ToByte<T> 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
@@ -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<T> asDouble() {
-        return CastUtil.castToDouble(this);
+        return CastUtil.castCharToDouble(this);
     }
 
     @Override
     default ToInt<T> asInt() {
-        return CastUtil.castToInt(this);
+        return CastUtil.castCharToInt(this);
     }
 
     @Override
     default ToLong<T> asLong() {
-        return CastUtil.castToLong(this);
+        return CastUtil.castCharToLong(this);
     }
 
     @Override
     default ToChar<T> 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 <V> ToChar<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToChar(casted, this);
     }
 }
diff --git a/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToCharNullable.java b/...me-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<T> orThrow() throws NullPointerException {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.charOrElseThrow(this);
     }
 
     @Override
     default ToChar<T> orElseGet(ToChar<T> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.charOrElseGet(this, getter);
     }
 
     @Override
     default ToChar<T> 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
@@ -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<T> asDouble() {
 
     @Override
     default ToInt<T> asInt() {
-        return CastUtil.castToInt(this);
+        return CastUtil.castDoubleToInt(this);
     }
 
     @Override
     default ToLong<T> asLong() {
-        return CastUtil.castToLong(this);
+        return CastUtil.castDoubleToLong(this);
     }
 
     @Override
     default ToDouble<T> 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 <V> ToDouble<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToDouble(casted, this);
     }
 }
diff --git a/...-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToDoubleNullable.java b/...-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<T> orThrow() throws NullPointerException {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.doubleOrElseThrow(this);
     }
 
     @Override
     default ToDouble<T> orElseGet(ToDouble<T> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.doubleOrElseGet(this, getter);
     }
 
     @Override
     default ToDouble<T> 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
@@ -90,7 +90,7 @@ default ToString<T> asName() {
 
     @Override
     default ToEnum<T, E> map(UnaryOperator<E> mapper) {
-        return MapperUtil.map(this, mapper);
+        return MapperUtil.mapEnum(this, mapper);
     }
 
     @Override
@@ -107,6 +107,6 @@ default int compare(T first, T second) {
     default <V> ToEnum<V, E> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.compose(casted, this);
+        return ComposedUtil.composeToEnum(casted, this);
     }
 }
diff --git a/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java b/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToEnumNullable.java
@@ -101,17 +101,17 @@ default ToStringNullable<T> asName() {
 
     @Override
     default ToEnum<T, E> orThrow() {
-        return OrElseThrowUtil.orElseThrow(this);
+        return OrElseThrowUtil.enumOrElseThrow(this);
     }
 
     @Override
     default ToEnum<T, E> orElseGet(ToEnum<T, E> getter) {
-        return OrElseGetUtil.orElseGet(this, getter);
+        return OrElseGetUtil.enumOrElseGet(this, getter);
     }
 
     @Override
     default ToEnum<T, E> orElse(E value) {
-        return OrElseUtil.orElse(this, value);
+        return OrElseUtil.enumOrElse(this, value);
     }
 
     default ToDoubleNullable<T> mapToDoubleIfPresent(ToDouble<E> mapper) {