Repository: commons-collections Updated Branches: refs/heads/master 8354ffffc -> 0ca8f9b9f
- Reverting changes since these break binary compatibility. Setting Jira tickets to 5.0. - [COLLECTIONS-675] Modify IteratorUtils.peekingIterator signature to return PeekingIterator. - [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/0ca8f9b9 Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/0ca8f9b9 Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/0ca8f9b9 Branch: refs/heads/master Commit: 0ca8f9b9feb2d74c6373d1762b1eb4a6b1f7f4b8 Parents: 8354fff Author: Gary Gregory <[email protected]> Authored: Thu Mar 29 11:29:07 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Thu Mar 29 11:29:07 2018 -0600 ---------------------------------------------------------------------- src/changes/changes.xml | 6 ------ .../java/org/apache/commons/collections4/IteratorUtils.java | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/0ca8f9b9/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b50b304..a5da21e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -87,12 +87,6 @@ <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="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> <action issue="COLLECTIONS-678" dev="ggregory" type="fix" due-to="Oscar Luis Vera Pérez"> The verification of unsupported iterator methods is not complete. </action> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/0ca8f9b9/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 f0d2ba2..79ce159 100644 --- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java +++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java @@ -856,9 +856,8 @@ public class IteratorUtils { * @return a peeking iterator * @throws NullPointerException if the iterator is null * @since 4.0 - * @since 4.2 returns a {@link PeekingIterator} instead of a {@link Iterator}. */ - public static <E> PeekingIterator<E> peekingIterator(final Iterator<? extends E> iterator) { + public static <E> Iterator<E> peekingIterator(final Iterator<? extends E> iterator) { return PeekingIterator.peekingIterator(iterator); } @@ -873,9 +872,8 @@ 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> PushbackIterator<E> pushbackIterator(final Iterator<? extends E> iterator) { + public static <E> Iterator<E> pushbackIterator(final Iterator<? extends E> iterator) { return PushbackIterator.pushbackIterator(iterator); }
