cleanup after merge

Author: magicprinc

jOOL-java-8/src/main/java/org/jooq/lambda/tuple/Tuple16.java

@@ -15,9 +15,6 @@
  */
 package org.jooq.lambda.tuple;
 
-import org.jooq.lambda.Seq;
-import org.jooq.lambda.function.Function16;
-
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -28,6 +25,10 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.jooq.lambda.Seq;                
+import org.jooq.lambda.function.Function1;
+import org.jooq.lambda.function.Function16;
+
 /**
  * A tuple of degree 16.
  *
@@ -874,4 +875,4 @@ public String toString() {
     public Tuple16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> clone() {
         return new Tuple16<>(this);
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/AsyncTest.java

@@ -1,10 +1,9 @@
 package org.jooq.lambda;
 
-import org.junit.Test;
+import static org.junit.Assert.assertNull;
 
 import java.util.concurrent.CompletionStage;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 public class AsyncTest {
 
@@ -16,4 +15,4 @@ public void testNoCustomExecutor() {
         completionStage = Async.supplyAsync(() -> null);
         assertNull(completionStage.toCompletableFuture().join());
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/BlockingTest.java

@@ -1,11 +1,10 @@
 package org.jooq.lambda;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  *
@@ -29,4 +28,4 @@ public void testRunnable_run() {
     }
 
 
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedBiConsumerTest.java

@@ -15,21 +15,21 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedBiConsumer;
-import org.jooq.lambda.fi.util.function.CheckedObjDoubleConsumer;
-import org.jooq.lambda.fi.util.function.CheckedObjIntConsumer;
-import org.jooq.lambda.fi.util.function.CheckedObjLongConsumer;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.ObjDoubleConsumer;
 import java.util.function.ObjIntConsumer;
 import java.util.function.ObjLongConsumer;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedBiConsumer;
+import org.jooq.lambda.fi.util.function.CheckedObjDoubleConsumer;
+import org.jooq.lambda.fi.util.function.CheckedObjIntConsumer;
+import org.jooq.lambda.fi.util.function.CheckedObjLongConsumer;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -239,4 +239,4 @@ private <E extends Exception> void assertException(Class<E> type, Throwable e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedBiFunctionTest.java

@@ -15,21 +15,21 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedBiFunction;
-import org.jooq.lambda.fi.util.function.CheckedToDoubleBiFunction;
-import org.jooq.lambda.fi.util.function.CheckedToIntBiFunction;
-import org.jooq.lambda.fi.util.function.CheckedToLongBiFunction;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.ToDoubleBiFunction;
 import java.util.function.ToIntBiFunction;
 import java.util.function.ToLongBiFunction;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedBiFunction;
+import org.jooq.lambda.fi.util.function.CheckedToDoubleBiFunction;
+import org.jooq.lambda.fi.util.function.CheckedToIntBiFunction;
+import org.jooq.lambda.fi.util.function.CheckedToLongBiFunction;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -236,4 +236,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedBiPredicateTest.java

@@ -15,13 +15,13 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedBiPredicate;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedBiPredicate;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -87,4 +87,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedBinaryOperatorTest.java

@@ -15,12 +15,9 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedBinaryOperator;
-import org.jooq.lambda.fi.util.function.CheckedDoubleBinaryOperator;
-import org.jooq.lambda.fi.util.function.CheckedIntBinaryOperator;
-import org.jooq.lambda.fi.util.function.CheckedLongBinaryOperator;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.DoubleBinaryOperator;
@@ -30,8 +27,11 @@
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedBinaryOperator;
+import org.jooq.lambda.fi.util.function.CheckedDoubleBinaryOperator;
+import org.jooq.lambda.fi.util.function.CheckedIntBinaryOperator;
+import org.jooq.lambda.fi.util.function.CheckedLongBinaryOperator;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -255,4 +255,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedComparatorTest.java

@@ -15,13 +15,13 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.CheckedComparator;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.Comparator;
 import java.util.function.Consumer;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.CheckedComparator;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -85,4 +85,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedConsumerTest.java

@@ -15,19 +15,19 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedConsumer;
-import org.jooq.lambda.fi.util.function.CheckedDoubleConsumer;
-import org.jooq.lambda.fi.util.function.CheckedIntConsumer;
-import org.jooq.lambda.fi.util.function.CheckedLongConsumer;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.Arrays;
 import java.util.function.Consumer;
 import java.util.function.DoubleConsumer;
 import java.util.function.IntConsumer;
 import java.util.function.LongConsumer;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedConsumer;
+import org.jooq.lambda.fi.util.function.CheckedDoubleConsumer;
+import org.jooq.lambda.fi.util.function.CheckedIntConsumer;
+import org.jooq.lambda.fi.util.function.CheckedLongConsumer;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -252,4 +252,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}

jOOL-java-8/src/test/java/org/jooq/lambda/CheckedFunctionTest.java

@@ -15,21 +15,9 @@
  */
 package org.jooq.lambda;
 
-import org.jooq.lambda.fi.util.function.CheckedDoubleFunction;
-import org.jooq.lambda.fi.util.function.CheckedDoubleToIntFunction;
-import org.jooq.lambda.fi.util.function.CheckedDoubleToLongFunction;
-import org.jooq.lambda.fi.util.function.CheckedFunction;
-import org.jooq.lambda.fi.util.function.CheckedIntFunction;
-import org.jooq.lambda.fi.util.function.CheckedIntToDoubleFunction;
-import org.jooq.lambda.fi.util.function.CheckedIntToLongFunction;
-import org.jooq.lambda.fi.util.function.CheckedLongFunction;
-import org.jooq.lambda.fi.util.function.CheckedLongToDoubleFunction;
-import org.jooq.lambda.fi.util.function.CheckedLongToIntFunction;
-import org.jooq.lambda.fi.util.function.CheckedToDoubleFunction;
-import org.jooq.lambda.fi.util.function.CheckedToIntFunction;
-import org.jooq.lambda.fi.util.function.CheckedToLongFunction;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -50,8 +38,20 @@
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
-
-import static org.junit.Assert.*;
+import org.jooq.lambda.fi.util.function.CheckedDoubleFunction;
+import org.jooq.lambda.fi.util.function.CheckedDoubleToIntFunction;
+import org.jooq.lambda.fi.util.function.CheckedDoubleToLongFunction;
+import org.jooq.lambda.fi.util.function.CheckedFunction;
+import org.jooq.lambda.fi.util.function.CheckedIntFunction;
+import org.jooq.lambda.fi.util.function.CheckedIntToDoubleFunction;
+import org.jooq.lambda.fi.util.function.CheckedIntToLongFunction;
+import org.jooq.lambda.fi.util.function.CheckedLongFunction;
+import org.jooq.lambda.fi.util.function.CheckedLongToDoubleFunction;
+import org.jooq.lambda.fi.util.function.CheckedLongToIntFunction;
+import org.jooq.lambda.fi.util.function.CheckedToDoubleFunction;
+import org.jooq.lambda.fi.util.function.CheckedToIntFunction;
+import org.jooq.lambda.fi.util.function.CheckedToLongFunction;
+import org.junit.Test;
 
 /**
  * @author Lukas Eder
@@ -736,4 +736,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
             assertEquals(message, e.getCause().getMessage());
         }
     }
-}
+}