- 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.
This commit is contained in:
Gary Gregory 2018-03-29 11:29:07 -06:00
parent 8354ffffce
commit 0ca8f9b9fe
2 changed files with 2 additions and 10 deletions

View File

@ -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>

View File

@ -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);
}