Skip to content

Commit f1c2ba8

Browse files
magicprincmagicprinc
committed
[#2] Fix Javadoc errors, Error Prone errors, synchronize EOLs jOOL and jOOL-java-8
1 parent 3681020 commit f1c2ba8

File tree

123 files changed

+11248
-11172
lines changed

Some content is hidden

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

123 files changed

+11248
-11172
lines changed

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

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

18-
import static java.util.Comparator.comparing;
19-
import static java.util.Comparator.naturalOrder;
20-
import static java.util.stream.Collectors.*;
21-
import static org.jooq.lambda.tuple.Tuple.collectors;
22-
import static org.jooq.lambda.tuple.Tuple.tuple;
18+
import org.jooq.lambda.function.Function2;
19+
import org.jooq.lambda.function.Function3;
20+
import org.jooq.lambda.tuple.Tuple2;
21+
import org.jooq.lambda.tuple.Tuple3;
2322

24-
import java.util.*;
23+
import java.util.ArrayList;
24+
import java.util.Comparator;
25+
import java.util.HashSet;
26+
import java.util.LinkedHashMap;
27+
import java.util.List;
2528
import java.util.Map.Entry;
2629
import java.util.Objects;
2730
import java.util.Optional;
2831
import java.util.TreeSet;
29-
import java.util.function.*;
32+
import java.util.function.BiFunction;
33+
import java.util.function.Function;
34+
import java.util.function.Predicate;
35+
import java.util.function.Supplier;
36+
import java.util.function.ToDoubleFunction;
37+
import java.util.function.ToIntFunction;
38+
import java.util.function.ToLongFunction;
3039
import java.util.stream.Collector;
3140
import java.util.stream.Stream;
3241

33-
import org.jooq.lambda.function.Function2;
34-
import org.jooq.lambda.function.Function3;
35-
import org.jooq.lambda.tuple.Tuple2;
36-
import org.jooq.lambda.tuple.Tuple3;
42+
import static java.util.Comparator.comparing;
43+
import static java.util.Comparator.naturalOrder;
44+
import static java.util.stream.Collectors.collectingAndThen;
45+
import static java.util.stream.Collectors.counting;
46+
import static java.util.stream.Collectors.reducing;
47+
import static java.util.stream.Collectors.summingDouble;
48+
import static java.util.stream.Collectors.toList;
49+
import static org.jooq.lambda.tuple.Tuple.collectors;
50+
import static org.jooq.lambda.tuple.Tuple.tuple;
3751

3852
/**
3953
* A set of additional {@link Collector} implementations.
@@ -732,7 +746,7 @@ else if (compare > 0)
732746

733747
return l1;
734748
},
735-
l -> l[0] == -1 ? Optional.empty() : Optional.of((long) l[0])
749+
l -> l[0] == -1 ? Optional.empty() : Optional.of(l[0])
736750
);
737751
}
738752

@@ -1353,4 +1367,4 @@ private static <T1, T2, R> Optional<R> mapAll(Tuple2<Optional<T1>, Optional<T2>>
13531367
private static <T1, T2, T3, R> Optional<R> mapAll(Tuple3<Optional<T1>, Optional<T2>, Optional<T3>> tuple, Function3<T1, T2, T3, R> function) {
13541368
return tuple.v1.flatMap(v1 -> tuple.v2.flatMap(v2 -> tuple.v3.map(v3 -> function.apply(v1, v2, v3))));
13551369
}
1356-
}
1370+
}

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

Lines changed: 4 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
@@ -70,6 +28,8 @@
7028
*/
7129
public final class Blocking {
7230

31+
@SuppressWarnings("ReturnValueIgnored")
32+
// Error Prone shows error: [ReturnValueIgnored] Return value of 'get' must be used → .get()
7333
public static Runnable runnable(Runnable runnable) {
7434
return () -> supplier(() -> { runnable.run(); return null; }).get();
7535
}
@@ -281,4 +241,4 @@ public boolean isReleasable() {
281241

282242
private Blocking() {
283243
}
284-
}
244+
}

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

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

18+
import org.jooq.lambda.tuple.Tuple;
19+
import org.jooq.lambda.tuple.Tuple10;
20+
import org.jooq.lambda.tuple.Tuple11;
21+
import org.jooq.lambda.tuple.Tuple12;
22+
import org.jooq.lambda.tuple.Tuple13;
23+
import org.jooq.lambda.tuple.Tuple14;
24+
import org.jooq.lambda.tuple.Tuple15;
25+
import org.jooq.lambda.tuple.Tuple16;
26+
import org.jooq.lambda.tuple.Tuple2;
27+
import org.jooq.lambda.tuple.Tuple3;
28+
import org.jooq.lambda.tuple.Tuple4;
29+
import org.jooq.lambda.tuple.Tuple5;
30+
import org.jooq.lambda.tuple.Tuple6;
31+
import org.jooq.lambda.tuple.Tuple7;
32+
import org.jooq.lambda.tuple.Tuple8;
33+
import org.jooq.lambda.tuple.Tuple9;
34+
1835
import java.util.ArrayList;
1936
import java.util.Collection;
2037
import java.util.Comparator;
@@ -33,23 +50,6 @@
3350
import java.util.stream.Collectors;
3451
import java.util.stream.Stream;
3552

36-
import org.jooq.lambda.tuple.Tuple;
37-
import org.jooq.lambda.tuple.Tuple10;
38-
import org.jooq.lambda.tuple.Tuple11;
39-
import org.jooq.lambda.tuple.Tuple12;
40-
import org.jooq.lambda.tuple.Tuple13;
41-
import org.jooq.lambda.tuple.Tuple14;
42-
import org.jooq.lambda.tuple.Tuple15;
43-
import org.jooq.lambda.tuple.Tuple16;
44-
import org.jooq.lambda.tuple.Tuple2;
45-
import org.jooq.lambda.tuple.Tuple3;
46-
import org.jooq.lambda.tuple.Tuple4;
47-
import org.jooq.lambda.tuple.Tuple5;
48-
import org.jooq.lambda.tuple.Tuple6;
49-
import org.jooq.lambda.tuple.Tuple7;
50-
import org.jooq.lambda.tuple.Tuple8;
51-
import org.jooq.lambda.tuple.Tuple9;
52-
5353
/**
5454
* A common super type for types like {@link Seq} or {@link Window} delegating
5555
* common aggregation functions to {@link #collect(Collector)}
@@ -66,7 +66,7 @@ public interface Collectable<T> {
6666
*/
6767
<R, A> R collect(Collector<? super T, A, R> collector);
6868

69-
69+
// [jooq-tools] START [collect]
7070

7171
/**
7272
* Collect this collectable into 2 {@link Collector}s.
@@ -338,7 +338,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
338338
return collect(Tuple.collectors(collector1, collector2, collector3, collector4, collector5, collector6, collector7, collector8, collector9, collector10, collector11, collector12, collector13, collector14, collector15, collector16));
339339
}
340340

341-
341+
// [jooq-tools] END [collect]
342342

343343
/**
344344
* Count the values in this collectable.
@@ -447,7 +447,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
447447
* Get the minimum value.
448448
* <p>
449449
* This makes the unsafe assumption that
450-
* <code>&lt;T extends Comparable&lt;? super T>></code>
450+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
451451
*/
452452
Optional<T> min();
453453

@@ -480,7 +480,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
480480
* Get the minimum values.
481481
* <p>
482482
* This makes the unsafe assumption that
483-
* <code>&lt;T extends Comparable&lt;? super T>></code>
483+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
484484
*/
485485
Seq<T> minAll();
486486

@@ -513,7 +513,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
513513
* Get the maximum value.
514514
* <p>
515515
* This makes the unsafe assumption that
516-
* <code>&lt;T extends Comparable&lt;? super T>></code>
516+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
517517
*/
518518
Optional<T> max();
519519

@@ -546,7 +546,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
546546
* Get the maximum values.
547547
* <p>
548548
* This makes the unsafe assumption that
549-
* <code>&lt;T extends Comparable&lt;? super T>></code>
549+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
550550
*/
551551
Seq<T> maxAll();
552552

@@ -579,7 +579,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
579579
* Get the median value.
580580
* <p>
581581
* This makes the unsafe assumption that
582-
* <code>&lt;T extends Comparable&lt;? super T>></code>
582+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
583583
*/
584584
Optional<T> median();
585585

@@ -602,7 +602,7 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
602602
* Get the discrete percentile value.
603603
* <p>
604604
* This makes the unsafe assumption that
605-
* <code>&lt;T extends Comparable&lt;? super T>></code>
605+
* <code>&lt;T extends Comparable&lt;? super T&gt;&gt;</code>
606606
*/
607607
Optional<T> percentile(double percentile);
608608

@@ -742,4 +742,4 @@ default <R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16,
742742
* Get the common prefix of all strings (or to-stringed values) in this stream.
743743
*/
744744
String commonSuffix();
745-
}
745+
}

‎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+
}

0 commit comments

Comments
 (0)