Merge branch 'master' of github.com:yegor256/cactoos

yegor256 · Aug 6, 2017 · 7fab56e · 7fab56e
2 parents 10d201e + f5d6b13
commit 7fab56e
Show file tree

Hide file tree

Showing 15 changed files with 80 additions and 79 deletions.
diff --git a/src/main/java/org/cactoos/scalar/BoolOf.java b/src/main/java/org/cactoos/scalar/BoolOf.java
@@ -42,7 +42,7 @@ public final class BoolOf implements Scalar<Boolean> {
     /**
      * Source text.
      */
-    private final Text text;
+    private final Text origin;
 
     /**
      * Ctor.
@@ -59,11 +59,11 @@ public BoolOf(final String string) {
      * @param text True or false text
      */
     public BoolOf(final Text text) {
-        this.text = text;
+        this.origin = text;
     }
 
     @Override
     public Boolean value() throws IOException {
-        return Boolean.valueOf(this.text.asString());
+        return Boolean.valueOf(this.origin.asString());
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/DoubleOf.java b/src/main/java/org/cactoos/scalar/DoubleOf.java
@@ -42,7 +42,7 @@ public final class DoubleOf implements Scalar<Double> {
     /**
      * Source text.
      */
-    private final Text text;
+    private final Text origin;
 
     /**
      * Ctor.
@@ -59,11 +59,11 @@ public DoubleOf(final String string) {
      * @param text Number-text
      */
     public DoubleOf(final Text text) {
-        this.text = text;
+        this.origin = text;
     }
 
     @Override
     public Double value() throws IOException {
-        return Double.valueOf(this.text.asString());
+        return Double.valueOf(this.origin.asString());
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/Equals.java b/src/main/java/org/cactoos/scalar/Equals.java
@@ -49,12 +49,12 @@ public final class Equals<T extends Comparable<T>> implements Scalar<Boolean> {
 
     /**
      * Ctor.
-     * @param frst The first scalar to compare.
-     * @param scnd The second scalar to compare.
+     * @param source The first scalar to compare.
+     * @param compared The second scalar to compare.
      */
-    public Equals(final Scalar<T> frst, final Scalar<T> scnd) {
-        this.first = frst;
-        this.second = scnd;
+    public Equals(final Scalar<T> source, final Scalar<T> compared) {
+        this.first = source;
+        this.second = compared;
     }
 
     @Override

diff --git a/src/main/java/org/cactoos/scalar/FloatOf.java b/src/main/java/org/cactoos/scalar/FloatOf.java
@@ -42,7 +42,7 @@ public final class FloatOf implements Scalar<Float> {
     /**
      * Source text.
      */
-    private final Text text;
+    private final Text origin;
 
     /**
      * Ctor.
@@ -59,11 +59,11 @@ public FloatOf(final String string) {
      * @param text Number-text
      */
     public FloatOf(final Text text) {
-        this.text = text;
+        this.origin = text;
     }
 
     @Override
     public Float value() throws IOException {
-        return Float.valueOf(this.text.asString());
+        return Float.valueOf(this.origin.asString());
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/IntOf.java b/src/main/java/org/cactoos/scalar/IntOf.java
@@ -42,7 +42,7 @@ public final class IntOf implements Scalar<Integer> {
     /**
      * Source text.
      */
-    private final Text text;
+    private final Text origin;
 
     /**
      * Ctor.
@@ -59,11 +59,11 @@ public IntOf(final String string) {
      * @param text Number-text
      */
     public IntOf(final Text text) {
-        this.text = text;
+        this.origin = text;
     }
 
     @Override
     public Integer value() throws IOException {
-        return Integer.valueOf(this.text.asString());
+        return Integer.valueOf(this.origin.asString());
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/IoCheckedScalar.java b/src/main/java/org/cactoos/scalar/IoCheckedScalar.java
@@ -43,21 +43,21 @@ public final class IoCheckedScalar<T> implements Scalar<T> {
     /**
      * Original scalar.
      */
-    private final Scalar<T> scalar;
+    private final Scalar<T> origin;
 
     /**
      * Ctor.
      * @param scalar Encapsulated scalar
      */
     public IoCheckedScalar(final Scalar<T> scalar) {
-        this.scalar = scalar;
+        this.origin = scalar;
     }
 
     @Override
     public T value() throws IOException {
         return new IoCheckedFunc<Scalar<T>, T>(
             Scalar::value
-        ).apply(this.scalar);
+        ).apply(this.origin);
     }
 
 }
diff --git a/src/main/java/org/cactoos/scalar/LongOf.java b/src/main/java/org/cactoos/scalar/LongOf.java
@@ -42,7 +42,7 @@ public final class LongOf implements Scalar<Long> {
     /**
      * Source text.
      */
-    private final Text text;
+    private final Text origin;
 
     /**
      * Ctor.
@@ -59,11 +59,11 @@ public LongOf(final String string) {
      * @param text Number-text
      */
     public LongOf(final Text text) {
-        this.text = text;
+        this.origin = text;
     }
 
     @Override
     public Long value() throws IOException {
-        return Long.valueOf(this.text.asString());
+        return Long.valueOf(this.origin.asString());
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/Max.java b/src/main/java/org/cactoos/scalar/Max.java
@@ -47,19 +47,19 @@ public final class Max<T extends Comparable<T>> implements Scalar<T> {
 
     /**
      * Ctor.
-     * @param items The items
+     * @param scalars The items
      */
     @SafeVarargs
-    public Max(final Scalar<T>... items) {
-        this(new IterableOf<>(items));
+    public Max(final Scalar<T>... scalars) {
+        this(new IterableOf<>(scalars));
     }
 
     /**
      * Ctor.
-     * @param items The items
+     * @param iterable The items
      */
-    public Max(final Iterable<Scalar<T>> items) {
-        this.items = items;
+    public Max(final Iterable<Scalar<T>> iterable) {
+        this.items = iterable;
     }
 
     @Override

diff --git a/src/main/java/org/cactoos/scalar/Min.java b/src/main/java/org/cactoos/scalar/Min.java
@@ -47,19 +47,19 @@ public final class Min<T extends Comparable<T>> implements Scalar<T> {
 
     /**
      * Ctor.
-     * @param items The items
+     * @param scalars The items
      */
     @SafeVarargs
-    public Min(final Scalar<T>... items) {
-        this(new IterableOf<>(items));
+    public Min(final Scalar<T>... scalars) {
+        this(new IterableOf<>(scalars));
     }
 
     /**
      * Ctor.
-     * @param items The items
+     * @param iterable The items
      */
-    public Min(final Iterable<Scalar<T>> items) {
-        this.items = items;
+    public Min(final Iterable<Scalar<T>> iterable) {
+        this.items = iterable;
     }
 
     @Override

diff --git a/src/main/java/org/cactoos/scalar/Not.java b/src/main/java/org/cactoos/scalar/Not.java
@@ -43,10 +43,10 @@ public final class Not implements Scalar<Boolean> {
 
     /**
      * Ctor.
-     * @param origin The scalar
+     * @param scalar The scalar
      */
-    public Not(final Scalar<Boolean> origin) {
-        this.origin = origin;
+    public Not(final Scalar<Boolean> scalar) {
+        this.origin = scalar;
     }
 
     @Override

diff --git a/src/main/java/org/cactoos/scalar/Or.java b/src/main/java/org/cactoos/scalar/Or.java
@@ -40,29 +40,29 @@ public final class Or implements Scalar<Boolean> {
     /**
      * The iterator.
      */
-    private final Iterable<Scalar<Boolean>> iterable;
+    private final Iterable<Scalar<Boolean>> origin;
 
     /**
      * Ctor.
-     * @param src The iterable
+     * @param scalar The Scalar.
      */
     @SafeVarargs
-    public Or(final Scalar<Boolean>... src) {
-        this(new IterableOf<>(src));
+    public Or(final Scalar<Boolean>... scalar) {
+        this(new IterableOf<>(scalar));
     }
 
     /**
      * Ctor.
-     * @param src The iterable
+     * @param iterable The iterable.
      */
-    public Or(final Iterable<Scalar<Boolean>> src) {
-        this.iterable = src;
+    public Or(final Iterable<Scalar<Boolean>> iterable) {
+        this.origin = iterable;
     }
 
     @Override
     public Boolean value() throws Exception {
         boolean result = false;
-        for (final Scalar<Boolean> item : this.iterable) {
+        for (final Scalar<Boolean> item : this.origin) {
             if (item.value()) {
                 result = true;
                 break;

diff --git a/src/main/java/org/cactoos/scalar/RetryScalar.java b/src/main/java/org/cactoos/scalar/RetryScalar.java
@@ -42,46 +42,47 @@ public final class RetryScalar<T> implements Scalar<T> {
     /**
      * Original scalar.
      */
-    private final Scalar<T> scalar;
+    private final Scalar<T> origin;
 
     /**
      * Exit condition.
      */
-    private final Func<Integer, Boolean> exit;
+    private final Func<Integer, Boolean> func;
 
     /**
      * Ctor.
-     * @param slr Scalar original
+     * @param scalar Scalar original
      */
-    public RetryScalar(final Scalar<T> slr) {
+    public RetryScalar(final Scalar<T> scalar) {
         // @checkstyle MagicNumberCheck (1 line)
-        this(slr, 3);
+        this(scalar, 3);
     }
 
     /**
      * Ctor.
-     * @param slr Scalar original
+     * @param scalar Scalar original
      * @param attempts Maximum number of attempts
      */
-    public RetryScalar(final Scalar<T> slr, final int attempts) {
-        this(slr, attempt -> attempt >= attempts);
+    public RetryScalar(final Scalar<T> scalar, final int attempts) {
+        this(scalar, attempt -> attempt >= attempts);
     }
 
     /**
      * Ctor.
-     * @param slr Func original
-     * @param ext Exit condition, returns TRUE if there is no more reason to try
+     * @param scalar Func original
+     * @param exit Exit condition, returns TRUE if there is no reason to try
      */
-    public RetryScalar(final Scalar<T> slr, final Func<Integer, Boolean> ext) {
-        this.scalar = slr;
-        this.exit = ext;
+    public RetryScalar(final Scalar<T> scalar,
+        final Func<Integer, Boolean> exit) {
+        this.origin = scalar;
+        this.func = exit;
     }
 
     @Override
     public T value() throws Exception {
         return new RetryFunc<>(
-            (Func<Boolean, T>) input -> this.scalar.value(),
-            this.exit
+            (Func<Boolean, T>) input -> this.origin.value(),
+            this.func
         ).apply(true);
     }
 }
diff --git a/src/main/java/org/cactoos/scalar/StickyScalar.java b/src/main/java/org/cactoos/scalar/StickyScalar.java
@@ -51,11 +51,11 @@ public final class StickyScalar<T> implements Scalar<T> {
 
     /**
      * Ctor.
-     * @param src The Scalar to cache
+     * @param scalar The Scalar to cache
      */
-    public StickyScalar(final Scalar<T> src) {
+    public StickyScalar(final Scalar<T> scalar) {
         this.func = new StickyFunc<>(
-            input -> src.value()
+            input -> scalar.value()
         );
     }
 

diff --git a/src/main/java/org/cactoos/scalar/SyncScalar.java b/src/main/java/org/cactoos/scalar/SyncScalar.java
@@ -38,12 +38,12 @@ public final class SyncScalar<T> implements Scalar<T> {
     /**
      * The scalar to cache.
      */
-    private final Scalar<T> source;
+    private final Scalar<T> origin;
 
     /**
      * Sync lock.
      */
-    private final Object lck;
+    private final Object mutex;
 
     /**
      * Ctor.
@@ -55,18 +55,18 @@ public SyncScalar(final Scalar<T> src) {
 
     /**
      * Ctor.
-     * @param src The Scalar to cache
-     * @param lck Sync lock
+     * @param scalar The Scalar to cache
+     * @param lock Sync lock
      */
-    public SyncScalar(final Scalar<T> src, final Object lck) {
-        this.source = src;
-        this.lck = lck;
+    public SyncScalar(final Scalar<T> scalar, final Object lock) {
+        this.origin = scalar;
+        this.mutex = lock;
     }
 
     @Override
     public T value() throws Exception {
-        synchronized (this.lck) {
-            return this.source.value();
+        synchronized (this.mutex) {
+            return this.origin.value();
         }
     }
 }