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 2018/02/22 21:49:20 UTC

commons-collections git commit: [COLLECTIONS-676] Modify IteratorUtils.pushbackIterator signature to return PushbackIterator.

Repository: commons-collections
Updated Branches:
  refs/heads/master 96eddd6ae -> 8da9a65b6


[COLLECTIONS-676] Modify IteratorUtils.pushbackIterator signature to
return PushbackIterator.

Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/8da9a65b
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/8da9a65b
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/8da9a65b

Branch: refs/heads/master
Commit: 8da9a65b6398931af18febe082299c5c4b932924
Parents: 96eddd6
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu Feb 22 14:49:17 2018 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu Feb 22 14:49:17 2018 -0700

----------------------------------------------------------------------
 src/changes/changes.xml                                         | 5 ++++-
 .../java/org/apache/commons/collections4/IteratorUtils.java     | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-collections/blob/8da9a65b/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4a34df5..3b93a5f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -87,9 +87,12 @@
     <action issue="COLLECTIONS-671" dev="ggregory" type="add" due-to="Gary Gregory">
       Add org.apache.commons.collections4.IterableUtils.first(Iterable).
     </action>
-    <action issue="COLLECTIONS-675" dev="ggregory" type="add" due-to="">
+    <action issue="COLLECTIONS-675" dev="ggregory" type="add" due-to="Matthew Knight">
       Modify IteratorUtils.peekingIterator signature to return PeekingIterator.
     </action>
+    <action issue="COLLECTIONS-676" dev="ggregory" type="add" due-to="Matthew Knight">
+      Modify IteratorUtils.pushbackIterator signature to return PushbackIterator.
+    </action>
   </release>
   <release version="4.1" date="2015-11-28" description="This is a security and minor release.">
     <action issue="COLLECTIONS-508" dev="tn" type="add">

http://git-wip-us.apache.org/repos/asf/commons-collections/blob/8da9a65b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
index 8863cd3..f0d2ba2 100644
--- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
@@ -873,8 +873,9 @@ public class IteratorUtils {
      * @return a pushback iterator
      * @throws NullPointerException if the iterator is null
      * @since 4.0
+     * @since 4.2 returns a {@link PushbackIterator} instead of a {@link Iterator}.
      */
-    public static <E> Iterator<E> pushbackIterator(final Iterator<? extends E> iterator) {
+    public static <E> PushbackIterator<E> pushbackIterator(final Iterator<? extends E> iterator) {
         return PushbackIterator.pushbackIterator(iterator);
     }