Skip to content

Commit 5280507

Browse files
magicprincmagicprinc
committed
Same EOL (LF). Java8 version == Java9 version except build scripts and extra module-info.java
1 parent 4f1bba0 commit 5280507

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+6229
-6295
lines changed

‎jOOL-java-8/src/main/java/org/jooq/lambda/Blocking.java

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,7 @@
1717

1818
import java.util.concurrent.ForkJoinPool;
1919
import java.util.concurrent.ForkJoinPool.ManagedBlocker;
20-
import java.util.function.BiConsumer;
21-
import java.util.function.BiFunction;
22-
import java.util.function.BiPredicate;
23-
import java.util.function.BinaryOperator;
24-
import java.util.function.BooleanSupplier;
25-
import java.util.function.Consumer;
26-
import java.util.function.DoubleBinaryOperator;
27-
import java.util.function.DoubleConsumer;
28-
import java.util.function.DoubleFunction;
29-
import java.util.function.DoublePredicate;
30-
import java.util.function.DoubleSupplier;
31-
import java.util.function.DoubleToIntFunction;
32-
import java.util.function.DoubleToLongFunction;
33-
import java.util.function.DoubleUnaryOperator;
34-
import java.util.function.Function;
35-
import java.util.function.IntBinaryOperator;
36-
import java.util.function.IntConsumer;
37-
import java.util.function.IntFunction;
38-
import java.util.function.IntPredicate;
39-
import java.util.function.IntSupplier;
40-
import java.util.function.IntToDoubleFunction;
41-
import java.util.function.IntToLongFunction;
42-
import java.util.function.IntUnaryOperator;
43-
import java.util.function.LongBinaryOperator;
44-
import java.util.function.LongConsumer;
45-
import java.util.function.LongFunction;
46-
import java.util.function.LongPredicate;
47-
import java.util.function.LongSupplier;
48-
import java.util.function.LongToDoubleFunction;
49-
import java.util.function.LongToIntFunction;
50-
import java.util.function.LongUnaryOperator;
51-
import java.util.function.ObjDoubleConsumer;
52-
import java.util.function.ObjIntConsumer;
53-
import java.util.function.ObjLongConsumer;
54-
import java.util.function.Predicate;
55-
import java.util.function.Supplier;
56-
import java.util.function.ToDoubleBiFunction;
57-
import java.util.function.ToDoubleFunction;
58-
import java.util.function.ToIntBiFunction;
59-
import java.util.function.ToIntFunction;
60-
import java.util.function.ToLongBiFunction;
61-
import java.util.function.ToLongFunction;
62-
import java.util.function.UnaryOperator;
20+
import java.util.function.*;
6321

6422
/**
6523
* A factory class for methods that wrap functional interfaces like
@@ -281,4 +239,4 @@ public boolean isReleasable() {
281239

282240
private Blocking() {
283241
}
284-
}
242+
}

‎jOOL-java-8/src/main/java/org/jooq/lambda/Partition.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import java.util.*;
18+
import org.jooq.lambda.tuple.Tuple2;
19+
20+
import java.util.ArrayList;
21+
import java.util.Collection;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
1925
import java.util.function.BooleanSupplier;
2026
import java.util.function.Supplier;
2127

22-
import org.jooq.lambda.tuple.Tuple2;
23-
2428
/**
2529
* @author Lukas Eder
2630
*/
@@ -64,4 +68,4 @@ <R> R cache(Object key, Supplier<? extends R> value) {
6468
<R> R cache(Supplier<?> key, Supplier<? extends R> value) {
6569
return (R) cache.computeIfAbsent(key.get(), k -> value.get());
6670
}
67-
}
71+
}

‎jOOL-java-8/src/main/java/org/jooq/lambda/SeqImpl.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import static java.util.Comparator.naturalOrder;
19-
import static java.util.stream.Collectors.*;
18+
import org.jooq.lambda.tuple.Tuple;
2019

2120
import java.util.ArrayList;
2221
import java.util.Collection;
@@ -47,7 +46,10 @@
4746
import java.util.stream.LongStream;
4847
import java.util.stream.Stream;
4948

50-
import org.jooq.lambda.tuple.Tuple;
49+
import static java.util.Comparator.naturalOrder;
50+
import static java.util.stream.Collectors.summingDouble;
51+
import static java.util.stream.Collectors.summingInt;
52+
import static java.util.stream.Collectors.summingLong;
5153

5254
/**
5355
* @author Lukas Eder
@@ -707,4 +709,4 @@ public String format() {
707709

708710
return result.append(separator).toString();
709711
}
710-
}
712+
}

‎jOOL-java-8/src/main/java/org/jooq/lambda/SeqUtils.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,24 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import static java.util.Comparator.comparing;
19-
import static org.jooq.lambda.Seq.seq;
18+
import org.jooq.lambda.tuple.Tuple2;
2019

21-
import java.util.*;
20+
import java.util.ArrayList;
21+
import java.util.Collection;
22+
import java.util.Comparator;
23+
import java.util.Iterator;
24+
import java.util.List;
25+
import java.util.Map;
26+
import java.util.OptionalLong;
27+
import java.util.Spliterator;
28+
import java.util.TreeSet;
2229
import java.util.function.Consumer;
2330
import java.util.function.Predicate;
2431
import java.util.stream.Collector;
2532
import java.util.stream.Stream;
2633

27-
import org.jooq.lambda.tuple.Tuple2;
34+
import static java.util.Comparator.comparing;
35+
import static org.jooq.lambda.Seq.seq;
2836

2937
/**
3038
* @author Lukas Eder
@@ -153,4 +161,4 @@ static Runnable closeAll(AutoCloseable... closeables) {
153161
sneakyThrow(t);
154162
};
155163
}
156-
}
164+
}

‎jOOL-java-8/src/main/java/org/jooq/lambda/WindowImpl.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@
1515
*/
1616
package org.jooq.lambda;
1717

18+
import org.jooq.lambda.tuple.Tuple2;
19+
1820
import java.util.Collection;
1921
import java.util.Collections;
20-
21-
import static java.util.Comparator.naturalOrder;
22-
import static java.util.Comparator.comparing;
23-
import static java.util.Collections.binarySearch;
24-
import static org.jooq.lambda.Seq.seq;
25-
import static org.jooq.lambda.tuple.Tuple.tuple;
26-
2722
import java.util.Comparator;
2823
import java.util.List;
2924
import java.util.Map;
@@ -39,7 +34,11 @@
3934
import java.util.stream.Collector;
4035
import java.util.stream.Collectors;
4136

42-
import org.jooq.lambda.tuple.Tuple2;
37+
import static java.util.Collections.binarySearch;
38+
import static java.util.Comparator.comparing;
39+
import static java.util.Comparator.naturalOrder;
40+
import static org.jooq.lambda.Seq.seq;
41+
import static org.jooq.lambda.tuple.Tuple.tuple;
4342

4443
/**
4544
* @author Lukas Eder
@@ -606,4 +605,4 @@ public String commonPrefix() {
606605
public String commonSuffix() {
607606
return partition.cacheIf(completePartition(), () -> "commonSuffix", () -> window().commonSuffix());
608607
}
609-
}
608+
}

‎jOOL-java-8/src/main/java/org/jooq/lambda/function/Functions.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package org.jooq.lambda.function;
1717

18-
import java.util.function.Predicate;
19-
2018
import org.jooq.lambda.Seq;
2119

20+
import java.util.function.Predicate;
21+
2222
/**
2323
* @author Lukas Eder
2424
*/
@@ -27,23 +27,23 @@ public final class Functions {
2727
/**
2828
* Negate a predicate.
2929
*/
30-
public static final <T> Predicate<T> not(Predicate<T> predicate) {
30+
public static <T> Predicate<T> not(Predicate<T> predicate) {
3131
return predicate.negate();
3232
}
3333

3434
/**
35-
* Negate a predicate.
35+
* AND all predicates.
3636
*/
3737
@SafeVarargs
38-
public static final <T> Predicate<T> and(Predicate<T>... predicates) {
39-
return Seq.of(predicates).reduce(t -> true, (t1, t2) -> t1.and(t2));
38+
public static <T> Predicate<T> and(Predicate<T>... predicates) {
39+
return Seq.of(predicates).reduce(t -> true, Predicate::and);
4040
}
4141

4242
/**
43-
* Negate a predicate.
43+
* OR all predicates.
4444
*/
4545
@SafeVarargs
46-
public static final <T> Predicate<T> or(Predicate<T>... predicates) {
47-
return Seq.of(predicates).reduce(t -> false, (t1, t2) -> t1.or(t2));
46+
public static <T> Predicate<T> or(Predicate<T>... predicates) {
47+
return Seq.of(predicates).reduce(t -> false, Predicate::or);
4848
}
49-
}
49+
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.jooq.lambda;
22

3+
import org.junit.Assert;
4+
import org.junit.Test;
5+
36
import java.util.concurrent.CompletableFuture;
47
import java.util.concurrent.ForkJoinPool;
58
import java.util.concurrent.atomic.AtomicBoolean;
6-
import org.junit.Assert;
7-
import org.junit.Test;
89

910
/**
1011
*
@@ -28,4 +29,4 @@ public void testRunnable_run() {
2829
}
2930

3031

31-
}
32+
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.fail;
18+
import org.jooq.lambda.fi.util.function.CheckedBiConsumer;
19+
import org.jooq.lambda.fi.util.function.CheckedObjDoubleConsumer;
20+
import org.jooq.lambda.fi.util.function.CheckedObjIntConsumer;
21+
import org.jooq.lambda.fi.util.function.CheckedObjLongConsumer;
22+
import org.junit.Test;
23+
2124
import java.util.LinkedHashMap;
2225
import java.util.Map;
2326
import java.util.function.BiConsumer;
2427
import java.util.function.Consumer;
2528
import java.util.function.ObjDoubleConsumer;
2629
import java.util.function.ObjIntConsumer;
2730
import java.util.function.ObjLongConsumer;
28-
import org.jooq.lambda.fi.util.function.CheckedBiConsumer;
29-
import org.jooq.lambda.fi.util.function.CheckedObjDoubleConsumer;
30-
import org.jooq.lambda.fi.util.function.CheckedObjIntConsumer;
31-
import org.jooq.lambda.fi.util.function.CheckedObjLongConsumer;
32-
import org.junit.Test;
31+
32+
import static org.junit.Assert.*;
3333

3434
/**
3535
* @author Lukas Eder
@@ -239,4 +239,4 @@ private <E extends Exception> void assertException(Class<E> type, Throwable e, S
239239
assertEquals(message, e.getCause().getMessage());
240240
}
241241
}
242-
}
242+
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.fail;
18+
import org.jooq.lambda.fi.util.function.CheckedBiFunction;
19+
import org.jooq.lambda.fi.util.function.CheckedToDoubleBiFunction;
20+
import org.jooq.lambda.fi.util.function.CheckedToIntBiFunction;
21+
import org.jooq.lambda.fi.util.function.CheckedToLongBiFunction;
22+
import org.junit.Test;
23+
2124
import java.util.LinkedHashMap;
2225
import java.util.Map;
2326
import java.util.function.BiFunction;
2427
import java.util.function.Consumer;
2528
import java.util.function.ToDoubleBiFunction;
2629
import java.util.function.ToIntBiFunction;
2730
import java.util.function.ToLongBiFunction;
28-
import org.jooq.lambda.fi.util.function.CheckedBiFunction;
29-
import org.jooq.lambda.fi.util.function.CheckedToDoubleBiFunction;
30-
import org.jooq.lambda.fi.util.function.CheckedToIntBiFunction;
31-
import org.jooq.lambda.fi.util.function.CheckedToLongBiFunction;
32-
import org.junit.Test;
31+
32+
import static org.junit.Assert.*;
3333

3434
/**
3535
* @author Lukas Eder
@@ -236,4 +236,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
236236
assertEquals(message, e.getCause().getMessage());
237237
}
238238
}
239-
}
239+
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package org.jooq.lambda;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertNotNull;
20-
import static org.junit.Assert.fail;
21-
import java.util.function.BiPredicate;
22-
import java.util.function.Consumer;
2318
import org.jooq.lambda.fi.util.function.CheckedBiPredicate;
2419
import org.junit.Test;
2520

21+
import java.util.function.BiPredicate;
22+
import java.util.function.Consumer;
23+
24+
import static org.junit.Assert.*;
25+
2626
/**
2727
* @author Lukas Eder
2828
*/
@@ -87,4 +87,4 @@ private <E extends Exception> void assertException(Class<E> type, Exception e, S
8787
assertEquals(message, e.getCause().getMessage());
8888
}
8989
}
90-
}
90+
}

0 commit comments

Comments
 (0)