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 @@ private static Stream instancesOf(final Class clazz, final Str } /** - * Streams non-null elements of a collection. + * Streams the non-null elements of a collection. * * @param 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 Stream nullSafeStream(final Collection collection) { + public static Stream nonNull(final Collection 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 Stream simpleStreamForEachFailing() { @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 void testInstanceOfStream() { @Test public void testNullSafeStreamNull() { final List input = null; - assertEquals(0, Streams.nullSafeStream(input).collect(Collectors.toList()).size()); + assertEquals(0, Streams.nonNull(input).collect(Collectors.toList()).size()); } @Test