diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java index d81b8f895..e8969869d 100644 --- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java +++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java @@ -1192,59 +1192,58 @@ public class CollectionUtils { } /** - * Returns a new Collection consisting of the elements of inputCollection + * Returns a new Collection containing all elements of the input collection * transformed by the given transformer. *

- * If the input transformer is null, the result is an empty list. + * If the input collection or transformer is null, the result is an empty list. * - * @param the type of object in the input collection - * @param the type of object in the output collection + * @param the type of object in the input collection + * @param the type of object in the output collection * @param inputCollection the collection to get the input from, may not be null * @param transformer the transformer to use, may be null * @return the transformed result (new list) * @throws NullPointerException if the input collection is null */ public static Collection collect(final Iterable inputCollection, - final Transformer transformer) { + final Transformer transformer) { final Collection answer = inputCollection instanceof Collection ? new ArrayList(((Collection) inputCollection).size()) : new ArrayList(); return collect(inputCollection, transformer, answer); } /** - * Transforms all elements from the inputIterator with the given transformer - * and adds them to the outputCollection. + * Transforms all elements from the input iterator with the given transformer + * and adds them to the output collection. *

- * If the input iterator or transformer is null, the result is an empty - * list. + * If the input iterator or transformer is null, the result is an empty list. * + * @param the type of object in the input collection + * @param the type of object in the output collection * @param inputIterator the iterator to get the input from, may be null * @param transformer the transformer to use, may be null - * @param the type of object in the input collection - * @param the type of object in the output collection * @return the transformed result (new list) */ public static Collection collect(final Iterator inputIterator, - final Transformer transformer) { + final Transformer transformer) { return collect(inputIterator, transformer, new ArrayList()); } /** - * Transforms all elements from inputCollection with the given transformer - * and adds them to the outputCollection. + * Transforms all elements from input collection with the given transformer + * and adds them to the output collection. *

* If the input collection or transformer is null, there is no change to the * output collection. * - * @param the type of object in the input collection - * @param the type of object in the output collection - * @param the output type of the transformer - this extends O. + * @param the type of object in the input collection + * @param the type of object in the output collection + * @param the type of the output collection * @param inputCollection the collection to get the input from, may be null * @param transformer the transformer to use, may be null - * @param outputCollection the collection to output into, may not be null if the inputCollection + * @param outputCollection the collection to output into, may not be null if inputCollection * and transformer are not null - * @return the outputCollection with the transformed input added - * @throws NullPointerException if the output collection is null and both, inputCollection and + * @return the output collection with the transformed input added + * @throws NullPointerException if the outputCollection is null and both, inputCollection and * transformer are not null */ public static > R collect(final Iterable inputCollection, @@ -1256,21 +1255,21 @@ public class CollectionUtils { } /** - * Transforms all elements from the inputIterator with the given transformer - * and adds them to the outputCollection. + * Transforms all elements from the input iterator with the given transformer + * and adds them to the output collection. *

* If the input iterator or transformer is null, there is no change to the * output collection. * + * @param the type of object in the input collection + * @param the type of object in the output collection + * @param the type of the output collection * @param inputIterator the iterator to get the input from, may be null * @param transformer the transformer to use, may be null - * @param outputCollection the collection to output into, may not be null if the inputCollection + * @param outputCollection the collection to output into, may not be null if inputIterator * and transformer are not null - * @param the type of object in the input collection - * @param the type of object in the output collection - * @param the output type of the transformer - this extends O. * @return the outputCollection with the transformed input added - * @throws NullPointerException if the output collection is null and both, inputCollection and + * @throws NullPointerException if the output collection is null and both, inputIterator and * transformer are not null */ public static > R collect(final Iterator inputIterator,