Runtime field: Add specific override, Fix #385

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/BooleanGetter.java

@@ -1,13 +1,13 @@
 /**
- * 
+ *
  * Copyright (c) 2006-2017, Speedment, Inc. All Rights Reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); You may not
  * use this file except in compliance with the License. You may obtain a copy of
- * the License at: 
- * 
+ * the License at:
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,38 +18,44 @@
 
 import com.speedment.common.annotation.GeneratedCode;
 import com.speedment.common.function.ToBooleanFunction;
+import java.util.function.Function;
 
 /**
  * A short-cut functional reference to the {@code getXXX(value)} method for a
  * particular field in an entity.
  * <p>
- * A {@code BooleanGetter<ENTITY>} has the following signature:
- * {@code
+ * A {@code BooleanGetter<ENTITY>} has the following signature:  {@code
  *     interface ENTITY {
  *         boolean getXXX();
- *     }
  * }
- * 
+ * }
+ *
  * @param <ENTITY> the entity
- * 
+ *
  * @author Emil Forslund
- * @since  3.0.0
+ * @since 3.0.0
  */
 @GeneratedCode(value = "Speedment")
 @FunctionalInterface
 public interface BooleanGetter<ENTITY> extends Getter<ENTITY>, ToBooleanFunction<ENTITY> {
-    
+
     /**
      * Returns the member represented by this getter in the specified instance.
-     * 
+     *
      * @param instance the instance to get from
-     * @return         the value
+     * @return the value
      */
     @Override
     boolean applyAsBoolean(ENTITY instance);
-    
+
     @Override
     default Boolean apply(ENTITY instance) {
         return applyAsBoolean(instance);
     }
-}
+
+    @Override
+    default Function<ENTITY, Boolean> asFunction() {
+        return this::apply;
+    }    
+
+}

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/ByteGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 
 /**
  * A short-cut functional reference to the {@code getXXX(value)} method for a
@@ -50,4 +51,10 @@ public interface ByteGetter<ENTITY> extends Getter<ENTITY> {
     default Byte apply(ENTITY instance) {
         return applyAsByte(instance);
     }
+
+    @Override
+    default Function<ENTITY,Byte> asFunction() {
+        return this::apply;
+    }    
+
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/CharGetter.java

@@ -1,13 +1,13 @@
 /**
- * 
+ *
  * Copyright (c) 2006-2017, Speedment, Inc. All Rights Reserved.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); You may not
  * use this file except in compliance with the License. You may obtain a copy of
- * the License at: 
- * 
+ * the License at:
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,37 +17,43 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 
 /**
  * A short-cut functional reference to the {@code getXXX(value)} method for a
  * particular field in an entity.
  * <p>
- * A {@code CharacterGetter<ENTITY>} has the following signature:
- * {@code
+ * A {@code CharacterGetter<ENTITY>} has the following signature:  {@code
  *     interface ENTITY {
  *         char getXXX();
- *     }
  * }
- * 
+ * }
+ *
  * @param <ENTITY> the entity
- * 
+ *
  * @author Emil Forslund
- * @since  3.0.0
+ * @since 3.0.0
  */
 @GeneratedCode(value = "Speedment")
 @FunctionalInterface
 public interface CharGetter<ENTITY> extends Getter<ENTITY> {
-    
+
     /**
      * Returns the member represented by this getter in the specified instance.
-     * 
+     *
      * @param instance the instance to get from
-     * @return         the value
+     * @return the value
      */
     char applyAsChar(ENTITY instance);
-    
+
     @Override
     default Character apply(ENTITY instance) {
         return applyAsChar(instance);
     }
-}
+
+    @Override
+    default Function<ENTITY, Character> asFunction() {
+        return this::apply;
+    }
+
+}

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/DoubleGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 import java.util.function.ToDoubleFunction;
 
 /**
@@ -52,4 +53,10 @@ public interface DoubleGetter<ENTITY> extends Getter<ENTITY>, ToDoubleFunction<E
     default Double apply(ENTITY instance) {
         return applyAsDouble(instance);
     }
+
+    @Override
+    default Function<ENTITY, Double> asFunction() {
+        return this::apply;
+    }
+
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/FloatGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 
 /**
  * A short-cut functional reference to the {@code getXXX(value)} method for a
@@ -50,4 +51,10 @@ public interface FloatGetter<ENTITY> extends Getter<ENTITY> {
     default Float apply(ENTITY instance) {
         return applyAsFloat(instance);
     }
+
+    @Override
+    default Function<ENTITY, Float> asFunction() {
+        return this::apply;
+    }
+
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/Getter.java

@@ -40,7 +40,7 @@ public interface Getter<ENTITY> {
      * 
      * @return  this object as a function
      */
-    default Function<ENTITY, Object> asFunction() {
+    default Function<ENTITY, ? extends Object> asFunction() {
         return this::apply;
     }
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/IntGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 import java.util.function.ToIntFunction;
 
 /**
@@ -38,7 +39,7 @@
 @GeneratedCode(value = "Speedment")
 @FunctionalInterface
 public interface IntGetter<ENTITY> extends Getter<ENTITY>, ToIntFunction<ENTITY> {
-
+        
     /**
      * Returns the member represented by this getter in the specified instance.
      * 
@@ -52,4 +53,10 @@ public interface IntGetter<ENTITY> extends Getter<ENTITY>, ToIntFunction<ENTITY>
     default Integer apply(ENTITY instance) {
         return applyAsInt(instance);
     }
+
+    @Override
+    default Function<ENTITY, Integer> asFunction() {
+        return this::apply;
+    }    
+
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/LongGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 import java.util.function.ToLongFunction;
 
 /**
@@ -52,4 +53,10 @@ public interface LongGetter<ENTITY> extends Getter<ENTITY>, ToLongFunction<ENTIT
     default Long apply(ENTITY instance) {
         return applyAsLong(instance);
     }
+
+    @Override
+    default Function<ENTITY, Long> asFunction() {
+        return this::apply;
+    }    
+
 }

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/ReferenceGetter.java

@@ -40,4 +40,11 @@
 
 @FunctionalInterface
 public interface ReferenceGetter<ENTITY, V> 
-extends Getter<ENTITY>, Function<ENTITY, V> {}
+extends Getter<ENTITY>, Function<ENTITY, V> {
+
+    @Override
+    default Function<ENTITY, V> asFunction() {
+        return this;
+    }    
+
+}

runtime-parent/runtime-field/src/main/java/com/speedment/runtime/field/method/ShortGetter.java

@@ -17,6 +17,7 @@
 package com.speedment.runtime.field.method;
 
 import com.speedment.common.annotation.GeneratedCode;
+import java.util.function.Function;
 
 /**
  * A short-cut functional reference to the {@code getXXX(value)} method for a
@@ -50,4 +51,10 @@ public interface ShortGetter<ENTITY> extends Getter<ENTITY> {
     default Short apply(ENTITY instance) {
         return applyAsShort(instance);
     }
+
+    @Override
+    default Function<ENTITY, Short> asFunction() {
+        return this::apply;
+    }    
+
 }