Fix bug implementation an Iterating Adapter

Update version
yegor256 · Jun 19, 2017 · 97b6ae2 · 97b6ae2
1 parent c1e9bab
commit 97b6ae2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/org/cactoos/list/CycledIterable.java b/src/main/java/org/cactoos/list/CycledIterable.java
@@ -34,7 +34,7 @@
  * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
  * @version $Id$
  * @param <T> Type of item
- * @since 0.7
+ * @since 0.8
  */
 public final class CycledIterable<T> implements Iterable<T> {
 

diff --git a/src/main/java/org/cactoos/list/CycledIterator.java b/src/main/java/org/cactoos/list/CycledIterator.java
@@ -35,7 +35,7 @@
  * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
  * @version $Id$
  * @param <T> Type of item
- * @since 0.7
+ * @since 0.8
  */
 public final class CycledIterator<T> implements Iterator<T> {
 
@@ -59,19 +59,16 @@ public CycledIterator(final Iterable<T> iterable) {
 
     @Override
     public boolean hasNext() {
-        return this.iterable.iterator().hasNext();
+        if (this.iterator == null || !this.iterator.hasNext()) {
+            this.iterator = this.iterable.iterator();
+        }
+        return this.iterator.hasNext();
     }
 
     @Override
     public T next() {
-        if (this.iterator == null) {
-            this.iterator = this.iterable.iterator();
-        }
-        if (!this.iterator.hasNext()) {
-            this.iterator = this.iterable.iterator();
-            if (!this.iterator.hasNext()) {
-                throw new NoSuchElementException();
-            }
+        if (!this.hasNext()) {
+            throw new NoSuchElementException();
         }
         return this.iterator.next();
     }

diff --git a/src/test/java/org/cactoos/list/CycledIterableTest.java b/src/test/java/org/cactoos/list/CycledIterableTest.java
@@ -31,7 +31,7 @@
  * Test Case for {@link CycledIterable}.
  * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
  * @version $Id$
- * @since 0.7
+ * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
 public final class CycledIterableTest {

diff --git a/src/test/java/org/cactoos/list/CycledIteratorTest.java b/src/test/java/org/cactoos/list/CycledIteratorTest.java
@@ -31,7 +31,7 @@
  * Test Case for {@link CycledIterator}.
  * @author Ilia Rogozhin (ilia.rogozhin@gmail.com)
  * @version $Id$
- * @since 0.7
+ * @since 0.8
  * @checkstyle JavadocMethodCheck (500 lines)
  */
 public final class CycledIteratorTest {