Merge branch '__rultor'

src/main/java/org/cactoos/iterator/TailOf.java

@@ -24,55 +24,33 @@
 package org.cactoos.iterator;
 
 import java.util.Iterator;
-import java.util.LinkedList;
+import org.cactoos.iterable.HeadOf;
 import org.cactoos.iterable.IterableOf;
-import org.cactoos.list.ListOf;
+import org.cactoos.iterable.Reversed;
 
 /**
  * Tail portion of the iterator.
  *
  * <p>There is no thread-safety guarantee.</p>
  * @param <T> Element type
  * @since 0.31
- * @todo #947:30min Reimplement the implementation using
- *  {@link org.cactoos.iterable.Reversed} decorator. Do not use concrete classes
- *  as {@link LinkedList} here, as it is already used in
- *  {@link org.cactoos.iterable.Reversed} decorator.
  */
-public final class TailOf<T> implements Iterator<T> {
-
-    /**
-     * Decorated iterator.
-     */
-    private final Iterator<T> origin;
-
+public final class TailOf<T> extends IteratorEnvelope<T> {
     /**
      * Ctor.
      * @param num Number of tail elements
      * @param iterator Decorated iterator
      */
     public TailOf(final int num, final Iterator<T> iterator) {
-        this.origin = new LinkedList<>(
-            new ListOf<>(
-                new IterableOf<>(
-                    new HeadOf<>(
-                        num,
-                        new LinkedList<>(
-                            new ListOf<>(new IterableOf<>(iterator))
-                        ).descendingIterator()
+        super(
+            new Reversed<>(
+                new HeadOf<>(
+                    num,
+                    new Reversed<>(
+                        new IterableOf<>(iterator)
                     )
                 )
-            )
-        ).descendingIterator();
-    }
-
-    @Override
-    public boolean hasNext() {
-        return this.origin.hasNext();
-    }
-
-    @Override
-    public T next() {
-        return this.origin.next();
+            ).iterator()
+        );
     }
 }

src/test/java/org/cactoos/iterator/TailOfTest.java

@@ -25,10 +25,10 @@
 
 import java.util.NoSuchElementException;
 import org.cactoos.iterable.IterableOf;
+import org.hamcrest.core.IsEqual;
 import org.junit.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.HasSize;
-import org.llorllale.cactoos.matchers.HasValues;
 import org.llorllale.cactoos.matchers.Throws;
 
 /**
@@ -52,9 +52,11 @@ public void tailIterator() throws Exception {
                     )
                 )
             ),
-            new HasValues<>(
-                "three",
-                "four"
+            new IsEqual<>(
+                new IterableOf<>(
+                    "three",
+                    "four"
+                )
             )
         ).affirm();
     }