[#238] Use Function and BiFunction in Tuple.map

jOOQ · Jun 28, 2016 · 91e719d · 91e719d
1 parent 65b8009
commit 91e719d
Show file tree

Hide file tree

Showing 16 changed files with 154 additions and 152 deletions.
diff --git a/src/main/java/org/jooq/lambda/tuple/Tuple0.java b/src/main/java/org/jooq/lambda/tuple/Tuple0.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.jooq.lambda.Seq;                
 import org.jooq.lambda.function.Function0;
@@ -184,8 +185,8 @@ public final Tuple0 skip0() {
     /**
      * Apply this tuple as arguments to a function.
      */
-    public final <R> R map(Function0<? extends R> function) {
+    public final <R> R map(Supplier<? extends R> function) {
-        return function.apply(this);
+        return function.get();
     }
 
     @Override

diff --git a/src/main/java/org/jooq/lambda/tuple/Tuple1.java b/src/main/java/org/jooq/lambda/tuple/Tuple1.java
@@ -207,14 +207,14 @@ public final Tuple0 skip1() {
     /**
      * Apply this tuple as arguments to a function.
      */
-    public final <R> R map(Function1<? super T1, ? extends R> function) {
+    public final <R> R map(Function<? super T1, ? extends R> function) {
-        return function.apply(this);
+        return function.apply(v1);
     }
 
     /**
      * Apply attribute 1 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U1> Tuple1<U1> map1(Function1<? super T1, ? extends U1> function) {
+    public final <U1> Tuple1<U1> map1(Function<? super T1, ? extends U1> function) {
         return Tuple.tuple(function.apply(v1));
     }
 

diff --git a/src/main/java/org/jooq/lambda/tuple/Tuple10.java b/src/main/java/org/jooq/lambda/tuple/Tuple10.java
@@ -399,76 +399,76 @@ public final Tuple0 skip10() {
      * Apply this tuple as arguments to a function.
      */
     public final <R> R map(Function10<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? super T10, ? extends R> function) {
-        return function.apply(this);
+        return function.apply(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 1 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U1> Tuple10<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10> map1(Function1<? super T1, ? extends U1> function) {
+    public final <U1> Tuple10<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10> map1(Function<? super T1, ? extends U1> function) {
         return Tuple.tuple(function.apply(v1), v2, v3, v4, v5, v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 2 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U2> Tuple10<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10> map2(Function1<? super T2, ? extends U2> function) {
+    public final <U2> Tuple10<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10> map2(Function<? super T2, ? extends U2> function) {
         return Tuple.tuple(v1, function.apply(v2), v3, v4, v5, v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 3 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U3> Tuple10<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10> map3(Function1<? super T3, ? extends U3> function) {
+    public final <U3> Tuple10<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10> map3(Function<? super T3, ? extends U3> function) {
         return Tuple.tuple(v1, v2, function.apply(v3), v4, v5, v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 4 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U4> Tuple10<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10> map4(Function1<? super T4, ? extends U4> function) {
+    public final <U4> Tuple10<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10> map4(Function<? super T4, ? extends U4> function) {
         return Tuple.tuple(v1, v2, v3, function.apply(v4), v5, v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 5 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U5> Tuple10<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10> map5(Function1<? super T5, ? extends U5> function) {
+    public final <U5> Tuple10<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10> map5(Function<? super T5, ? extends U5> function) {
         return Tuple.tuple(v1, v2, v3, v4, function.apply(v5), v6, v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 6 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U6> Tuple10<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10> map6(Function1<? super T6, ? extends U6> function) {
+    public final <U6> Tuple10<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10> map6(Function<? super T6, ? extends U6> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, function.apply(v6), v7, v8, v9, v10);
     }
 
     /**
      * Apply attribute 7 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U7> Tuple10<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10> map7(Function1<? super T7, ? extends U7> function) {
+    public final <U7> Tuple10<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10> map7(Function<? super T7, ? extends U7> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, function.apply(v7), v8, v9, v10);
     }
 
     /**
      * Apply attribute 8 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U8> Tuple10<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10> map8(Function1<? super T8, ? extends U8> function) {
+    public final <U8> Tuple10<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10> map8(Function<? super T8, ? extends U8> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, function.apply(v8), v9, v10);
     }
 
     /**
      * Apply attribute 9 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U9> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10> map9(Function1<? super T9, ? extends U9> function) {
+    public final <U9> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10> map9(Function<? super T9, ? extends U9> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, function.apply(v9), v10);
     }
 
     /**
      * Apply attribute 10 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10> map10(Function1<? super T10, ? extends U10> function) {
+    public final <U10> Tuple10<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10> map10(Function<? super T10, ? extends U10> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, function.apply(v10));
     }
 

diff --git a/src/main/java/org/jooq/lambda/tuple/Tuple11.java b/src/main/java/org/jooq/lambda/tuple/Tuple11.java
@@ -420,83 +420,83 @@ public final Tuple0 skip11() {
      * Apply this tuple as arguments to a function.
      */
     public final <R> R map(Function11<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? super T10, ? super T11, ? extends R> function) {
-        return function.apply(this);
+        return function.apply(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 1 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U1> Tuple11<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> map1(Function1<? super T1, ? extends U1> function) {
+    public final <U1> Tuple11<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> map1(Function<? super T1, ? extends U1> function) {
         return Tuple.tuple(function.apply(v1), v2, v3, v4, v5, v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 2 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U2> Tuple11<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10, T11> map2(Function1<? super T2, ? extends U2> function) {
+    public final <U2> Tuple11<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10, T11> map2(Function<? super T2, ? extends U2> function) {
         return Tuple.tuple(v1, function.apply(v2), v3, v4, v5, v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 3 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U3> Tuple11<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10, T11> map3(Function1<? super T3, ? extends U3> function) {
+    public final <U3> Tuple11<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10, T11> map3(Function<? super T3, ? extends U3> function) {
         return Tuple.tuple(v1, v2, function.apply(v3), v4, v5, v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 4 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U4> Tuple11<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10, T11> map4(Function1<? super T4, ? extends U4> function) {
+    public final <U4> Tuple11<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10, T11> map4(Function<? super T4, ? extends U4> function) {
         return Tuple.tuple(v1, v2, v3, function.apply(v4), v5, v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 5 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U5> Tuple11<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10, T11> map5(Function1<? super T5, ? extends U5> function) {
+    public final <U5> Tuple11<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10, T11> map5(Function<? super T5, ? extends U5> function) {
         return Tuple.tuple(v1, v2, v3, v4, function.apply(v5), v6, v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 6 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U6> Tuple11<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10, T11> map6(Function1<? super T6, ? extends U6> function) {
+    public final <U6> Tuple11<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10, T11> map6(Function<? super T6, ? extends U6> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, function.apply(v6), v7, v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 7 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U7> Tuple11<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10, T11> map7(Function1<? super T7, ? extends U7> function) {
+    public final <U7> Tuple11<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10, T11> map7(Function<? super T7, ? extends U7> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, function.apply(v7), v8, v9, v10, v11);
     }
 
     /**
      * Apply attribute 8 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U8> Tuple11<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10, T11> map8(Function1<? super T8, ? extends U8> function) {
+    public final <U8> Tuple11<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10, T11> map8(Function<? super T8, ? extends U8> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, function.apply(v8), v9, v10, v11);
     }
 
     /**
      * Apply attribute 9 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U9> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10, T11> map9(Function1<? super T9, ? extends U9> function) {
+    public final <U9> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10, T11> map9(Function<? super T9, ? extends U9> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, function.apply(v9), v10, v11);
     }
 
     /**
      * Apply attribute 10 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U10> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10, T11> map10(Function1<? super T10, ? extends U10> function) {
+    public final <U10> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10, T11> map10(Function<? super T10, ? extends U10> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, function.apply(v10), v11);
     }
 
     /**
      * Apply attribute 11 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, U11> map11(Function1<? super T11, ? extends U11> function) {
+    public final <U11> Tuple11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, U11> map11(Function<? super T11, ? extends U11> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, function.apply(v11));
     }
 

diff --git a/src/main/java/org/jooq/lambda/tuple/Tuple12.java b/src/main/java/org/jooq/lambda/tuple/Tuple12.java
@@ -441,90 +441,90 @@ public final Tuple0 skip12() {
      * Apply this tuple as arguments to a function.
      */
     public final <R> R map(Function12<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? super T10, ? super T11, ? super T12, ? extends R> function) {
-        return function.apply(this);
+        return function.apply(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 1 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U1> Tuple12<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map1(Function1<? super T1, ? extends U1> function) {
+    public final <U1> Tuple12<U1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map1(Function<? super T1, ? extends U1> function) {
         return Tuple.tuple(function.apply(v1), v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 2 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U2> Tuple12<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map2(Function1<? super T2, ? extends U2> function) {
+    public final <U2> Tuple12<T1, U2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map2(Function<? super T2, ? extends U2> function) {
         return Tuple.tuple(v1, function.apply(v2), v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 3 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U3> Tuple12<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map3(Function1<? super T3, ? extends U3> function) {
+    public final <U3> Tuple12<T1, T2, U3, T4, T5, T6, T7, T8, T9, T10, T11, T12> map3(Function<? super T3, ? extends U3> function) {
         return Tuple.tuple(v1, v2, function.apply(v3), v4, v5, v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 4 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U4> Tuple12<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10, T11, T12> map4(Function1<? super T4, ? extends U4> function) {
+    public final <U4> Tuple12<T1, T2, T3, U4, T5, T6, T7, T8, T9, T10, T11, T12> map4(Function<? super T4, ? extends U4> function) {
         return Tuple.tuple(v1, v2, v3, function.apply(v4), v5, v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 5 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U5> Tuple12<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10, T11, T12> map5(Function1<? super T5, ? extends U5> function) {
+    public final <U5> Tuple12<T1, T2, T3, T4, U5, T6, T7, T8, T9, T10, T11, T12> map5(Function<? super T5, ? extends U5> function) {
         return Tuple.tuple(v1, v2, v3, v4, function.apply(v5), v6, v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 6 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U6> Tuple12<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10, T11, T12> map6(Function1<? super T6, ? extends U6> function) {
+    public final <U6> Tuple12<T1, T2, T3, T4, T5, U6, T7, T8, T9, T10, T11, T12> map6(Function<? super T6, ? extends U6> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, function.apply(v6), v7, v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 7 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U7> Tuple12<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10, T11, T12> map7(Function1<? super T7, ? extends U7> function) {
+    public final <U7> Tuple12<T1, T2, T3, T4, T5, T6, U7, T8, T9, T10, T11, T12> map7(Function<? super T7, ? extends U7> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, function.apply(v7), v8, v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 8 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U8> Tuple12<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10, T11, T12> map8(Function1<? super T8, ? extends U8> function) {
+    public final <U8> Tuple12<T1, T2, T3, T4, T5, T6, T7, U8, T9, T10, T11, T12> map8(Function<? super T8, ? extends U8> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, function.apply(v8), v9, v10, v11, v12);
     }
 
     /**
      * Apply attribute 9 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U9> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10, T11, T12> map9(Function1<? super T9, ? extends U9> function) {
+    public final <U9> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, U9, T10, T11, T12> map9(Function<? super T9, ? extends U9> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, function.apply(v9), v10, v11, v12);
     }
 
     /**
      * Apply attribute 10 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U10> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10, T11, T12> map10(Function1<? super T10, ? extends U10> function) {
+    public final <U10> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, U10, T11, T12> map10(Function<? super T10, ? extends U10> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, function.apply(v10), v11, v12);
     }
 
     /**
      * Apply attribute 11 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U11> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, U11, T12> map11(Function1<? super T11, ? extends U11> function) {
+    public final <U11> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, U11, T12> map11(Function<? super T11, ? extends U11> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, function.apply(v11), v12);
     }
 
     /**
      * Apply attribute 12 as argument to a function and return a new tuple with the substituted argument.
      */
-    public final <U12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, U12> map12(Function1<? super T12, ? extends U12> function) {
+    public final <U12> Tuple12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, U12> map12(Function<? super T12, ? extends U12> function) {
         return Tuple.tuple(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, function.apply(v12));
     }