This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 797d550 [LANG-1556] Use Java 8 lambdas and Map operations. (#541)
797d550 is described below
commit 797d550a92d7df12ebc83e3c5e3fafa61a2a8ce3
Author: XenoAmess <[email protected]>
AuthorDate: Sun Jun 14 06:33:29 2020 +0800
[LANG-1556] Use Java 8 lambdas and Map operations. (#541)
* java8
* refine
* rebase
---
src/main/java/org/apache/commons/lang3/Streams.java | 4 +---
.../java/org/apache/commons/lang3/concurrent/TimedSemaphore.java | 2 +-
.../apache/commons/lang3/exception/DefaultExceptionContext.java | 8 +-------
src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java | 2 +-
src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java | 6 ++++--
src/main/java/org/apache/commons/lang3/time/FastDateParser.java | 2 +-
src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java | 2 +-
src/test/java/org/apache/commons/lang3/FunctionsTest.java | 6 +++---
8 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/Streams.java
b/src/main/java/org/apache/commons/lang3/Streams.java
index 337a0fd..125aefe 100644
--- a/src/main/java/org/apache/commons/lang3/Streams.java
+++ b/src/main/java/org/apache/commons/lang3/Streams.java
@@ -450,9 +450,7 @@ public class Streams {
@Override
public BiConsumer<List<O>, O> accumulator() {
- return (list, o) -> {
- list.add(o);
- };
+ return List::add;
}
@Override
diff --git
a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
index 6bea069..23c3cf3 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/TimedSemaphore.java
@@ -417,7 +417,7 @@ public class TimedSemaphore {
* @return a future object representing the task scheduled
*/
protected ScheduledFuture<?> startTimer() {
- return getExecutorService().scheduleAtFixedRate(() -> endOfPeriod(),
getPeriod(), getPeriod(), getUnit());
+ return getExecutorService().scheduleAtFixedRate(this::endOfPeriod,
getPeriod(), getPeriod(), getUnit());
}
/**
diff --git
a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
index 20a3e17..6386742 100644
---
a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
+++
b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java
@@ -19,7 +19,6 @@ package org.apache.commons.lang3.exception;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -60,12 +59,7 @@ public class DefaultExceptionContext implements
ExceptionContext, Serializable {
*/
@Override
public DefaultExceptionContext setContextValue(final String label, final
Object value) {
- for (final Iterator<Pair<String, Object>> iter =
contextValues.iterator(); iter.hasNext();) {
- final Pair<String, Object> p = iter.next();
- if (StringUtils.equals(label, p.getKey())) {
- iter.remove();
- }
- }
+ contextValues.removeIf(p -> StringUtils.equals(label, p.getKey()));
addContextValue(label, value);
return this;
}
diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
index 1e9b96e..63260e8 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -60,7 +60,7 @@ import org.apache.commons.lang3.Validate;
*/
public class MethodUtils {
- private static final Comparator<Method> METHOD_BY_SIGNATURE = (m1, m2) ->
m1.toString().compareTo(m2.toString());
+ private static final Comparator<Method> METHOD_BY_SIGNATURE =
Comparator.comparing(Method::toString);
/**
* <p>{@link MethodUtils} instances should NOT be constructed in standard
programming.
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
index aea37a7..a20f62b 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
@@ -875,8 +875,10 @@ public class TypeUtils {
// map the arguments to their respective type variables
for (int i = 0; i < typeParams.length; i++) {
final Type typeArg = typeArgs[i];
- typeVarAssigns.put(typeParams[i],
typeVarAssigns.containsKey(typeArg) ? typeVarAssigns
- .get(typeArg) : typeArg);
+ typeVarAssigns.put(
+ typeParams[i],
+ typeVarAssigns.getOrDefault(typeArg, typeArg)
+ );
}
if (toClass.equals(cls)) {
diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
index 233cf3f..fcc8dcf 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
@@ -94,7 +94,7 @@ public class FastDateParser implements DateParser,
Serializable {
// comparator used to sort regex alternatives
// alternatives should be ordered longer first, and shorter last.
('february' before 'feb')
// all entries must be lowercase by locale.
- private static final Comparator<String> LONGER_FIRST_LOWERCASE = (left,
right) -> right.compareTo(left);
+ private static final Comparator<String> LONGER_FIRST_LOWERCASE =
Comparator.reverseOrder();
/**
* <p>Constructs a new FastDateParser.</p>
diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
index db9b5ab..78d61f0 100644
--- a/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java
@@ -1499,7 +1499,7 @@ public class ArrayUtilsTest {
@Test
public void testIsSortedComparator() {
- final Comparator<Integer> c = (o1, o2) -> o2.compareTo(o1);
+ final Comparator<Integer> c = Comparator.reverseOrder();
Integer[] array = null;
assertTrue(ArrayUtils.isSorted(array, c));
diff --git a/src/test/java/org/apache/commons/lang3/FunctionsTest.java
b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
index 51699c2..3a4128b 100644
--- a/src/test/java/org/apache/commons/lang3/FunctionsTest.java
+++ b/src/test/java/org/apache/commons/lang3/FunctionsTest.java
@@ -579,7 +579,7 @@ class FunctionsTest {
FailureOnOddInvocations.invocations = 0;
final FailableCallable<FailureOnOddInvocations, SomeException>
failableCallable = FailureOnOddInvocations::new;
final Callable<FailureOnOddInvocations> callable =
Functions.asCallable(failableCallable);
- final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, () -> callable.call());
+ final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, callable::call);
final Throwable cause = e.getCause();
assertNotNull(cause);
assertTrue(cause instanceof SomeException);
@@ -663,7 +663,7 @@ class FunctionsTest {
void testAsRunnable() {
FailureOnOddInvocations.invocations = 0;
final Runnable runnable =
Functions.asRunnable(FailureOnOddInvocations::new);
- final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, () -> runnable.run());
+ final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, runnable::run);
final Throwable cause = e.getCause();
assertNotNull(cause);
assertTrue(cause instanceof SomeException);
@@ -678,7 +678,7 @@ class FunctionsTest {
FailureOnOddInvocations.invocations = 0;
final FailableSupplier<FailureOnOddInvocations, Throwable>
failableSupplier = FailureOnOddInvocations::new;
final Supplier<FailureOnOddInvocations> supplier =
Functions.asSupplier(failableSupplier);
- final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, () -> supplier.get());
+ final UndeclaredThrowableException e =
assertThrows(UndeclaredThrowableException.class, supplier::get);
final Throwable cause = e.getCause();
assertNotNull(cause);
assertTrue(cause instanceof SomeException);
