From 36c4cc67a17b51256096f0a33427071b3cc1194e Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 29 Mar 2020 17:30:29 -0400 Subject: [PATCH] Lambdas. --- .../org/apache/commons/lang3/ArrayUtils.java | 2 +- .../org/apache/commons/lang3/Streams.java | 4 ++-- .../apache/commons/lang3/FunctionsTest.java | 14 +++++------- .../org/apache/commons/lang3/StreamsTest.java | 22 +++++++++---------- .../commons/lang3/math/IEEE754rUtilsTest.java | 6 ++--- .../commons/lang3/math/NumberUtilsTest.java | 22 +++++++++---------- 6 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java index 7f369fa3c..010d8c111 100644 --- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java @@ -3663,7 +3663,7 @@ public static boolean isSorted(final short[] array) { * @since 3.4 */ public static > boolean isSorted(final T[] array) { - return isSorted(array, (o1, o2) -> o1.compareTo(o2)); + return isSorted(array, Comparable::compareTo); } /** diff --git a/src/main/java/org/apache/commons/lang3/Streams.java b/src/main/java/org/apache/commons/lang3/Streams.java index b5e7d4312..337a0fd79 100644 --- a/src/main/java/org/apache/commons/lang3/Streams.java +++ b/src/main/java/org/apache/commons/lang3/Streams.java @@ -445,7 +445,7 @@ public ArrayCollector(final Class elementType) { @Override public Supplier> supplier() { - return () -> new ArrayList<>(); + return ArrayList::new; } @Override @@ -465,7 +465,7 @@ public BinaryOperator> combiner() { @Override public Function, O[]> finisher() { - return (list) -> { + return list -> { @SuppressWarnings("unchecked") final O[] array = (O[]) Array.newInstance(elementType, list.size()); return list.toArray(array); diff --git a/src/test/java/org/apache/commons/lang3/FunctionsTest.java b/src/test/java/org/apache/commons/lang3/FunctionsTest.java index bec8a44b3..50c3e1847 100644 --- a/src/test/java/org/apache/commons/lang3/FunctionsTest.java +++ b/src/test/java/org/apache/commons/lang3/FunctionsTest.java @@ -152,7 +152,7 @@ void testRunnable() { @Test void testAsRunnable() { FailureOnOddInvocations.invocation = 0; - final Runnable runnable = Functions.asRunnable(() -> new FailureOnOddInvocations()); + final Runnable runnable = Functions.asRunnable(FailureOnOddInvocations::new); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> runnable.run()); final Throwable cause = e.getCause(); assertNotNull(cause); @@ -178,9 +178,7 @@ void testCallable() { @Test void testAsCallable() { FailureOnOddInvocations.invocation = 0; - final FailableCallable failableCallable = () -> { - return new FailureOnOddInvocations(); - }; + final FailableCallable failableCallable = () -> new FailureOnOddInvocations(); final Callable callable = Functions.asCallable(failableCallable); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> callable.call()); final Throwable cause = e.getCause(); @@ -223,7 +221,7 @@ void testAcceptConsumer() { void testAsConsumer() { final IllegalStateException ise = new IllegalStateException(); final Testable testable = new Testable(ise); - final Consumer consumer = Functions.asConsumer((t) -> t.test()); + final Consumer consumer = Functions.asConsumer(t -> t.test()); Throwable e = assertThrows(IllegalStateException.class, () -> consumer.accept(testable)); assertSame(ise, e); @@ -319,7 +317,7 @@ public void testApplyFunction() { public void testAsFunction() { final IllegalStateException ise = new IllegalStateException(); final Testable testable = new Testable(ise); - final FailableFunction failableFunction = (th) -> { + final FailableFunction failableFunction = th -> { testable.setThrowable(th); return Integer.valueOf(testable.testInt()); }; @@ -407,7 +405,7 @@ public void testGetFromSupplier() { @DisplayName("Test that asPredicate(FailablePredicate) is converted to -> Predicate ") public void testAsPredicate() { FailureOnOddInvocations.invocation = 0; - final Functions.FailablePredicate failablePredicate = (t) -> FailureOnOddInvocations.failingBool(); + final Functions.FailablePredicate failablePredicate = t -> FailureOnOddInvocations.failingBool(); final Predicate predicate = Functions.asPredicate(failablePredicate); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> predicate.test(null)); final Throwable cause = e.getCause(); @@ -436,7 +434,7 @@ public void testAsBiPredicate() { @Test public void testAsSupplier() { FailureOnOddInvocations.invocation = 0; - final FailableSupplier failableSupplier = () -> new FailureOnOddInvocations(); + final FailableSupplier failableSupplier = FailureOnOddInvocations::new; final Supplier supplier = Functions.asSupplier(failableSupplier); final UndeclaredThrowableException e = assertThrows(UndeclaredThrowableException.class, () -> supplier.get()); final Throwable cause = e.getCause(); diff --git a/src/test/java/org/apache/commons/lang3/StreamsTest.java b/src/test/java/org/apache/commons/lang3/StreamsTest.java index 48f7818a8..0f618b634 100644 --- a/src/test/java/org/apache/commons/lang3/StreamsTest.java +++ b/src/test/java/org/apache/commons/lang3/StreamsTest.java @@ -36,7 +36,7 @@ class StreamsTest { @Test void testSimpleStreamMap() { final List input = Arrays.asList("1", "2", "3", "4", "5", "6"); - final List output = Functions.stream(input).map((s) -> Integer.valueOf(s)).collect(Collectors.toList()); + final List output = Functions.stream(input).map(s -> Integer.valueOf(s)).collect(Collectors.toList()); assertEquals(6, output.size()); for (int i = 0; i < 6; i++) { assertEquals(i+1, output.get(i).intValue()); @@ -47,7 +47,7 @@ void testSimpleStreamMap() { void testSimpleStreamMapFailing() { final List input = Arrays.asList("1", "2", "3", "4 ", "5", "6"); try { - Functions.stream(input).map((s) -> Integer.valueOf(s)).collect(Collectors.toList()); + Functions.stream(input).map(s -> Integer.valueOf(s)).collect(Collectors.toList()); fail("Expected Exception"); } catch (final NumberFormatException nfe) { assertEquals("For input string: \"4 \"", nfe.getMessage()); @@ -58,7 +58,7 @@ void testSimpleStreamMapFailing() { void testSimpleStreamForEach() { final List input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List output = new ArrayList<>(); - Functions.stream(input).forEach((s) -> output.add(Integer.valueOf(s))); + Functions.stream(input).forEach(s -> output.add(Integer.valueOf(s))); assertEquals(6, output.size()); for (int i = 0; i < 6; i++) { assertEquals(i+1, output.get(i).intValue()); @@ -76,7 +76,7 @@ void testToArray() { } protected FailableConsumer asIntConsumer(final T pThrowable) { - return (s) -> { + return s -> { final Integer i = Integer.valueOf(s); if (i.intValue() == 4) { throw pThrowable; @@ -117,8 +117,8 @@ void testSimpleStreamForEachFailing() { void testSimpleStreamFilter() { final List input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List output = Functions.stream(input) - .map((s) -> Integer.valueOf(s)) - .filter((i) -> { + .map(s -> Integer.valueOf(s)) + .filter(i -> { return i.intValue() %2 == 0; }) .collect(Collectors.toList()); @@ -133,7 +133,7 @@ private void assertEvenNumbers(final List output) { } protected FailablePredicate asIntPredicate(final T pThrowable) { - return (i) -> { + return i -> { if (i.intValue() == 5) { if (pThrowable != null) { throw pThrowable; @@ -147,7 +147,7 @@ protected FailablePredicate asIntPredicate(fin void testSimpleStreamFilterFailing() { final List input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List output = Functions.stream(input) - .map((s) -> Integer.valueOf(s)) + .map(s -> Integer.valueOf(s)) .filter(asIntPredicate(null)) .collect(Collectors.toList()); assertEvenNumbers(output); @@ -156,7 +156,7 @@ void testSimpleStreamFilterFailing() { final IllegalArgumentException iae = new IllegalArgumentException("Invalid argument: " + 5); try { Functions.stream(input) - .map((s) -> Integer.valueOf(s)) + .map(s -> Integer.valueOf(s)) .filter(asIntPredicate(iae)) .collect(Collectors.toList()); fail("Expected Exception"); @@ -168,7 +168,7 @@ void testSimpleStreamFilterFailing() { final OutOfMemoryError oome = new OutOfMemoryError(); try { Functions.stream(input) - .map((s) -> Integer.valueOf(s)) + .map(s -> Integer.valueOf(s)) .filter(asIntPredicate(oome)) .collect(Collectors.toList()); fail("Expected Exception"); @@ -180,7 +180,7 @@ void testSimpleStreamFilterFailing() { final SAXException se = new SAXException(); try { Functions.stream(input) - .map((s) -> Integer.valueOf(s)) + .map(s -> Integer.valueOf(s)) .filter(asIntPredicate(se)) .collect(Collectors.toList()); fail("Expected Exception"); diff --git a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java index 39fe5cd6f..8312f03bc 100644 --- a/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/math/IEEE754rUtilsTest.java @@ -62,7 +62,7 @@ public void testEnforceExceptions() { assertThrows( IllegalArgumentException.class, - () -> IEEE754rUtils.min(), + IEEE754rUtils::min, "IllegalArgumentException expected for empty input"); assertThrows( @@ -82,7 +82,7 @@ public void testEnforceExceptions() { assertThrows( IllegalArgumentException.class, - () -> IEEE754rUtils.min(), + IEEE754rUtils::min, "IllegalArgumentException expected for empty input"); assertThrows( @@ -92,7 +92,7 @@ public void testEnforceExceptions() { assertThrows( IllegalArgumentException.class, - () -> IEEE754rUtils.max(), + IEEE754rUtils::max, "IllegalArgumentException expected for empty input"); } diff --git a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java index 3e32c9051..922120be4 100644 --- a/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/math/NumberUtilsTest.java @@ -691,7 +691,7 @@ public void testMinLong_nullArray() { @Test public void testMinLong_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.min()); + assertThrows(IllegalArgumentException.class, NumberUtils::min); } @Test @@ -710,7 +710,7 @@ public void testMinInt_nullArray() { @Test public void testMinInt_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.min()); + assertThrows(IllegalArgumentException.class, NumberUtils::min); } @Test @@ -729,7 +729,7 @@ public void testMinShort_nullArray() { @Test public void testMinShort_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.min()); + assertThrows(IllegalArgumentException.class, NumberUtils::min); } @Test @@ -767,7 +767,7 @@ public void testMinDouble_nullArray() { @Test public void testMinDouble_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.min()); + assertThrows(IllegalArgumentException.class, NumberUtils::min); } @Test @@ -786,7 +786,7 @@ public void testMinFloat_nullArray() { @Test public void testMinFloat_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.min()); + assertThrows(IllegalArgumentException.class, NumberUtils::min); } @Test @@ -805,7 +805,7 @@ public void testMaxLong_nullArray() { @Test public void testMaxLong_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.max()); + assertThrows(IllegalArgumentException.class, NumberUtils::max); } @Test @@ -824,7 +824,7 @@ public void testMaxInt_nullArray() { @Test public void testMaxInt_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.max()); + assertThrows(IllegalArgumentException.class, NumberUtils::max); } @Test @@ -843,7 +843,7 @@ public void testMaxShort_nullArray() { @Test public void testMaxShort_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.max()); + assertThrows(IllegalArgumentException.class, NumberUtils::max); } @Test @@ -881,7 +881,7 @@ public void testMaxDouble_nullArray() { @Test public void testMaxDouble_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.max()); + assertThrows(IllegalArgumentException.class, NumberUtils::max); } @Test @@ -892,7 +892,7 @@ public void testMaxDouble() { assertThrows( IllegalArgumentException.class, - () -> NumberUtils.max(), + NumberUtils::max, "No exception was thrown for empty input."); assertEquals(5.1f, NumberUtils.max(5.1f), "max(double[]) failed for array length 1"); @@ -909,7 +909,7 @@ public void testMaxFloat_nullArray() { @Test public void testMaxFloat_emptyArray() { - assertThrows(IllegalArgumentException.class, () -> NumberUtils.max()); + assertThrows(IllegalArgumentException.class, NumberUtils::max); } @Test