From dca19a86115962e91dafd62dc7ba863a3b0b1d25 Mon Sep 17 00:00:00 2001 From: Seva Safris Date: Wed, 9 Oct 2024 20:32:22 +0700 Subject: [PATCH] Explicit lambda argument types --- .../java/org/libj/util/AbstractDigraph.java | 8 +-- .../java/org/libj/util/CollectionUtil.java | 56 +++++++++++-------- .../java/org/libj/util/CompositeList.java | 8 +-- src/main/java/org/libj/util/Interval.java | 5 +- src/main/java/org/libj/util/Locales.java | 4 +- src/main/java/org/libj/util/Patterns.java | 2 +- src/main/java/org/libj/util/TransSet.java | 2 +- .../java/org/libj/util/UnmodifiableMap.java | 2 +- .../libj/util/concurrent/Shutdownables.java | 4 +- .../resources/function/UnaryOperator.java | 10 ++-- .../java/org/libj/util/IteratorsTest.java | 6 +- .../libj/util/ObservableCollectionTest.java | 2 +- .../org/libj/util/ObservableListTest.java | 2 +- .../java/org/libj/util/ObservableMapTest.java | 2 +- .../java/org/libj/util/RefDigraphTest.java | 6 +- src/test/java/org/libj/util/ZipFilesTest.java | 3 +- .../org/libj/util/function/FunctionsTest.java | 14 ++--- .../org/libj/util/function/ThrowingTest.java | 18 +++--- .../org/libj/util/retry/RetryPolicyTest.java | 8 ++- src/test/resources/ArrayListTest.java | 2 +- 20 files changed, 87 insertions(+), 77 deletions(-) diff --git a/src/main/java/org/libj/util/AbstractDigraph.java b/src/main/java/org/libj/util/AbstractDigraph.java index 1641d8c6..9d0f9289 100644 --- a/src/main/java/org/libj/util/AbstractDigraph.java +++ b/src/main/java/org/libj/util/AbstractDigraph.java @@ -257,7 +257,7 @@ private TransRandomAccessList,ArrayList> transEdges = new ArrayList<>(initialCapacity); - return adjEdges = new TransRandomAccessList<>(adj, (v, ws) -> { + return adjEdges = new TransRandomAccessList<>(adj, (final Integer v, final LinkedHashSet ws) -> { if (ws == null) return null; @@ -274,7 +274,7 @@ private TransRandomAccessList,ArrayList(ws, this::indexToValue, o -> objectToIndex.get(o))); + transEdges.set(v, edges = new TransSet<>(ws, this::indexToValue, (final V o) -> objectToIndex.get(o))); return edges; }, null); @@ -452,7 +452,7 @@ public Set keySet() { @Override public Collection> values() { final ThreadLocal localVertex = new ThreadLocal<>(); - return new ObservableCollection>(new TransSet<>(indexToObject.keySet(), v -> { + return new ObservableCollection>(new TransSet<>(indexToObject.keySet(), (final Integer v) -> { localVertex.set(v); return get(indexToObject.get(v)); }, null)) { @@ -482,7 +482,7 @@ protected boolean beforeRemove(final Object element) { @Override @SuppressWarnings({"rawtypes", "unchecked"}) public Set>> entrySet() { - return new ObservableSet>>(new TransSet<>(indexToObject.keySet(), i -> new AbstractMap.SimpleEntry(indexToObject.get(i), getEdgesAtIndex(i, true)), null)) { + return new ObservableSet>>(new TransSet<>(indexToObject.keySet(), (final Integer i) -> new AbstractMap.SimpleEntry(indexToObject.get(i), getEdgesAtIndex(i, true)), null)) { @Override protected Object beforeAdd(final Map.Entry> element, final Object preventDefault) { throw new UnsupportedOperationException(); diff --git a/src/main/java/org/libj/util/CollectionUtil.java b/src/main/java/org/libj/util/CollectionUtil.java index 6aac6f8d..4abc0bac 100644 --- a/src/main/java/org/libj/util/CollectionUtil.java +++ b/src/main/java/org/libj/util/CollectionUtil.java @@ -1863,10 +1863,11 @@ public static void sort(final List data, final byte[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final byte[] order, final ByteComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -1920,10 +1921,11 @@ public static void sort(final List data, final char[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final char[] order, final CharComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -1977,10 +1979,11 @@ public static void sort(final List data, final short[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final short[] order, final ShortComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -2034,10 +2037,11 @@ public static void sort(final List data, final int[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final int[] order, final IntComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -2091,10 +2095,11 @@ public static void sort(final List data, final long[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final long[] order, final LongComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -2148,10 +2153,11 @@ public static void sort(final List data, final float[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final float[] order, final FloatComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -2205,10 +2211,11 @@ public static void sort(final List data, final double[] order) { * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final double[] order, final DoubleComparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - final int[] idx = PrimitiveSort.buildIndex(order.length); + final int[] idx = PrimitiveSort.buildIndex(len); PrimitiveSort.sortIndexed(data, order, idx, (o1, o2) -> comparator.compare(order[o1], order[o2])); } @@ -2265,10 +2272,11 @@ public static > void sort(final List data, fi * @throws IllegalArgumentException If {@code data.size() != order.length}. */ public static void sort(final List data, final T[] order, final Comparator comparator) { - if (data.size() != order.length) - throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + order.length + "] must be equal"); + final int len = order.length; + if (data.size() != len) + throw new IllegalArgumentException("data.size() [" + data.size() + "] and order.length [" + len + "] must be equal"); - sortIndexed(data, order, buildIndex(order.length), (o1, o2) -> comparator.compare(order[o1], order[o2])); + sortIndexed(data, order, buildIndex(len), (o1, o2) -> comparator.compare(order[o1], order[o2])); } /** diff --git a/src/main/java/org/libj/util/CompositeList.java b/src/main/java/org/libj/util/CompositeList.java index 126c707e..942fd9c7 100644 --- a/src/main/java/org/libj/util/CompositeList.java +++ b/src/main/java/org/libj/util/CompositeList.java @@ -490,13 +490,13 @@ protected boolean beforeRemove(final int index) { protected void print(final Logger logger) { final StringBuilder builder = new StringBuilder(); builder.append(" I:"); - indexes.stream().forEach(i -> builder.append(' ').append(i)); + indexes.stream().forEach((final int i) -> builder.append(' ').append(i)); builder.append("\n E:"); - forEach(e -> builder.append(' ').append(ObjectUtil.simpleIdentityString(e))); + forEach((final E e) -> builder.append(' ').append(ObjectUtil.simpleIdentityString(e))); builder.append("\n A:"); - componentLists.forEach(e -> builder.append(' ').append(ObjectUtil.simpleIdentityString(e))); + componentLists.forEach((final ComponentList e) -> builder.append(' ').append(ObjectUtil.simpleIdentityString(e))); logger.info(builder.append('\n').toString()); - new IdentityHashSet<>(componentLists).forEach(e -> e.print(logger)); + new IdentityHashSet<>(componentLists).forEach((final ComponentList e) -> e.print(logger)); } /** diff --git a/src/main/java/org/libj/util/Interval.java b/src/main/java/org/libj/util/Interval.java index 9a04576f..f73cc538 100644 --- a/src/main/java/org/libj/util/Interval.java +++ b/src/main/java/org/libj/util/Interval.java @@ -123,14 +123,13 @@ public boolean intersects(final Interval i) { * Returns {@code true} if an {@link Interval} with the provided {@code min} and {@code max} values intersects this * {@link Interval}, otherwise {@code false}. * - * @param min The min value to intersect with. - * @param max The max value to intersect with. + * @param min The min value to intersect with. {@code null} represents a lack of min value. + * @param max The max value to intersect with. {@code null} represents a lack of max value. * @return {@code true} if an {@link Interval} with the provided {@code min} and {@code max} values intersects this * {@link Interval}, otherwise {@code false}. */ public boolean intersects(final T min, final T max) { return intersect(min, this.getMax()) && intersect(this.getMin(), max); - // FIXME:... min == null || } private boolean intersect(final T min, final T max) { diff --git a/src/main/java/org/libj/util/Locales.java b/src/main/java/org/libj/util/Locales.java index 3c5bfa33..4f1736a0 100644 --- a/src/main/java/org/libj/util/Locales.java +++ b/src/main/java/org/libj/util/Locales.java @@ -128,7 +128,7 @@ public static Locale parse(final String str) { // Extract language final int languageIndex = string.indexOf('_'); if (languageIndex < 0) { // No further "_" so is "{language}" only - string.chars().forEach(c -> { + string.chars().forEach((final int c) -> { if (!Character.isLetterOrDigit(c)) throw new IllegalArgumentException(string); }); @@ -137,7 +137,7 @@ public static Locale parse(final String str) { } final String language = string.substring(0, languageIndex); - language.chars().forEach(c -> { + language.chars().forEach((final int c) -> { if (!Character.isLetterOrDigit(c)) throw new IllegalArgumentException(string); }); diff --git a/src/main/java/org/libj/util/Patterns.java b/src/main/java/org/libj/util/Patterns.java index 0817c28c..6b6fcfc8 100644 --- a/src/main/java/org/libj/util/Patterns.java +++ b/src/main/java/org/libj/util/Patterns.java @@ -216,7 +216,7 @@ public static String unescape(final String regex) { return regex; char ch = regex.charAt(0); - if (ch == '^' && regex.length() == 1) + if (ch == '^' && len == 1) return ""; final StringBuilder builder = new StringBuilder(); diff --git a/src/main/java/org/libj/util/TransSet.java b/src/main/java/org/libj/util/TransSet.java index 70605e9a..51fca011 100644 --- a/src/main/java/org/libj/util/TransSet.java +++ b/src/main/java/org/libj/util/TransSet.java @@ -215,6 +215,6 @@ public boolean removeIf(final Predicate filter) { if (sourceToTarget == null) throw new UnsupportedOperationException(); - return target.removeIf((Predicate)t -> filter.test(sourceToTarget.apply(t))); + return target.removeIf((Predicate)(final S t) -> filter.test(sourceToTarget.apply(t))); } } \ No newline at end of file diff --git a/src/main/java/org/libj/util/UnmodifiableMap.java b/src/main/java/org/libj/util/UnmodifiableMap.java index 6ca90dcc..d0609ba7 100644 --- a/src/main/java/org/libj/util/UnmodifiableMap.java +++ b/src/main/java/org/libj/util/UnmodifiableMap.java @@ -232,7 +232,7 @@ protected UnmodifiableEntrySet(final Set Consumer> entryConsumer(final Consumer> action) { Objects.requireNonNull(action); - return e -> action.accept(new UnmodifiableEntry<>(e)); + return (final Map.Entry e) -> action.accept(new UnmodifiableEntry<>(e)); } @Override diff --git a/src/main/java/org/libj/util/concurrent/Shutdownables.java b/src/main/java/org/libj/util/concurrent/Shutdownables.java index 876f0b73..412c2dbc 100644 --- a/src/main/java/org/libj/util/concurrent/Shutdownables.java +++ b/src/main/java/org/libj/util/concurrent/Shutdownables.java @@ -63,7 +63,7 @@ public static boolean awaitTermination(final long timeout, final TimeUnit unit, return shutdownable.awaitTermination(timeout, unit); } catch (final InterruptedException e) { - exception.getAndUpdate(ie -> { + exception.getAndUpdate((final InterruptedException ie) -> { if (ie == null) return e; @@ -79,7 +79,7 @@ public static boolean awaitTermination(final long timeout, final TimeUnit unit, final List> futures = shutdownExecutor.invokeAll(callables, timeout, unit); shutdownExecutor.shutdown(); final AtomicReference ee = new AtomicReference<>(); - final boolean success = futures.stream().allMatch(f -> { + final boolean success = futures.stream().allMatch((final Future f) -> { try { return f.get(); } diff --git a/src/main/resources/function/UnaryOperator.java b/src/main/resources/function/UnaryOperator.java index 2c6c2498..3227cdb3 100644 --- a/src/main/resources/function/UnaryOperator.java +++ b/src/main/resources/function/UnaryOperator.java @@ -47,9 +47,9 @@ public interface UnaryOperator { * @throws NullPointerException If {@code before} is null. * @see #andThen(UnaryOperator) */ - default UnaryOperator compose(UnaryOperator before) { + default UnaryOperator compose(final UnaryOperator before) { Objects.requireNonNull(before); - return ( v) -> applyAs(before.applyAs(v)); + return (final v) -> applyAs(before.applyAs(v)); } /** @@ -64,9 +64,9 @@ default UnaryOperator compose(UnaryOperator before) { * @throws NullPointerException If {@code after} is null. * @see #compose(UnaryOperator) */ - default UnaryOperator andThen(UnaryOperator after) { + default UnaryOperator andThen(final UnaryOperator after) { Objects.requireNonNull(after); - return ( t) -> after.applyAs(applyAs(t)); + return (final t) -> after.applyAs(applyAs(t)); } /** @@ -75,6 +75,6 @@ default UnaryOperator andThen(UnaryOperator after) { * @return A unary operator that always returns its input argument. */ static UnaryOperator identity() { - return t -> t; + return (final t) -> t; } } \ No newline at end of file diff --git a/src/test/java/org/libj/util/IteratorsTest.java b/src/test/java/org/libj/util/IteratorsTest.java index 34181d96..b459f741 100644 --- a/src/test/java/org/libj/util/IteratorsTest.java +++ b/src/test/java/org/libj/util/IteratorsTest.java @@ -72,15 +72,15 @@ public void testIterableList() { public void testFilter() { final List list = Arrays.asList(0, 0d, 1, 1d, 2, BigInteger.ZERO, 3.4f, BigDecimal.ONE, 3, 2d, BigInteger.ONE, 10L, 4f, (short)8, (byte)62, 4, BigInteger.valueOf(2L)); - final Iterator integerIterator = Iterators.filter(list.iterator(), m -> m instanceof Integer); + final Iterator integerIterator = Iterators.filter(list.iterator(), (final Number m) -> m instanceof Integer); for (int i = 0; integerIterator.hasNext(); ++i) // [I] assertEquals(i, integerIterator.next()); - final Iterator bigIntegerIterator = Iterators.filter(list.iterator(), m -> m instanceof BigInteger); + final Iterator bigIntegerIterator = Iterators.filter(list.iterator(), (final Number m) -> m instanceof BigInteger); for (int i = 0; bigIntegerIterator.hasNext(); ++i) // [I] assertEquals(BigInteger.valueOf(i), bigIntegerIterator.next()); - final Iterator doubleIterator = Iterators.filter(list.iterator(), m -> m instanceof Double); + final Iterator doubleIterator = Iterators.filter(list.iterator(), (final Number m) -> m instanceof Double); for (int i = 0; doubleIterator.hasNext(); ++i) // [I] assertEquals((double)i, doubleIterator.next()); } diff --git a/src/test/java/org/libj/util/ObservableCollectionTest.java b/src/test/java/org/libj/util/ObservableCollectionTest.java index a5f1ec78..d214f6f0 100644 --- a/src/test/java/org/libj/util/ObservableCollectionTest.java +++ b/src/test/java/org/libj/util/ObservableCollectionTest.java @@ -115,7 +115,7 @@ protected void afterRemove(final Object element, final RuntimeException e) { // removeIf() for (int i = 9; i < 100; i += 23) { // [N] final int index = i; - collection.removeIf(s -> (expectedString = String.valueOf(index)).equals(s)); + collection.removeIf((final String s) -> (expectedString = String.valueOf(index)).equals(s)); assertRemoved(); } diff --git a/src/test/java/org/libj/util/ObservableListTest.java b/src/test/java/org/libj/util/ObservableListTest.java index 533bf391..1ce11d44 100644 --- a/src/test/java/org/libj/util/ObservableListTest.java +++ b/src/test/java/org/libj/util/ObservableListTest.java @@ -259,7 +259,7 @@ else if (String.valueOf(12).equals(element) || String.valueOf(24).equals(element // removeIf() for (int i = 9; i < 100; i += 23) { // [N] final int index = i; - list.removeIf(s -> (expectedString = String.valueOf(index)).equals(s)); + list.removeIf((final String s) -> (expectedString = String.valueOf(index)).equals(s)); assertRemoved(); } diff --git a/src/test/java/org/libj/util/ObservableMapTest.java b/src/test/java/org/libj/util/ObservableMapTest.java index 68098afd..9e0c7187 100644 --- a/src/test/java/org/libj/util/ObservableMapTest.java +++ b/src/test/java/org/libj/util/ObservableMapTest.java @@ -125,7 +125,7 @@ protected void afterRemove(final Object key, final String value, final RuntimeEx for (int i = 9; i < 100; i += 23) { // [N] final int index = i; expectedValue = String.valueOf(index); - keys.removeIf(s -> (expectedKey = index).equals(s)); + keys.removeIf((final Integer s) -> (expectedKey = index).equals(s)); assertRemoved(); } diff --git a/src/test/java/org/libj/util/RefDigraphTest.java b/src/test/java/org/libj/util/RefDigraphTest.java index 78dbabe2..1ecfc3f5 100644 --- a/src/test/java/org/libj/util/RefDigraphTest.java +++ b/src/test/java/org/libj/util/RefDigraphTest.java @@ -38,7 +38,7 @@ public String toString() { @Test public void testUnspecifiedReference() { - final RefDigraph digraph = new RefDigraph<>(obj -> obj.id); + final RefDigraph digraph = new RefDigraph<>((final Obj obj) -> obj.id); digraph.add(new Obj("a", "b"), "b"); digraph.add(new Obj("b", "c"), "c"); digraph.add(new Obj("c", "a"), "d"); @@ -54,7 +54,7 @@ public void testUnspecifiedReference() { @Test public void testCycle() { - final RefDigraph digraph = new RefDigraph<>(obj -> obj.id); + final RefDigraph digraph = new RefDigraph<>((final Obj obj) -> obj.id); digraph.add(new Obj("a", "b"), "b"); digraph.add(new Obj("b", "c"), "c"); digraph.add(new Obj("c", "a"), "a"); @@ -69,7 +69,7 @@ public void testCycle() { @Test public void testTopological() { - final RefDigraph digraph = new RefDigraph<>(obj -> obj.id); + final RefDigraph digraph = new RefDigraph<>((final Obj obj) -> obj.id); digraph.add(new Obj("a", "b"), "b"); digraph.add(new Obj("b", "c"), "c"); digraph.add(new Obj("c", null), null); diff --git a/src/test/java/org/libj/util/ZipFilesTest.java b/src/test/java/org/libj/util/ZipFilesTest.java index 6c4d7581..12a890a4 100644 --- a/src/test/java/org/libj/util/ZipFilesTest.java +++ b/src/test/java/org/libj/util/ZipFilesTest.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.util.NoSuchElementException; +import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import org.junit.Test; @@ -53,7 +54,7 @@ public void testExtractAll() throws IOException { public void testExtractSome() throws IOException { final File file = findJar("junit"); final File destDir = new File(extractDir, "meta"); - ZipFiles.extract(new ZipFile(file), destDir, t -> t.getName().startsWith("META-INF/")); + ZipFiles.extract(new ZipFile(file), destDir, (final ZipEntry e) -> e.getName().startsWith("META-INF/")); assertEquals(1, destDir.list().length); assertTrue(new File(destDir, "META-INF/MANIFEST.MF").exists()); diff --git a/src/test/java/org/libj/util/function/FunctionsTest.java b/src/test/java/org/libj/util/function/FunctionsTest.java index 63728b35..7ac84bc5 100644 --- a/src/test/java/org/libj/util/function/FunctionsTest.java +++ b/src/test/java/org/libj/util/function/FunctionsTest.java @@ -101,18 +101,18 @@ public void testOr() throws Exception { @Test public void testAndOrThen() { - final Function p0 = i -> new StringBuilder(String.valueOf(Math.abs(i))).append('9').reverse(); - final Function p1 = i -> new StringBuilder("9").append(String.valueOf(Math.abs(i))).reverse().toString(); - final Function> p2 = i -> new StringBuilder(String.valueOf(Math.abs(i))).append('9').reverse().toString(); + final Function p0 = (final Integer i) -> new StringBuilder(String.valueOf(Math.abs(i))).append('9').reverse(); + final Function p1 = (final Integer i) -> new StringBuilder("9").append(String.valueOf(Math.abs(i))).reverse().toString(); + final Function> p2 = (final Integer i) -> new StringBuilder(String.valueOf(Math.abs(i))).append('9').reverse().toString(); - final Function p3 = s -> Long.parseLong(s.toString()); - final Function p4 = s -> "%%%"; + final Function p3 = (final Object s) -> Long.parseLong(s.toString()); + final Function p4 = (final Object s) -> "%%%"; - final Function finish = s -> new StringBuilder(s.toString()).reverse().toString(); + final Function finish = (final Serializable s) -> new StringBuilder(s.toString()).reverse().toString(); for (int i = 0; i < numTests; ++i) { // [N] final int input = random.nextInt(); - final String result = and(p0, p1, p2).andThen(s -> s.map(or(p3, p4).andThen(finish))).apply(input).findAny().get(); + final String result = and(p0, p1, p2).andThen((final Stream s) -> s.map(or(p3, p4).andThen(finish))).apply(input).findAny().get(); assertEquals(Math.abs(input) + "9", result); } } diff --git a/src/test/java/org/libj/util/function/ThrowingTest.java b/src/test/java/org/libj/util/function/ThrowingTest.java index 3129a62e..5fbc9527 100644 --- a/src/test/java/org/libj/util/function/ThrowingTest.java +++ b/src/test/java/org/libj/util/function/ThrowingTest.java @@ -71,7 +71,7 @@ public void testConsumer() { try { Arrays .asList(2, 1, 0) - .forEach(rethrow(i -> { + .forEach(rethrow((final Integer i) -> { if (i == 0) throw new IOException("i=" + i); })); @@ -87,7 +87,7 @@ public void testConsumer() { @Test public void testBiConsumer() { try { - final BiConsumer consumer = rethrow((Integer i, Integer j) -> { + final BiConsumer consumer = rethrow((final Integer i, final Integer j) -> { if (i == 0) throw new IOException("i=" + i); }); @@ -106,7 +106,7 @@ public void testBiConsumer() { @Test public void testObjIntConsumer() { try { - final ObjIntConsumer consumer = rethrow((String s, int i) -> { + final ObjIntConsumer consumer = rethrow((final String s, final int i) -> { if (i == 0) throw new IOException("i=" + i); }); @@ -125,7 +125,7 @@ public void testObjIntConsumer() { @Test public void testTriConsumer() { try { - final TriConsumer consumer = rethrow((Integer i, Integer j, Integer k) -> { + final TriConsumer consumer = rethrow((final Integer i, final Integer j, final Integer k) -> { if (i == 0) throw new IOException("i=" + i); }); @@ -147,7 +147,7 @@ public void testPredicate() { Arrays .asList(2, 1, 0) .stream() - .filter(Throwing.rethrow(i -> { + .filter(Throwing.rethrow((final Integer i) -> { if (i == 0) throw new IOException("i=" + i); @@ -166,7 +166,7 @@ public void testPredicate() { @Test public void testBiPredicate() { try { - final BiPredicate predicate = Throwing.rethrow((Integer i, Integer j) -> { + final BiPredicate predicate = Throwing.rethrow((final Integer i, final Integer j) -> { if (i == 0) throw new IOException("i=" + i); @@ -190,13 +190,13 @@ public void testFunction() { Arrays .asList(2, 1, 0) .stream() - .map(rethrow((Integer i) -> { + .map(rethrow((final Integer i) -> { if (i == 0) throw new IOException("i=" + i); return String.valueOf(i); })) - .forEach(f -> {}); + .forEach((final String s) -> {}); fail("Expected IOException"); } @@ -209,7 +209,7 @@ public void testFunction() { @Test public void testBiFunction() { try { - final BiFunction function = rethrow((Integer i, Integer j) -> { + final BiFunction function = rethrow((final Integer i, final Integer j) -> { if (i == 0) throw new IOException("i=" + i); diff --git a/src/test/java/org/libj/util/retry/RetryPolicyTest.java b/src/test/java/org/libj/util/retry/RetryPolicyTest.java index c932f4ae..cae6944f 100644 --- a/src/test/java/org/libj/util/retry/RetryPolicyTest.java +++ b/src/test/java/org/libj/util/retry/RetryPolicyTest.java @@ -18,6 +18,8 @@ import static org.junit.Assert.*; +import java.util.List; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +30,7 @@ public class RetryPolicyTest { @Test public void testNonNullOnRetryFailure() throws RetryFailureRuntimeException, Exception { try { - new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> null, 100, 100).run((p, a) -> null); + new RetryPolicy<>((final Exception e, final int a, final long d) -> true, null, (final Exception e, final List se, final int a, final long d) -> null, 100, 100).run(() -> null); fail("Expected NullPointerException"); } catch (final NullPointerException e) { @@ -50,7 +52,7 @@ public void testLinearBackoff() { for (int i = 0; i < attempts - 1; ++i) // [N] timings[i + 1] = timings[i] + delays[i]; - assertEquals("PASS", new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> new RuntimeException(), attempts, delayMs).run((p, a) -> { + assertEquals("PASS", new RetryPolicy<>((final Exception e, final int a, final long d) -> true, null, (final Exception e, final List se, final int a, final long d) -> new RuntimeException(), attempts, delayMs).run((final RetryPolicy p, final int a) -> { if (index[0] < attempts) { final long delayMs1 = p.getDelayMs(a); assertEquals(delays[index[0]++], delayMs1); @@ -83,7 +85,7 @@ public void testExponentialBackoff() throws RetryFailureException { for (int i = 0; i < attempts - 1; ++i) // [N] timings[i + 1] = timings[i] + delays[i]; - assertEquals("PASS", new RetryPolicy<>((e, a, d) -> true, null, (e, se, a, d) -> new RetryFailureException(a, d), attempts, startDelay, 0, false, factor, maxDelay).run((p, a) -> { + assertEquals("PASS", new RetryPolicy<>((final Exception e, final int a, final long d) -> true, null, (final Exception e, final List se, final int a, final long d) -> new RetryFailureException(a, d), attempts, startDelay, 0, false, factor, maxDelay).run((final RetryPolicy p, final int a) -> { if (index[0] < attempts) { final long delayMs = p.getDelayMs(a); assertEquals(delays[index[0]++], delayMs); diff --git a/src/test/resources/ArrayListTest.java b/src/test/resources/ArrayListTest.java index d9d871fd..303e3079 100644 --- a/src/test/resources/ArrayListTest.java +++ b/src/test/resources/ArrayListTest.java @@ -68,7 +68,7 @@ public void testModCound() { assertEquals(list.modCount, slx3.modCount); }; - final ConsumerList> consumer = list1 -> { + final ConsumerList> consumer = (final ArrayList list1) -> { list1.add(()10); test.run();