Merge branch '__rultor'

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

@@ -42,7 +42,7 @@ public final class Cycled<T> implements Iterator<T> {
     /**
      * Iterable.
      */
-    private final Iterable<T> iterable;
+    private final Iterable<T> origin;
 
     /**
      * Iterator.
@@ -51,16 +51,16 @@ public final class Cycled<T> implements Iterator<T> {
 
     /**
      * Ctor.
-     * @param itr Iterable.
+     * @param iterable Iterable.
      */
-    public Cycled(final Iterable<T> itr) {
-        this.iterable = itr;
+    public Cycled(final Iterable<T> iterable) {
+        this.origin = iterable;
     }
 
     @Override
     public boolean hasNext() {
         if (this.iterator == null || !this.iterator.hasNext()) {
-            this.iterator = this.iterable.iterator();
+            this.iterator = this.origin.iterator();
         }
         return this.iterator.hasNext();
     }

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

@@ -43,30 +43,30 @@ public final class Endless<T> implements Iterator<T> {
     /**
      * The element to repeat.
      */
-    private final UncheckedScalar<T> element;
+    private final UncheckedScalar<T> origin;
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param element Element to repeat
      */
-    public Endless(final T elm) {
-        this(() -> elm);
+    public Endless(final T element) {
+        this(() -> element);
     }
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param scalar Scalar to repeat
      */
-    public Endless(final Scalar<T> elm) {
-        this(new UncheckedScalar<>(elm));
+    public Endless(final Scalar<T> scalar) {
+        this(new UncheckedScalar<>(scalar));
     }
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param scalar Scalar to repeat
      */
-    public Endless(final UncheckedScalar<T> elm) {
-        this.element = elm;
+    public Endless(final UncheckedScalar<T> scalar) {
+        this.origin = scalar;
     }
 
     @Override
@@ -76,6 +76,6 @@ public boolean hasNext() {
 
     @Override
     public T next() {
-        return this.element.value();
+        return this.origin.value();
     }
 }

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

@@ -40,21 +40,21 @@ public final class LengthOf implements Scalar<Integer> {
     /**
      * The iterator.
      */
-    private final Iterator<?> iterator;
+    private final Iterator<?> origin;
 
     /**
      * Ctor.
-     * @param items The iterator
+     * @param iterator The iterator
      */
-    public LengthOf(final Iterator<?> items) {
-        this.iterator = items;
+    public LengthOf(final Iterator<?> iterator) {
+        this.origin = iterator;
     }
 
     @Override
     public Integer value() {
         int size = 0;
-        while (this.iterator.hasNext()) {
-            this.iterator.next();
+        while (this.origin.hasNext()) {
+            this.origin.next();
             ++size;
         }
         return size;

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

@@ -27,11 +27,11 @@
 import java.util.NoSuchElementException;
 
 /**
- * Limited iterator.
+ * Limited origin.
  *
- * <p>This is a decorator over an existing iterator. Returns elements of the
- * original iterator, until either the requested number of items have been
- * returned or the underlying iterator has been exhausted.</p>
+ * <p>This is a decorator over an existing origin. Returns elements of the
+ * original origin, until either the requested number of items have been
+ * returned or the underlying origin has been exhausted.</p>
  *
  * <p>There is no thread-safety guarantee.</p>
  *
@@ -43,14 +43,14 @@
 public final class Limited<T> implements Iterator<T> {
 
     /**
-     * Decorated iterator.
+     * Decorated origin.
      */
-    private final Iterator<T> iterator;
+    private final Iterator<T> origin;
 
     /**
      * Number of elements to return.
      */
-    private final int limit;
+    private final int restrict;
 
     /**
      * Number of elements returned so far.
@@ -64,14 +64,14 @@ public final class Limited<T> implements Iterator<T> {
      * @param limit The requested number of elements
      */
     public Limited(final Iterator<T> iterator, final int limit) {
-        this.iterator = iterator;
-        this.limit = limit;
+        this.origin = iterator;
+        this.restrict = limit;
         this.consumed = 0;
     }
 
     @Override
     public boolean hasNext() {
-        return this.consumed < this.limit && this.iterator.hasNext();
+        return this.consumed < this.restrict && this.origin.hasNext();
     }
 
     @Override
@@ -80,6 +80,6 @@ public T next() {
             throw new NoSuchElementException("No more elements.");
         }
         ++this.consumed;
-        return this.iterator.next();
+        return this.origin.next();
     }
 }

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

@@ -43,36 +43,36 @@ public final class Mapped<X, Y> implements Iterator<Y> {
     /**
      * Iterator.
      */
-    private final Iterator<X> iterator;
+    private final Iterator<X> origin;
 
     /**
      * Function.
      */
-    private final Func<X, Y> func;
+    private final Func<X, Y> fnc;
 
     /**
      * Ctor.
-     * @param src Source iterable
-     * @param fnc Func
+     * @param iterator Source iterator
+     * @param func Func
      */
-    public Mapped(final Iterator<X> src, final Func<X, Y> fnc) {
-        this.iterator = src;
-        this.func = fnc;
+    public Mapped(final Iterator<X> iterator, final Func<X, Y> func) {
+        this.origin = iterator;
+        this.fnc = func;
     }
 
     @Override
     public boolean hasNext() {
-        return this.iterator.hasNext();
+        return this.origin.hasNext();
     }
 
     @Override
     public Y next() {
-        return new UncheckedFunc<>(this.func).apply(this.iterator.next());
+        return new UncheckedFunc<>(this.fnc).apply(this.origin.next());
     }
 
     @Override
     public void remove() {
-        this.iterator.remove();
+        this.origin.remove();
     }
 
 }

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

@@ -43,49 +43,49 @@ public final class Repeated<T> implements Iterator<T> {
     /**
      * The element to repeat.
      */
-    private final UncheckedScalar<T> element;
+    private final UncheckedScalar<T> elm;
 
     /**
      * How many more repeats will happen.
      */
-    private int left;
+    private int repeat;
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param element Element to repeat
      * @param max How many times to repeat
      */
-    public Repeated(final T elm, final int max) {
-        this(() -> elm, max);
+    public Repeated(final T element, final int max) {
+        this(() -> element, max);
     }
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param scalar Scalar to repeat
      * @param max How many times to repeat
      */
-    public Repeated(final Scalar<T> elm, final int max) {
-        this(new UncheckedScalar<T>(elm), max);
+    public Repeated(final Scalar<T> scalar, final int max) {
+        this(new UncheckedScalar<T>(scalar), max);
     }
 
     /**
      * Ctor.
-     * @param elm Element to repeat
+     * @param scalar Scalar to repeat
      * @param max How many times to repeat
      */
-    public Repeated(final UncheckedScalar<T> elm, final int max) {
-        this.element = elm;
-        this.left = max;
+    public Repeated(final UncheckedScalar<T> scalar, final int max) {
+        this.elm = scalar;
+        this.repeat = max;
     }
 
     @Override
     public boolean hasNext() {
-        return this.left > 0;
+        return this.repeat > 0;
     }
 
     @Override
     public T next() {
-        --this.left;
-        return this.element.value();
+        --this.repeat;
+        return this.elm.value();
     }
 }

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

@@ -41,30 +41,30 @@ public final class Skipped<T> implements Iterator<T> {
     /**
      * Decorated iterator.
      */
-    private final Iterator<T> iterator;
+    private final Iterator<T> origin;
 
     /**
      * Count skip elements.
      */
-    private int skip;
+    private int omit;
 
     /**
      * Ctor.
-     * @param itr Decorated iterator
-     * @param skp Count skip elements
+     * @param iterator Decorated iterator
+     * @param skip Count skip elements
      */
-    public Skipped(final Iterator<T> itr, final int skp) {
-        this.iterator = itr;
-        this.skip = skp;
+    public Skipped(final Iterator<T> iterator, final int skip) {
+        this.origin = iterator;
+        this.omit = skip;
     }
 
     @Override
     public boolean hasNext() {
-        while (this.skip > 0 && this.iterator.hasNext()) {
-            this.iterator.next();
-            --this.skip;
+        while (this.omit > 0 && this.origin.hasNext()) {
+            this.origin.next();
+            --this.omit;
         }
-        return this.iterator.hasNext();
+        return this.origin.hasNext();
     }
 
     @Override
@@ -74,6 +74,6 @@ public T next() {
                 "The iterator doesn't have items any more"
             );
         }
-        return this.iterator.next();
+        return this.origin.next();
     }
 }

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

@@ -51,26 +51,26 @@
 
     /**
      * Ctor.
-     * @param src The underlying iterator
+     * @param items The underlying iterator
      */
-    public Sorted(final Iterator<T> src) {
-        this(Comparator.naturalOrder(), src);
+    public Sorted(final Iterator<T> items) {
+        this(Comparator.naturalOrder(), items);
     }
 
     /**
      * Ctor.
-     * @param src The underlying iterator
-     * @param cmp The comparator
+     * @param iterator The underlying iterator
+     * @param comparator The comparator
      */
-    public Sorted(final Comparator<T> cmp, final Iterator<T> src) {
+    public Sorted(final Comparator<T> comparator, final Iterator<T> iterator) {
         this.scalar = new UncheckedScalar<>(
             new StickyScalar<>(
                 () -> {
                     final List<T> items = new LinkedList<>();
-                    while (src.hasNext()) {
-                        items.add(src.next());
+                    while (iterator.hasNext()) {
+                        items.add(iterator.next());
                     }
-                    items.sort(cmp);
+                    items.sort(comparator);
                     return items.iterator();
                 }
             )

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

@@ -58,15 +58,15 @@ public Sticky(final X... items) {
 
     /**
      * Ctor.
-     * @param src The iterable
+     * @param iterator The iterator
      */
-    public Sticky(final Iterator<X> src) {
+    public Sticky(final Iterator<X> iterator) {
         this.gate = new UncheckedScalar<>(
             new StickyScalar<>(
                 () -> {
                     final Collection<X> temp = new LinkedList<>();
-                    while (src.hasNext()) {
-                        temp.add(src.next());
+                    while (iterator.hasNext()) {
+                        temp.add(iterator.next());
                     }
                     return temp.iterator();
                 }