runtime-compute: Fix #657 make compose() return nullable expressions

speedment · May 30, 2018 · 8269db6 · 8269db6
1 parent c7756f9
commit 8269db6
Show file tree

Hide file tree

Showing 23 changed files with 505 additions and 1,585 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
@@ -317,7 +317,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToBigDecimal<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToBigDecimalNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -113,6 +113,6 @@ default int compare(T first, T second) {
     default <V> ToBigDecimalNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToBigDecimalNullable(casted, this);
     }
 }
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
@@ -126,7 +126,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToBoolean<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToBooleanNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -207,6 +207,6 @@ default int compare(T first, T second) {
     default <V> ToBooleanNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToBooleanNullable(casted, this);
     }
 }
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
@@ -318,7 +318,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToByte<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToByteNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -227,6 +227,6 @@ default int compare(T first, T second) {
     default <V> ToByteNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToByteNullable(casted, this);
     }
 }
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
@@ -125,7 +125,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToChar<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToCharNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -119,6 +119,6 @@ default int compare(T first, T second) {
     default <V> ToCharNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToCharNullable(casted, this);
     }
 }
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
@@ -325,7 +325,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToDouble<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToDoubleNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -198,6 +198,6 @@ default int compare(T first, T second) {
     default <V> ToDoubleNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToDoubleNullable(casted, this);
     }
 }
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
@@ -120,7 +120,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToEnum<V, E> compose(Function<? super V, ? extends T> before) {
+    default <V> ToEnumNullable<V, E> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         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
@@ -245,6 +245,6 @@ default int compare(T first, T second) {
     default <V> ToEnumNullable<V, E> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToEnumNullable(casted, this);
     }
 }
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
@@ -319,7 +319,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToFloat<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToFloatNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         return ComposedUtil.composeToFloat(casted, this);

diff --git a/...e-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java b/...e-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToFloatNullable.java
@@ -232,6 +232,6 @@ default int compare(T first, T second) {
     default <V> ToFloatNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToFloatNullable(casted, this);
     }
 }
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
@@ -319,7 +319,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToInt<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToIntNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         return ComposedUtil.composeToInt(casted, this);

diff --git a/...ime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java b/...ime-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToIntNullable.java
@@ -228,6 +228,6 @@ default int compare(T first, T second) {
     default <V> ToIntNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToIntNullable(casted, this);
     }
 }
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
@@ -320,7 +320,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToLong<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToLongNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         return ComposedUtil.composeToLong(casted, this);

diff --git a/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java b/...me-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToLongNullable.java
@@ -232,6 +232,6 @@ default int compare(T first, T second) {
     default <V> ToLongNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToLongNullable(casted, this);
     }
 }
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
@@ -319,7 +319,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToShort<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToShortNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         return ComposedUtil.composeToShort(casted, this);

diff --git a/...e-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java b/...e-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToShortNullable.java
@@ -227,6 +227,6 @@ default int compare(T first, T second) {
     default <V> ToShortNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToShortNullable(casted, this);
     }
 }
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
@@ -104,7 +104,7 @@ default int compare(T first, T second) {
     }
 
     @Override
-    default <V> ToString<V> compose(Function<? super V, ? extends T> before) {
+    default <V> ToStringNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
         return ComposedUtil.composeToString(casted, this);

diff --git a/...-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java b/...-parent/runtime-compute/src/main/java/com/speedment/runtime/compute/ToStringNullable.java
@@ -111,6 +111,6 @@ default int compare(T first, T second) {
     default <V> ToStringNullable<V> compose(Function<? super V, ? extends T> before) {
         @SuppressWarnings("unchecked")
         final Function<V, T> casted = (Function<V, T>) before;
-        return ComposedUtil.composeNullable(casted, this);
+        return ComposedUtil.composeToStringNullable(casted, this);
     }
 }