You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/07/15 14:31:23 UTC
[commons-lang] branch master updated (d6ec3655b -> 2c16052f9)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
from d6ec3655b Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-lang.git
new 78ce2d79f More precise exceptions
new 9f0f3c838 Use forEach()
new 46b15a2ec Rename method for next release.
new 2c16052f9 Use forEach()
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/commons/lang3/CharSet.java | 9 ++----
.../java/org/apache/commons/lang3/ClassUtils.java | 36 +++++++++-------------
.../java/org/apache/commons/lang3/EnumUtils.java | 5 +--
.../java/org/apache/commons/lang3/ThreadUtils.java | 4 +--
.../apache/commons/lang3/builder/DiffBuilder.java | 10 ++----
.../apache/commons/lang3/builder/DiffResult.java | 7 ++---
.../concurrent/MultiBackgroundInitializer.java | 23 +++++---------
.../commons/lang3/event/EventListenerSupport.java | 17 +++++-----
.../apache/commons/lang3/reflect/FieldUtils.java | 10 ++----
.../apache/commons/lang3/reflect/MethodUtils.java | 4 +--
.../org/apache/commons/lang3/stream/Streams.java | 4 +--
.../commons/lang3/text/ExtendedMessageFormat.java | 7 +----
.../org/apache/commons/lang3/text/StrBuilder.java | 8 ++---
.../apache/commons/lang3/time/FastDateParser.java | 24 ++++++---------
.../lang3/event/EventListenerSupportTest.java | 12 +++-----
.../apache/commons/lang3/stream/StreamsTest.java | 8 ++---
16 files changed, 68 insertions(+), 120 deletions(-)
[commons-lang] 04/04: Use forEach()
Posted by gg...@apache.org.
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
commit 2c16052f94e9e551bb68a8529b7f0c4e336237b0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 15 10:31:16 2022 -0400
Use forEach()
---
.../java/org/apache/commons/lang3/CharSet.java | 9 ++----
.../java/org/apache/commons/lang3/ClassUtils.java | 36 +++++++++-------------
.../java/org/apache/commons/lang3/EnumUtils.java | 5 +--
.../java/org/apache/commons/lang3/ThreadUtils.java | 4 +--
.../apache/commons/lang3/reflect/FieldUtils.java | 10 ++----
.../apache/commons/lang3/reflect/MethodUtils.java | 4 +--
.../commons/lang3/text/ExtendedMessageFormat.java | 7 +----
.../org/apache/commons/lang3/text/StrBuilder.java | 8 ++---
.../apache/commons/lang3/time/FastDateParser.java | 24 ++++++---------
9 files changed, 36 insertions(+), 71 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java b/src/main/java/org/apache/commons/lang3/CharSet.java
index 3eb9abbec..731c9c297 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 @@ public class CharSet implements Serializable {
* @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 ce4d78370..950d5cd7d 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 class ClassUtils {
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 class ClassUtils {
/** 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 class ClassUtils {
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 77320dc13..fc394354c 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 class EnumUtils {
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 b64bea765..369a6c9a4 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 class ThreadUtils {
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 5668fcef2..dc2c5e3fc 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.lang.reflect.Modifier;
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 class FieldUtils {
*/
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 5e54ea914..d4eb13590 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 class MethodUtils {
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 6d916539c..df8a19cec 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 @@ public class ExtendedMessageFormat extends MessageFormat {
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 075b57ace..3d2a76bd8 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 class StrBuilder implements CharSequence, Appendable, Serializable, Build
*/
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 class StrBuilder implements CharSequence, Appendable, Serializable, Build
*/
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 d67045455..7411be852 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 @@ public class FastDateParser implements DateParser, Serializable {
* @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 @@ public class FastDateParser implements DateParser, Serializable {
}
// 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);
}
[commons-lang] 02/04: Use forEach()
Posted by gg...@apache.org.
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
commit 9f0f3c838b00354009f265b7d0fcefd6f1dec454
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 15 09:21:09 2022 -0400
Use forEach()
---
.../apache/commons/lang3/builder/DiffBuilder.java | 10 ++--------
.../apache/commons/lang3/builder/DiffResult.java | 7 +++----
.../concurrent/MultiBackgroundInitializer.java | 23 ++++++++--------------
3 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index 183a0450a..b2dd21269 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -948,19 +948,13 @@ public class DiffBuilder<T> implements Builder<DiffResult<T>> {
* @throws NullPointerException if field name is {@code null}
* @since 3.5
*/
- public DiffBuilder<T> append(final String fieldName,
- final DiffResult<T> diffResult) {
+ public DiffBuilder<T> append(final String fieldName, final DiffResult<T> diffResult) {
validateFieldNameNotNull(fieldName);
Validate.notNull(diffResult, "diffResult");
if (objectsTriviallyEqual) {
return this;
}
-
- for (final Diff<?> diff : diffResult.getDiffs()) {
- append(fieldName + "." + diff.getFieldName(),
- diff.getLeft(), diff.getRight());
- }
-
+ diffResult.getDiffs().forEach(diff -> append(fieldName + "." + diff.getFieldName(), diff.getLeft(), diff.getRight()));
return this;
}
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index df1ec7e5b..9c3f5fcf3 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -197,13 +197,12 @@ public class DiffResult<T> implements Iterable<Diff<?>> {
final ToStringBuilder lhsBuilder = new ToStringBuilder(lhs, style);
final ToStringBuilder rhsBuilder = new ToStringBuilder(rhs, style);
- for (final Diff<?> diff : diffList) {
+ diffList.forEach(diff -> {
lhsBuilder.append(diff.getFieldName(), diff.getLeft());
rhsBuilder.append(diff.getFieldName(), diff.getRight());
- }
+ });
- return String.format("%s %s %s", lhsBuilder.build(), DIFFERS_STRING,
- rhsBuilder.build());
+ return String.format("%s %s %s", lhsBuilder.build(), DIFFERS_STRING, rhsBuilder.build());
}
/**
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
index 9ce572d5a..e08552099 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java
@@ -98,9 +98,9 @@ import org.apache.commons.lang3.Validate;
public class MultiBackgroundInitializer
extends
BackgroundInitializer<MultiBackgroundInitializer.MultiBackgroundInitializerResults> {
+
/** A map with the child initializers. */
- private final Map<String, BackgroundInitializer<?>> childInitializers =
- new HashMap<>();
+ private final Map<String, BackgroundInitializer<?>> childInitializers = new HashMap<>();
/**
* Creates a new instance of {@link MultiBackgroundInitializer}.
@@ -156,13 +156,7 @@ public class MultiBackgroundInitializer
*/
@Override
protected int getTaskCount() {
- int result = 1;
-
- for (final BackgroundInitializer<?> bi : childInitializers.values()) {
- result += bi.getTaskCount();
- }
-
- return result;
+ return 1 + childInitializers.values().stream().mapToInt(BackgroundInitializer::getTaskCount).sum();
}
/**
@@ -180,30 +174,29 @@ public class MultiBackgroundInitializer
final Map<String, BackgroundInitializer<?>> inits;
synchronized (this) {
// create a snapshot to operate on
- inits = new HashMap<>(
- childInitializers);
+ inits = new HashMap<>(childInitializers);
}
// start the child initializers
final ExecutorService exec = getActiveExecutor();
- for (final BackgroundInitializer<?> bi : inits.values()) {
+ inits.values().forEach(bi -> {
if (bi.getExternalExecutor() == null) {
// share the executor service if necessary
bi.setExternalExecutor(exec);
}
bi.start();
- }
+ });
// collect the results
final Map<String, Object> results = new HashMap<>();
final Map<String, ConcurrentException> excepts = new HashMap<>();
- for (final Map.Entry<String, BackgroundInitializer<?>> e : inits.entrySet()) {
+ inits.entrySet().forEach(e -> {
try {
results.put(e.getKey(), e.getValue().get());
} catch (final ConcurrentException cex) {
excepts.put(e.getKey(), cex);
}
- }
+ });
return new MultiBackgroundInitializerResults(inits, results, excepts);
}
[commons-lang] 01/04: More precise exceptions
Posted by gg...@apache.org.
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
commit 78ce2d79f2b1341bfc366b1fde487d960493a08a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 15 09:19:10 2022 -0400
More precise exceptions
---
.../commons/lang3/event/EventListenerSupport.java | 17 +++++++++--------
.../commons/lang3/event/EventListenerSupportTest.java | 12 ++++--------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
index db2ac8fdb..92c371591 100644
--- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
+++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java
@@ -23,6 +23,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
@@ -311,19 +312,19 @@ public class EventListenerSupport<L> implements Serializable {
protected class ProxyInvocationHandler implements InvocationHandler {
/**
- * Propagates the method call to all registered listeners in place of
- * the proxy listener object.
+ * Propagates the method call to all registered listeners in place of the proxy listener object.
*
- * @param unusedProxy the proxy object representing a listener on which the
- * invocation was called; not used
- * @param method the listener method that will be called on all of the
- * listeners.
+ * @param unusedProxy the proxy object representing a listener on which the invocation was called; not used
+ * @param method the listener method that will be called on all of the listeners.
* @param args event arguments to propagate to the listeners.
* @return the result of the method call
- * @throws Throwable if an error occurs
+ * @throws InvocationTargetException if an error occurs
+ * @throws IllegalArgumentException if an error occurs
+ * @throws IllegalAccessException if an error occurs
*/
@Override
- public Object invoke(final Object unusedProxy, final Method method, final Object[] args) throws Throwable {
+ public Object invoke(final Object unusedProxy, final Method method, final Object[] args)
+ throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
for (final L listener : listeners) {
method.invoke(listener, args);
}
diff --git a/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java b/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
index 70658a746..1b730dc1e 100644
--- a/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
+++ b/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
@@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Date;
@@ -174,22 +175,17 @@ public class EventListenerSupportTest extends AbstractLangTest {
@Test
public void testSubclassInvocationHandling() throws PropertyVetoException {
- final
- EventListenerSupport<VetoableChangeListener> eventListenerSupport = new EventListenerSupport<VetoableChangeListener>(
+ final EventListenerSupport<VetoableChangeListener> eventListenerSupport = new EventListenerSupport<VetoableChangeListener>(
VetoableChangeListener.class) {
private static final long serialVersionUID = 1L;
@Override
protected java.lang.reflect.InvocationHandler createInvocationHandler() {
return new ProxyInvocationHandler() {
- /**
- * {@inheritDoc}
- */
@Override
public Object invoke(final Object proxy, final Method method, final Object[] args)
- throws Throwable {
- return "vetoableChange".equals(method.getName())
- && "Hour".equals(((PropertyChangeEvent) args[0]).getPropertyName()) ? null
+ throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+ return "vetoableChange".equals(method.getName()) && "Hour".equals(((PropertyChangeEvent) args[0]).getPropertyName()) ? null
: super.invoke(proxy, method, args);
}
};
[commons-lang] 03/04: Rename method for next release.
Posted by gg...@apache.org.
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
commit 46b15a2ecb05bdc281bc6109bb2db99b566d4a10
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jul 15 09:35:10 2022 -0400
Rename method for next release.
---
src/main/java/org/apache/commons/lang3/stream/Streams.java | 4 ++--
src/test/java/org/apache/commons/lang3/stream/StreamsTest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/stream/Streams.java b/src/main/java/org/apache/commons/lang3/stream/Streams.java
index f20be935e..e44ed7bf0 100644
--- a/src/main/java/org/apache/commons/lang3/stream/Streams.java
+++ b/src/main/java/org/apache/commons/lang3/stream/Streams.java
@@ -561,14 +561,14 @@ public class Streams {
}
/**
- * Streams non-null elements of a collection.
+ * Streams the non-null elements of a collection.
*
* @param <E> the type of elements in the collection.
* @param collection the collection to stream or null.
* @return A non-null stream that filters out null elements.
* @since 3.13.0
*/
- public static <E> Stream<E> nullSafeStream(final Collection<E> collection) {
+ public static <E> Stream<E> nonNull(final Collection<E> collection) {
return filter(collection, Objects::nonNull);
}
diff --git a/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
index ea3145264..625bff4cb 100644
--- a/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
+++ b/src/test/java/org/apache/commons/lang3/stream/StreamsTest.java
@@ -133,9 +133,9 @@ public class StreamsTest extends AbstractLangTest {
@Test
public void testNullSafeStreamNotNull() {
- assertEquals(2, Streams.nullSafeStream(Arrays.asList("A", "B")).collect(Collectors.toList()).size());
- assertEquals(2, Streams.nullSafeStream(Arrays.asList(null, "A", null, "B", null)).collect(Collectors.toList()).size());
- assertEquals(0, Streams.nullSafeStream(Arrays.asList(null, null)).collect(Collectors.toList()).size());
+ assertEquals(2, Streams.nonNull(Arrays.asList("A", "B")).collect(Collectors.toList()).size());
+ assertEquals(2, Streams.nonNull(Arrays.asList(null, "A", null, "B", null)).collect(Collectors.toList()).size());
+ assertEquals(0, Streams.nonNull(Arrays.asList(null, null)).collect(Collectors.toList()).size());
}
@Test
@@ -151,7 +151,7 @@ public class StreamsTest extends AbstractLangTest {
@Test
public void testNullSafeStreamNull() {
final List<String> input = null;
- assertEquals(0, Streams.nullSafeStream(input).collect(Collectors.toList()).size());
+ assertEquals(0, Streams.nonNull(input).collect(Collectors.toList()).size());
}
@Test