Use forEach()
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java
index 3eb9abb..731c9c2 100644
--- a/src/main/java/org/apache/commons/lang3/CharSet.java
+++ b/src/main/java/org/apache/commons/lang3/CharSet.java
@@ -231,14 +231,9 @@ protected void add(final String str) {
* @return {@code true} if the set contains the characters
*/
public boolean contains(final char ch) {
- synchronized(set) {
- for (final CharRange range : set) {
- if (range.contains(ch)) {
- return true;
- }
- }
+ synchronized (set) {
+ return set.stream().anyMatch(range -> range.contains(ch));
}
- return false;
}
// Basics
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index ce4d783..950d5cd 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -127,13 +127,11 @@ public enum Interfaces {
private static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new HashMap<>();
static {
- for (final Map.Entry<Class<?>, Class<?>> entry : primitiveWrapperMap.entrySet()) {
- final Class<?> primitiveClass = entry.getKey();
- final Class<?> wrapperClass = entry.getValue();
+ primitiveWrapperMap.forEach((primitiveClass, wrapperClass) -> {
if (!primitiveClass.equals(wrapperClass)) {
wrapperPrimitiveMap.put(wrapperClass, primitiveClass);
}
- }
+ });
}
/**
@@ -148,21 +146,17 @@ public enum Interfaces {
/** Feed abbreviation maps. */
static {
- final Map<String, String> m = new HashMap<>();
- m.put("int", "I");
- m.put("boolean", "Z");
- m.put("float", "F");
- m.put("long", "J");
- m.put("short", "S");
- m.put("byte", "B");
- m.put("double", "D");
- m.put("char", "C");
- final Map<String, String> r = new HashMap<>();
- for (final Map.Entry<String, String> e : m.entrySet()) {
- r.put(e.getValue(), e.getKey());
- }
- abbreviationMap = Collections.unmodifiableMap(m);
- reverseAbbreviationMap = Collections.unmodifiableMap(r);
+ final Map<String, String> map = new HashMap<>();
+ map.put("int", "I");
+ map.put("boolean", "Z");
+ map.put("float", "F");
+ map.put("long", "J");
+ map.put("short", "S");
+ map.put("byte", "B");
+ map.put("double", "D");
+ map.put("char", "C");
+ abbreviationMap = Collections.unmodifiableMap(map);
+ reverseAbbreviationMap = Collections.unmodifiableMap(map.entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)));
}
/**
@@ -211,13 +205,13 @@ public static List<Class<?>> convertClassNamesToClasses(final List<String> class
return null;
}
final List<Class<?>> classes = new ArrayList<>(classNames.size());
- for (final String className : classNames) {
+ classNames.forEach(className -> {
try {
classes.add(Class.forName(className));
} catch (final Exception ex) {
classes.add(null);
}
- }
+ });
return classes;
}
diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java
index 77320dc..fc39435 100644
--- a/src/main/java/org/apache/commons/lang3/EnumUtils.java
+++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java
@@ -175,10 +175,7 @@ public static <E extends Enum<E>> long generateBitVector(final Class<E> enumClas
asEnum(enumClass);
Objects.requireNonNull(values, "values");
final EnumSet<E> condensed = EnumSet.noneOf(enumClass);
- for (final E constant : values) {
- Validate.notNull(constant, NULL_ELEMENTS_NOT_PERMITTED);
- condensed.add(constant);
- }
+ values.forEach(constant -> condensed.add(Validate.notNull(constant, NULL_ELEMENTS_NOT_PERMITTED)));
final long[] result = new long[(enumClass.getEnumConstants().length - 1) / Long.SIZE + 1];
for (final E value : condensed) {
result[value.ordinal() / Long.SIZE] |= 1L << (value.ordinal() % Long.SIZE);
diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
index b64bea7..369a6c9 100644
--- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java
@@ -365,9 +365,7 @@ public static Collection<Thread> findThreadsByName(final String threadName, fina
final Collection<Thread> result = new ArrayList<>();
final NamePredicate threadNamePredicate = new NamePredicate(threadName);
- for (final ThreadGroup group : threadGroups) {
- result.addAll(findThreads(group, false, threadNamePredicate));
- }
+ threadGroups.forEach(group -> result.addAll(findThreads(group, false, threadNamePredicate)));
return Collections.unmodifiableCollection(result);
}
diff --git a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
index 5668fce..dc2c5e3 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
@@ -247,14 +248,7 @@ public static List<Field> getAllFieldsList(final Class<?> cls) {
*/
public static List<Field> getFieldsListWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls) {
Validate.notNull(annotationCls, "annotationCls");
- final List<Field> allFields = getAllFieldsList(cls);
- final List<Field> annotatedFields = new ArrayList<>();
- for (final Field field : allFields) {
- if (field.getAnnotation(annotationCls) != null) {
- annotatedFields.add(field);
- }
- }
- return annotatedFields;
+ return getAllFieldsList(cls).stream().filter(field -> field.getAnnotation(annotationCls) != null).collect(Collectors.toList());
}
/**
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 5e54ea9..d4eb135 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
@@ -924,10 +924,10 @@ public static List<Method> getMethodsListWithAnnotation(final Class<?> cls,
final List<Class<?>> classes = searchSupers ? getAllSuperclassesAndInterfaces(cls) : new ArrayList<>();
classes.add(0, cls);
final List<Method> annotatedMethods = new ArrayList<>();
- for (final Class<?> acls : classes) {
+ classes.forEach(acls -> {
final Method[] methods = ignoreAccess ? acls.getDeclaredMethods() : acls.getMethods();
Stream.of(methods).filter(method -> method.isAnnotationPresent(annotationCls)).forEachOrdered(annotatedMethods::add);
- }
+ });
return annotatedMethods;
}
diff --git a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
index 6d91653..df8a19c 100644
--- a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
+++ b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java
@@ -523,11 +523,6 @@ private boolean containsElements(final Collection<?> coll) {
if (coll == null || coll.isEmpty()) {
return false;
}
- for (final Object name : coll) {
- if (name != null) {
- return true;
- }
- }
- return false;
+ return coll.stream().anyMatch(Objects::nonNull);
}
}
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 075b57a..3d2a76b 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -1222,9 +1222,7 @@ public <T> StrBuilder appendAll(@SuppressWarnings("unchecked") final T... array)
*/
public StrBuilder appendAll(final Iterable<?> iterable) {
if (iterable != null) {
- for (final Object o : iterable) {
- append(o);
- }
+ iterable.forEach(this::append);
}
return this;
}
@@ -1240,9 +1238,7 @@ public StrBuilder appendAll(final Iterable<?> iterable) {
*/
public StrBuilder appendAll(final Iterator<?> it) {
if (it != null) {
- while (it.hasNext()) {
- append(it.next());
- }
+ it.forEachRemaining(this::append);
}
return this;
}
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 d670454..7411be8 100644
--- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
+++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java
@@ -486,20 +486,18 @@ private static StringBuilder simpleQuote(final StringBuilder sb, final String va
* @return The map of string display names to field values
*/
private static Map<String, Integer> appendDisplayNames(final Calendar calendar, Locale locale, final int field,
- final StringBuilder regex) {
+ final StringBuilder regex) {
final Map<String, Integer> values = new HashMap<>();
- locale = LocaleUtils.toLocale(locale);
- final Map<String, Integer> displayNames = calendar.getDisplayNames(field, Calendar.ALL_STYLES, locale);
+ final Locale actualLocale = LocaleUtils.toLocale(locale);
+ final Map<String, Integer> displayNames = calendar.getDisplayNames(field, Calendar.ALL_STYLES, actualLocale);
final TreeSet<String> sorted = new TreeSet<>(LONGER_FIRST_LOWERCASE);
- for (final Map.Entry<String, Integer> displayName : displayNames.entrySet()) {
- final String key = displayName.getKey().toLowerCase(locale);
- if (sorted.add(key)) {
- values.put(key, displayName.getValue());
+ displayNames.forEach((k, v) -> {
+ final String keyLc = k.toLowerCase(actualLocale);
+ if (sorted.add(keyLc)) {
+ values.put(keyLc, v);
}
- }
- for (final String symbol : sorted) {
- simpleQuote(regex, symbol).append('|');
- }
+ });
+ sorted.forEach(symbol -> simpleQuote(regex, symbol).append('|'));
return values;
}
@@ -953,9 +951,7 @@ private static class TzInfo {
}
// order the regex alternatives with longer strings first, greedy
// match will ensure the longest string will be consumed
- for (final String zoneName : sorted) {
- simpleQuote(sb.append('|'), zoneName);
- }
+ sorted.forEach(zoneName -> simpleQuote(sb.append('|'), zoneName));
sb.append(")");
createPattern(sb);
}
