diff --git a/src/main/java/org/apache/commons/lang3/Streams.java b/src/main/java/org/apache/commons/lang3/Streams.java index a0f32afec..c097d76f3 100644 --- a/src/main/java/org/apache/commons/lang3/Streams.java +++ b/src/main/java/org/apache/commons/lang3/Streams.java @@ -16,6 +16,7 @@ */ package org.apache.commons.lang3; +import java.util.Collection; import java.util.function.BiConsumer; import java.util.function.BinaryOperator; import java.util.function.Consumer; @@ -48,7 +49,7 @@ import org.apache.commons.lang3.Functions.FailablePredicate; * * Using a {@link FailableStream}, this can be rewritten as follows: *
- *     ObjectStreams.failable(stream).forEach((m) -> m.invoke(o, args));
+ *     Streams.failable(stream).forEach((m) -> m.invoke(o, args));
  * 
* Obviously, the second version is much more concise and the spirit of * Lambda expressions is met better than in the first version. @@ -56,309 +57,309 @@ import org.apache.commons.lang3.Functions.FailablePredicate; * @see Functions */ public class Streams { - /** A reduced, and simplified version of a {@link Stream} with - * failable method signatures. - * @param The streams element type. - */ - public static class FailableStream { - private Stream stream; - private boolean terminated; + /** A reduced, and simplified version of a {@link Stream} with + * failable method signatures. + * @param The streams element type. + */ + public static class FailableStream { + private Stream stream; + private boolean terminated; - public FailableStream(Stream pStream) { - stream = pStream; - } + public FailableStream(Stream pStream) { + stream = pStream; + } - protected void assertNotTerminated() { - if (terminated) { - throw new IllegalStateException("This stream is already terminated."); - } - } + protected void assertNotTerminated() { + if (terminated) { + throw new IllegalStateException("This stream is already terminated."); + } + } - protected void makeTerminated() { - assertNotTerminated(); - terminated = true; - } + protected void makeTerminated() { + assertNotTerminated(); + terminated = true; + } - /** - * Returns a FailableStream consisting of the elements of this stream that match - * the given FailablePredicate. - * - *

This is an intermediate operation. - * - * @param pPredicate a non-interfering, stateless predicate to apply to each - * element to determine if it should be included. - * @return the new stream - */ - public FailableStream filter(FailablePredicate pPredicate){ - assertNotTerminated(); - stream = stream.filter(Functions.asPredicate(pPredicate)); - return this; - } + /** + * Returns a FailableStream consisting of the elements of this stream that match + * the given FailablePredicate. + * + *

This is an intermediate operation. + * + * @param pPredicate a non-interfering, stateless predicate to apply to each + * element to determine if it should be included. + * @return the new stream + */ + public FailableStream filter(FailablePredicate pPredicate){ + assertNotTerminated(); + stream = stream.filter(Functions.asPredicate(pPredicate)); + return this; + } - /** - * Performs an action for each element of this stream. - * - *

This is a terminal operation. - * - *

The behavior of this operation is explicitly nondeterministic. - * For parallel stream pipelines, this operation does not - * guarantee to respect the encounter order of the stream, as doing so - * would sacrifice the benefit of parallelism. For any given element, the - * action may be performed at whatever time and in whatever thread the - * library chooses. If the action accesses shared state, it is - * responsible for providing the required synchronization. - * - * @param pAction a non-interfering action to perform on the elements - */ - public void forEach(FailableConsumer pAction) { - makeTerminated(); - stream().forEach(Functions.asConsumer(pAction)); - } - - /** - * Performs a mutable reduction operation on the elements of this stream using a - * {@code Collector}. A {@code Collector} - * encapsulates the functions used as arguments to - * {@link #collect(Supplier, BiConsumer, BiConsumer)}, allowing for reuse of - * collection strategies and composition of collect operations such as - * multiple-level grouping or partitioning. - * - *

If the underlying stream is parallel, and the {@code Collector} - * is concurrent, and either the stream is unordered or the collector is - * unordered, then a concurrent reduction will be performed - * (see {@link Collector} for details on concurrent reduction.) - * - *

This is a terminal operation. - * - *

When executed in parallel, multiple intermediate results may be - * instantiated, populated, and merged so as to maintain isolation of - * mutable data structures. Therefore, even when executed in parallel - * with non-thread-safe data structures (such as {@code ArrayList}), no - * additional synchronization is needed for a parallel reduction. - * - * \@apiNote - * The following will accumulate strings into an ArrayList: - *

{@code
-	     *     List asList = stringStream.collect(Collectors.toList());
-	     * }
- * - *

The following will classify {@code Person} objects by city: - *

{@code
-	     *     Map> peopleByCity
-	     *         = personStream.collect(Collectors.groupingBy(Person::getCity));
-	     * }
- * - *

The following will classify {@code Person} objects by state and city, - * cascading two {@code Collector}s together: - *

{@code
-	     *     Map>> peopleByStateAndCity
-	     *         = personStream.collect(Collectors.groupingBy(Person::getState,
-	     *                                                      Collectors.groupingBy(Person::getCity)));
-	     * }
- * - * @param the type of the result - * @param the intermediate accumulation type of the {@code Collector} - * @param pCollector the {@code Collector} describing the reduction - * @return the result of the reduction - * @see #collect(Supplier, BiConsumer, BiConsumer) - * @see Collectors - */ - public R collect(Collector pCollector) { + /** + * Performs an action for each element of this stream. + * + *

This is a terminal operation. + * + *

The behavior of this operation is explicitly nondeterministic. + * For parallel stream pipelines, this operation does not + * guarantee to respect the encounter order of the stream, as doing so + * would sacrifice the benefit of parallelism. For any given element, the + * action may be performed at whatever time and in whatever thread the + * library chooses. If the action accesses shared state, it is + * responsible for providing the required synchronization. + * + * @param pAction a non-interfering action to perform on the elements + */ + public void forEach(FailableConsumer pAction) { makeTerminated(); - return stream().collect(pCollector); - } + stream().forEach(Functions.asConsumer(pAction)); + } - /** - * Performs a mutable reduction operation on the elements of this FailableStream. - * A mutable reduction is one in which the reduced value is a mutable result - * container, such as an {@code ArrayList}, and elements are incorporated by updating - * the state of the result rather than by replacing the result. This produces a result equivalent to: - *

{@code
-	     *     R result = supplier.get();
-	     *     for (T element : this stream)
-	     *         accumulator.accept(result, element);
-	     *     return result;
-	     * }
- * - *

Like {@link #reduce(Object, BinaryOperator)}, {@code collect} operations - * can be parallelized without requiring additional synchronization. - * - *

This is a terminal operation. - * - * \@apiNote There are many existing classes in the JDK whose signatures are - * well-suited for use with method references as arguments to {@code collect()}. - * For example, the following will accumulate strings into an {@code ArrayList}: - *

{@code
-	     *     List asList = stringStream.collect(ArrayList::new, ArrayList::add,
-	     *                                                ArrayList::addAll);
-	     * }
- * - *

The following will take a stream of strings and concatenates them into a - * single string: - *

{@code
-	     *     String concat = stringStream.collect(StringBuilder::new, StringBuilder::append,
-	     *                                          StringBuilder::append)
-	     *                                 .toString();
-	     * }
- * - * @param type of the result - * @param
Type of the accumulator. - * @param pSupplier a function that creates a new result container. For a - * parallel execution, this function may be called - * multiple times and must return a fresh value each time. - * @param pAccumulator An associative, non-interfering, stateless function for - * incorporating an additional element into a result - * @param pCombiner An associative, non-interfering, stateless - * function for combining two values, which must be compatible with the - * accumulator function - * @return The result of the reduction - */ - public R collect(Supplier pSupplier, BiConsumer pAccumulator, BiConsumer pCombiner) { + /** + * Performs a mutable reduction operation on the elements of this stream using a + * {@code Collector}. A {@code Collector} + * encapsulates the functions used as arguments to + * {@link #collect(Supplier, BiConsumer, BiConsumer)}, allowing for reuse of + * collection strategies and composition of collect operations such as + * multiple-level grouping or partitioning. + * + *

If the underlying stream is parallel, and the {@code Collector} + * is concurrent, and either the stream is unordered or the collector is + * unordered, then a concurrent reduction will be performed + * (see {@link Collector} for details on concurrent reduction.) + * + *

This is a terminal operation. + * + *

When executed in parallel, multiple intermediate results may be + * instantiated, populated, and merged so as to maintain isolation of + * mutable data structures. Therefore, even when executed in parallel + * with non-thread-safe data structures (such as {@code ArrayList}), no + * additional synchronization is needed for a parallel reduction. + * + * \@apiNote + * The following will accumulate strings into an ArrayList: + *

{@code
+         *     List asList = stringStream.collect(Collectors.toList());
+         * }
+ * + *

The following will classify {@code Person} objects by city: + *

{@code
+         *     Map> peopleByCity
+         *         = personStream.collect(Collectors.groupingBy(Person::getCity));
+         * }
+ * + *

The following will classify {@code Person} objects by state and city, + * cascading two {@code Collector}s together: + *

{@code
+         *     Map>> peopleByStateAndCity
+         *         = personStream.collect(Collectors.groupingBy(Person::getState,
+         *                                                      Collectors.groupingBy(Person::getCity)));
+         * }
+ * + * @param the type of the result + * @param
the intermediate accumulation type of the {@code Collector} + * @param pCollector the {@code Collector} describing the reduction + * @return the result of the reduction + * @see #collect(Supplier, BiConsumer, BiConsumer) + * @see Collectors + */ + public R collect(Collector pCollector) { makeTerminated(); - return stream().collect(pSupplier, pAccumulator, pCombiner); - } + return stream().collect(pCollector); + } - /** - * Performs a reduction on the elements of this stream, using the provided - * identity value and an associative accumulation function, and returns - * the reduced value. This is equivalent to: - *
{@code
-	     *     T result = identity;
-	     *     for (T element : this stream)
-	     *         result = accumulator.apply(result, element)
-	     *     return result;
-	     * }
- * - * but is not constrained to execute sequentially. - * - *

The {@code identity} value must be an identity for the accumulator - * function. This means that for all {@code t}, - * {@code accumulator.apply(identity, t)} is equal to {@code t}. - * The {@code accumulator} function must be an associative function. - * - *

This is a terminal operation. - * - * \@apiNote Sum, min, max, average, and string concatenation are all special - * cases of reduction. Summing a stream of numbers can be expressed as: - * - *

{@code
-	     *     Integer sum = integers.reduce(0, (a, b) -> a+b);
-	     * }
- * - * or: - * - *
{@code
-	     *     Integer sum = integers.reduce(0, Integer::sum);
-	     * }
- * - *

While this may seem a more roundabout way to perform an aggregation - * compared to simply mutating a running total in a loop, reduction - * operations parallelize more gracefully, without needing additional - * synchronization and with greatly reduced risk of data races. - * - * @param pIdentity the identity value for the accumulating function - * @param pAccumulator an associative, non-interfering, stateless - * function for combining two values - * @return the result of the reduction - */ - public O reduce(O pIdentity, BinaryOperator pAccumulator) { + /** + * Performs a mutable reduction operation on the elements of this FailableStream. + * A mutable reduction is one in which the reduced value is a mutable result + * container, such as an {@code ArrayList}, and elements are incorporated by updating + * the state of the result rather than by replacing the result. This produces a result equivalent to: + *

{@code
+         *     R result = supplier.get();
+         *     for (T element : this stream)
+         *         accumulator.accept(result, element);
+         *     return result;
+         * }
+ * + *

Like {@link #reduce(Object, BinaryOperator)}, {@code collect} operations + * can be parallelized without requiring additional synchronization. + * + *

This is a terminal operation. + * + * \@apiNote There are many existing classes in the JDK whose signatures are + * well-suited for use with method references as arguments to {@code collect()}. + * For example, the following will accumulate strings into an {@code ArrayList}: + *

{@code
+         *     List asList = stringStream.collect(ArrayList::new, ArrayList::add,
+         *                                                ArrayList::addAll);
+         * }
+ * + *

The following will take a stream of strings and concatenates them into a + * single string: + *

{@code
+         *     String concat = stringStream.collect(StringBuilder::new, StringBuilder::append,
+         *                                          StringBuilder::append)
+         *                                 .toString();
+         * }
+ * + * @param type of the result + * @param
Type of the accumulator. + * @param pSupplier a function that creates a new result container. For a + * parallel execution, this function may be called + * multiple times and must return a fresh value each time. + * @param pAccumulator An associative, non-interfering, stateless function for + * incorporating an additional element into a result + * @param pCombiner An associative, non-interfering, stateless + * function for combining two values, which must be compatible with the + * accumulator function + * @return The result of the reduction + */ + public R collect(Supplier pSupplier, BiConsumer pAccumulator, BiConsumer pCombiner) { makeTerminated(); - return stream().reduce(pIdentity, pAccumulator); - } + return stream().collect(pSupplier, pAccumulator, pCombiner); + } - /** - * Returns a stream consisting of the results of applying the given - * function to the elements of this stream. - * - *

This is an intermediate operation. - * - * @param The element type of the new stream - * @param pMapper A non-interfering, stateless function to apply to each element - * @return the new stream - */ - public FailableStream map(FailableFunction pMapper) { - assertNotTerminated(); - return new FailableStream(stream.map(Functions.asFunction(pMapper))); - } + /** + * Performs a reduction on the elements of this stream, using the provided + * identity value and an associative accumulation function, and returns + * the reduced value. This is equivalent to: + *

{@code
+         *     T result = identity;
+         *     for (T element : this stream)
+         *         result = accumulator.apply(result, element)
+         *     return result;
+         * }
+ * + * but is not constrained to execute sequentially. + * + *

The {@code identity} value must be an identity for the accumulator + * function. This means that for all {@code t}, + * {@code accumulator.apply(identity, t)} is equal to {@code t}. + * The {@code accumulator} function must be an associative function. + * + *

This is a terminal operation. + * + * \@apiNote Sum, min, max, average, and string concatenation are all special + * cases of reduction. Summing a stream of numbers can be expressed as: + * + *

{@code
+         *     Integer sum = integers.reduce(0, (a, b) -> a+b);
+         * }
+ * + * or: + * + *
{@code
+         *     Integer sum = integers.reduce(0, Integer::sum);
+         * }
+ * + *

While this may seem a more roundabout way to perform an aggregation + * compared to simply mutating a running total in a loop, reduction + * operations parallelize more gracefully, without needing additional + * synchronization and with greatly reduced risk of data races. + * + * @param pIdentity the identity value for the accumulating function + * @param pAccumulator an associative, non-interfering, stateless + * function for combining two values + * @return the result of the reduction + */ + public O reduce(O pIdentity, BinaryOperator pAccumulator) { + makeTerminated(); + return stream().reduce(pIdentity, pAccumulator); + } - /** - * Converts the FailableStream into an equivalent stream. - * @return A stream, which will return the same elements, which this FailableStream would return. - */ - public Stream stream() { - return stream; - } + /** + * Returns a stream consisting of the results of applying the given + * function to the elements of this stream. + * + *

This is an intermediate operation. + * + * @param The element type of the new stream + * @param pMapper A non-interfering, stateless function to apply to each element + * @return the new stream + */ + public FailableStream map(FailableFunction pMapper) { + assertNotTerminated(); + return new FailableStream(stream.map(Functions.asFunction(pMapper))); + } - /** - * Returns whether all elements of this stream match the provided predicate. - * May not evaluate the predicate on all elements if not necessary for - * determining the result. If the stream is empty then {@code true} is - * returned and the predicate is not evaluated. - * - *

This is a short-circuiting terminal operation. - * - * \@apiNote - * This method evaluates the universal quantification of the - * predicate over the elements of the stream (for all x P(x)). If the - * stream is empty, the quantification is said to be vacuously - * satisfied and is always {@code true} (regardless of P(x)). - * - * @param pPredicate A non-interfering, stateless predicate to apply to - * elements of this stream - * @return {@code true} If either all elements of the stream match the - * provided predicate or the stream is empty, otherwise {@code false}. - */ - public boolean allMatch(FailablePredicate pPredicate) { - assertNotTerminated(); - return stream().allMatch(Functions.asPredicate(pPredicate)); - } + /** + * Converts the FailableStream into an equivalent stream. + * @return A stream, which will return the same elements, which this FailableStream would return. + */ + public Stream stream() { + return stream; + } - /** - * Returns whether any elements of this stream match the provided - * predicate. May not evaluate the predicate on all elements if not - * necessary for determining the result. If the stream is empty then - * {@code false} is returned and the predicate is not evaluated. - * - *

This is a short-circuiting terminal operation. - * - * \@apiNote - * This method evaluates the existential quantification of the - * predicate over the elements of the stream (for some x P(x)). - * - * @param pPredicate A non-interfering, stateless predicate to apply to - * elements of this stream - * @return {@code true} if any elements of the stream match the provided - * predicate, otherwise {@code false} - */ - public boolean anyMatch(FailablePredicate pPredicate) { + /** + * Returns whether all elements of this stream match the provided predicate. + * May not evaluate the predicate on all elements if not necessary for + * determining the result. If the stream is empty then {@code true} is + * returned and the predicate is not evaluated. + * + *

This is a short-circuiting terminal operation. + * + * \@apiNote + * This method evaluates the universal quantification of the + * predicate over the elements of the stream (for all x P(x)). If the + * stream is empty, the quantification is said to be vacuously + * satisfied and is always {@code true} (regardless of P(x)). + * + * @param pPredicate A non-interfering, stateless predicate to apply to + * elements of this stream + * @return {@code true} If either all elements of the stream match the + * provided predicate or the stream is empty, otherwise {@code false}. + */ + public boolean allMatch(FailablePredicate pPredicate) { + assertNotTerminated(); + return stream().allMatch(Functions.asPredicate(pPredicate)); + } + + /** + * Returns whether any elements of this stream match the provided + * predicate. May not evaluate the predicate on all elements if not + * necessary for determining the result. If the stream is empty then + * {@code false} is returned and the predicate is not evaluated. + * + *

This is a short-circuiting terminal operation. + * + * \@apiNote + * This method evaluates the existential quantification of the + * predicate over the elements of the stream (for some x P(x)). + * + * @param pPredicate A non-interfering, stateless predicate to apply to + * elements of this stream + * @return {@code true} if any elements of the stream match the provided + * predicate, otherwise {@code false} + */ + public boolean anyMatch(FailablePredicate pPredicate) { assertNotTerminated(); return stream().anyMatch(Functions.asPredicate(pPredicate)); - } - } + } + } - /** - * Converts the given {@link Stream stream} into a {@link FailableStream}. - * This is basically a simplified, reduced version of the {@link Stream} - * class, with the same underlying element stream, except that failable - * objects, like {@link FailablePredicate}, {@link FailableFunction}, or - * {@link FailableConsumer} may be applied, instead of - * {@link Predicate}, {@link Function}, or {@link Consumer}. The idea is - * to rewrite a code snippet like this: - *

-	 *     final List<O> list;
-	 *     final Method m;
-	 *     final Function<O,String> mapper = (o) -> {
-	 *         try {
-	 *             return (String) m.invoke(o);
-	 *         } catch (Throwable t) {
-	 *             throw Functions.rethrow(t);
-	 *         }
-	 *     };
-	 *     final List<String> strList = list.stream()
-	 *         .map(mapper).collect(Collectors.toList());
-	 *  
- * as follows: - *
+    /**
+     * Converts the given {@link Stream stream} into a {@link FailableStream}.
+     * This is basically a simplified, reduced version of the {@link Stream}
+     * class, with the same underlying element stream, except that failable
+     * objects, like {@link FailablePredicate}, {@link FailableFunction}, or
+     * {@link FailableConsumer} may be applied, instead of
+     * {@link Predicate}, {@link Function}, or {@link Consumer}. The idea is
+     * to rewrite a code snippet like this:
+     * 
+     *     final List<O> list;
+     *     final Method m;
+     *     final Function<O,String> mapper = (o) -> {
+     *         try {
+     *             return (String) m.invoke(o);
+     *         } catch (Throwable t) {
+     *             throw Functions.rethrow(t);
+     *         }
+     *     };
+     *     final List<String> strList = list.stream()
+     *         .map(mapper).collect(Collectors.toList());
+     *  
+ * as follows: + *
      *     final List<O> list;
      *     final Method m;
      *     final List<String> strList = Functions.stream(list.stream())
@@ -369,12 +370,54 @@ public class Streams {
      *  intermediate objects, of type FailableStream), it is much more
      *  concise, and readable, and meets the spirit of Lambdas better
      *  than the first version.
-	 * @param  The streams element type.
-	 * @param pStream The stream, which is being converted.
-	 * @return The {@link FailableStream}, which has been created by
-	 *   converting the stream.
-	 */
-	public static  FailableStream stream(Stream pStream) {
-		return new FailableStream(pStream);
-	}
+     * @param  The streams element type.
+     * @param pStream The stream, which is being converted.
+     * @return The {@link FailableStream}, which has been created by
+     *   converting the stream.
+     */
+    public static  FailableStream stream(Stream pStream) {
+        return new FailableStream(pStream);
+    }
+
+    /**
+     * Converts the given {@link Collection} into a {@link FailableStream}.
+     * This is basically a simplified, reduced version of the {@link Stream}
+     * class, with the same underlying element stream, except that failable
+     * objects, like {@link FailablePredicate}, {@link FailableFunction}, or
+     * {@link FailableConsumer} may be applied, instead of
+     * {@link Predicate}, {@link Function}, or {@link Consumer}. The idea is
+     * to rewrite a code snippet like this:
+     * 
+     *     final List<O> list;
+     *     final Method m;
+     *     final Function<O,String> mapper = (o) -> {
+     *         try {
+     *             return (String) m.invoke(o);
+     *         } catch (Throwable t) {
+     *             throw Functions.rethrow(t);
+     *         }
+     *     };
+     *     final List<String> strList = list.stream()
+     *         .map(mapper).collect(Collectors.toList());
+     *  
+ * as follows: + *
+     *     final List<O> list;
+     *     final Method m;
+     *     final List<String> strList = Functions.stream(list.stream())
+     *         .map((o) -> (String) m.invoke(o)).collect(Collectors.toList());
+     *  
+ * While the second version may not be quite as + * efficient (because it depends on the creation of additional, + * intermediate objects, of type FailableStream), it is much more + * concise, and readable, and meets the spirit of Lambdas better + * than the first version. + * @param The streams element type. + * @param pStream The stream, which is being converted. + * @return The {@link FailableStream}, which has been created by + * converting the stream. + */ + public static FailableStream stream(Collection pStream) { + return stream(pStream.stream()); + } } diff --git a/src/test/java/org/apache/commons/lang3/StreamsTest.java b/src/test/java/org/apache/commons/lang3/StreamsTest.java index 9ad8e7810..3ce713d93 100644 --- a/src/test/java/org/apache/commons/lang3/StreamsTest.java +++ b/src/test/java/org/apache/commons/lang3/StreamsTest.java @@ -16,7 +16,9 @@ */ package org.apache.commons.lang3; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.UndeclaredThrowableException; import java.util.ArrayList; @@ -62,7 +64,7 @@ class StreamsTest { } } - protected FailableConsumer asIntConsumer(T pThrowable) { + protected FailableConsumer asIntConsumer(T pThrowable) { return (s) -> { final Integer i = Integer.valueOf(s); if (i.intValue() == 4) { @@ -105,7 +107,9 @@ class StreamsTest { final List input = Arrays.asList("1", "2", "3", "4", "5", "6"); final List output = Functions.stream(input) .map((s) -> Integer.valueOf(s)) - .filter((i) -> { return i.intValue() %2 == 0;}) + .filter((i) -> { + return i.intValue() %2 == 0; + }) .collect(Collectors.toList()); assertEvenNumbers(output); } @@ -117,7 +121,7 @@ class StreamsTest { } } - protected FailablePredicate asIntPredicate(T pThrowable) { + protected FailablePredicate asIntPredicate(T pThrowable) { return (i) -> { if (i.intValue() == 5) { if (pThrowable != null) {