runtime-compute: Add HasMapToDouble trait

speedment · May 8, 2018 · 31ed3db · 31ed3db
1 parent f085c05
commit 31ed3db
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 4 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
@@ -12,11 +12,12 @@
 import java.math.BigDecimal;
 import static java.util.Objects.requireNonNull;
 import java.util.function.Function;
+import java.util.function.ToDoubleFunction;
 import java.util.function.UnaryOperator;
 
 /**
- * Expression that given an entity returns a non-null {@code String} value. This
- * expression can be implemented using a lambda, or it can be a result of
+ * Expression that given an entity returns a non-null {@code BigDecimal} value.
+ * This expression can be implemented using a lambda, or it can be a result of
  * another operation. It has additional methods for operating on it.
  *
  * @param <T> type to extract from
@@ -43,6 +44,7 @@ public interface ToBigDecimal<T>
         HasMultiply<T, ToDouble<T>, ToDouble<T>, ToDouble<T>>,
         HasDivide<T>,
         HasMap<T, UnaryOperator<BigDecimal>, ToBigDecimal<T>>,
+        HasMapToDouble<T, ToDoubleFunction<BigDecimal>>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -284,6 +286,11 @@ default ToBigDecimal<T> map(UnaryOperator<BigDecimal> mapper) {
         return MapperUtil.map(this, mapper);
     }
 
+    @Override
+    default ToDouble<T> mapToDouble(ToDoubleFunction<BigDecimal> mapper) {
+        return MapperUtil.mapToDouble(this, mapper);
+    }
+
     @Override
     default long hash(T object) {
         return apply(object).hashCode();

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
@@ -16,8 +16,8 @@
 import java.util.function.Function;
 
 /**
- * Expression that given an entity returns a non-null {@code String} value. This
- * expression can be implemented using a lambda, or it can be a result of
+ * Expression that given an entity returns a nullable {@code BigDecimal} value.
+ * This expression can be implemented using a lambda, or it can be a result of
  * another operation. It has additional methods for operating on it.
  *
  * @param <T> type to extract from

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
@@ -15,6 +15,7 @@
 import com.speedment.runtime.compute.trait.HasCompose;
 import com.speedment.runtime.compute.trait.HasHash;
 import com.speedment.runtime.compute.trait.HasMap;
+import com.speedment.runtime.compute.trait.HasMapToDouble;
 
 import java.math.BigDecimal;
 import static java.util.Objects.requireNonNull;
@@ -43,6 +44,7 @@ public interface ToBoolean<T>
         HasAsInt<T>,
         HasAsLong<T>,
         HasMap<T, BooleanUnaryOperator, ToBoolean<T>>,
+        HasMapToDouble<T, BooleanToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -88,6 +90,7 @@ default ToLong<T> asLong() {
         return CastUtil.castToLong(this);
     }
 
+    @Override
     default ToDouble<T> mapToDouble(BooleanToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

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,5 +1,6 @@
 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;
@@ -44,6 +45,7 @@ public interface ToByte<T>
         HasMultiply<T, ToInt<T>, ToInt<T>, ToLong<T>>,
         HasDivide<T>,
         HasMap<T, ByteUnaryOperator, ToByte<T>>,
+        HasMapToDouble<T, ByteToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -89,6 +91,7 @@ default ToLong<T> asLong() {
         return CastUtil.castToLong(this);
     }
 
+    @Override
     default ToDouble<T> mapToDouble(ByteToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

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,5 +1,7 @@
 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;

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
@@ -1,6 +1,7 @@
 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;
@@ -44,6 +45,7 @@ public interface ToFloat<T>
         HasMultiply<T, ToFloat<T>, ToFloat<T>, ToDouble<T>>,
         HasDivide<T>,
         HasMap<T, FloatUnaryOperator, ToFloat<T>>,
+        HasMapToDouble<T, FloatToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -89,6 +91,7 @@ default ToLong<T> asLong() {
         return CastUtil.castToLong(this);
     }
 
+    @Override
     default ToDouble<T> mapToDouble(FloatToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

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
@@ -1,5 +1,6 @@
 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;
@@ -43,6 +44,7 @@ public interface ToInt<T>
         HasMultiply<T, ToLong<T>, ToLong<T>, ToLong<T>>,
         HasDivide<T>,
         HasMap<T, IntUnaryOperator, ToInt<T>>,
+        HasMapToDouble<T, IntToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -89,6 +91,7 @@ default ToLong<T> asLong() {
         return CastUtil.castToLong(this);
     }
 
+    @Override
     default ToDouble<T> mapToDouble(IntToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

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
@@ -1,5 +1,6 @@
 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;
@@ -43,6 +44,7 @@ public interface ToLong<T>
         HasMultiply<T, ToLong<T>, ToLong<T>, ToLong<T>>,
         HasDivide<T>,
         HasMap<T, LongUnaryOperator, ToLong<T>>,
+        HasMapToDouble<T, LongToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -89,6 +91,7 @@ default ToLong<T> asLong() {
         return this;
     }
 
+    @Override
     default ToDouble<T> mapToDouble(LongToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

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
@@ -1,6 +1,7 @@
 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;
@@ -44,6 +45,7 @@ public interface ToShort<T>
         HasMultiply<T, ToInt<T>, ToInt<T>, ToLong<T>>,
         HasDivide<T>,
         HasMap<T, ShortUnaryOperator, ToShort<T>>,
+        HasMapToDouble<T, ShortToDoubleFunction>,
         HasHash<T>,
         HasCompare<T>,
         HasCompose<T> {
@@ -90,6 +92,7 @@ default ToLong<T> asLong() {
         return CastUtil.castToLong(this);
     }
 
+    @Override
     default ToDouble<T> mapToDouble(ShortToDoubleFunction operator) {
         return MapperUtil.mapToDouble(this, operator);
     }

diff --git a/...time-compute/src/main/java/com/speedment/runtime/compute/expression/MapperExpression.java b/...time-compute/src/main/java/com/speedment/runtime/compute/expression/MapperExpression.java
@@ -131,6 +131,11 @@ enum MapperType {
         /**
          * Implemented as a {@link java.util.function.UnaryOperator}.
          */
+        BIG_DECIMAL_TO_DOUBLE,
+
+        /**
+         * Implemented as a {@link java.util.function.ToDoubleFunction}.
+         */
         BIG_DECIMAL_TO_BIG_DECIMAL
     }
 }
diff --git a/...e-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java b/...e-compute/src/main/java/com/speedment/runtime/compute/internal/expression/MapperUtil.java
@@ -432,6 +432,30 @@ public MapperType mapperType() {
         };
     }
 
+    /**
+     * Returns an expression that first applies the specified expression to get
+     * a value, then applies the specified mapping operation to that value to
+     * get the final result.
+     *
+     * @param expression  the expression to apply to the input
+     * @param mapper      the mapper to apply to the result
+     * @param <T>         the input type
+     * @return            the new expression
+     */
+    public static <T> ToDouble<T> mapToDouble(ToBigDecimal<T> expression, ToDoubleFunction<BigDecimal> mapper) {
+        return new ToDoubleMapper<T, ToBigDecimal<T>, ToDoubleFunction<BigDecimal>>(expression, mapper) {
+            @Override
+            public double applyAsDouble(T object) {
+                return this.mapper.applyAsDouble(this.inner.apply(object));
+            }
+
+            @Override
+            public MapperType mapperType() {
+                return MapperType.BIG_DECIMAL_TO_DOUBLE;
+            }
+        };
+    }
+
     /**
      * Abstract base for a mapping operation that results in a {@code byte}.
      *

diff --git a/...ent/runtime-compute/src/main/java/com/speedment/runtime/compute/trait/HasMapToDouble.java b/...ent/runtime-compute/src/main/java/com/speedment/runtime/compute/trait/HasMapToDouble.java
@@ -0,0 +1,27 @@
+package com.speedment.runtime.compute.trait;
+
+import com.speedment.runtime.compute.ToDouble;
+
+/**
+ * Trait for expressions that can be mapped to a new expression of the same type
+ * by supplying a mapping function.
+ *
+ * @param <T>       the input entity type
+ * @param <MAPPER>  the functional interface used for mapping values
+ *
+ * @author Emil Forslund
+ * @since  3.1.0
+ */
+public interface HasMapToDouble<T, MAPPER> {
+
+    /**
+     * Maps the result of this expression into a {@code double} by passing it to
+     * the specified {@code mapper}, producing a new expression that implements
+     * {@link ToDouble}.
+     *
+     * @param mapper  the mapper to use on the result of this expression
+     * @return        the new mapped expression
+     */
+    ToDouble<T> mapToDouble(MAPPER mapper);
+
+}