#176: renames and more ctors

yegor256 · Jun 19, 2017 · f9b77f4 · f9b77f4
1 parent 5fcdcb6
commit f9b77f4
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 25 deletions.
diff --git a/...rg/cactoos/list/ConcatenatedIterable.java → ...java/org/cactoos/list/ConcatIterable.java b/...rg/cactoos/list/ConcatenatedIterable.java → ...java/org/cactoos/list/ConcatIterable.java
@@ -36,7 +36,7 @@
  * @param <T> Type of item
  * @since 0.1
  */
-public final class ConcatenatedIterable<T> implements Iterable<T> {
+public final class ConcatIterable<T> implements Iterable<T> {
 
     /**
      * Iterables.
@@ -49,22 +49,22 @@ public final class ConcatenatedIterable<T> implements Iterable<T> {
      */
     @SafeVarargs
     @SuppressWarnings("varargs")
-    public ConcatenatedIterable(final Iterable<T>... items) {
+    public ConcatIterable(final Iterable<T>... items) {
         this(new IterableAsList<>(items));
     }
 
     /**
      * Ctor.
      * @param items Items to concatenate
      */
-    public ConcatenatedIterable(final Iterable<Iterable<T>> items) {
+    public ConcatIterable(final Iterable<Iterable<T>> items) {
         this.list = items;
     }
 
     @Override
     public Iterator<T> iterator() {
-        return new ConcatenatedIterator<>(
-            new TransformedIterable<>(
+        return new ConcatIterator<>(
+            new MappedIterable<>(
                 this.list,
                 new StickyFunc<>(Iterable::iterator)
             )

diff --git a/...rg/cactoos/list/ConcatenatedIterator.java → ...java/org/cactoos/list/ConcatIterator.java b/...rg/cactoos/list/ConcatenatedIterator.java → ...java/org/cactoos/list/ConcatIterator.java
@@ -35,7 +35,7 @@
  * @param <T> Type of item
  * @since 0.1
  */
-public final class ConcatenatedIterator<T> implements Iterator<T> {
+public final class ConcatIterator<T> implements Iterator<T> {
 
     /**
      * Iterables.
@@ -48,15 +48,15 @@ public final class ConcatenatedIterator<T> implements Iterator<T> {
      */
     @SafeVarargs
     @SuppressWarnings("varargs")
-    public ConcatenatedIterator(final Iterator<T>... items) {
+    public ConcatIterator(final Iterator<T>... items) {
         this(new IterableAsList<>(items));
     }
 
     /**
      * Ctor.
      * @param items Items to concatenate
      */
-    public ConcatenatedIterator(final Iterable<Iterator<T>> items) {
+    public ConcatIterator(final Iterable<Iterator<T>> items) {
         this.list = items;
     }
 

diff --git a/src/main/java/org/cactoos/list/IterableAsBooleans.java b/src/main/java/org/cactoos/list/IterableAsBooleans.java
@@ -74,7 +74,7 @@ public IterableAsBooleans(final Iterable<X> src,
 
     @Override
     public Iterator<Boolean> iterator() {
-        return new TransformedIterator<>(
+        return new MappedIterator<>(
             this.iterable.iterator(),
             this.func
         );

diff --git a/src/main/java/org/cactoos/list/MapAsProperties.java b/src/main/java/org/cactoos/list/MapAsProperties.java
@@ -23,6 +23,7 @@
  */
 package org.cactoos.list;
 
+import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Properties;
 import org.cactoos.Scalar;
@@ -45,6 +46,23 @@ public final class MapAsProperties implements Scalar<Properties> {
      */
     private final UncheckedScalar<Properties> result;
 
+    /**
+     * Ctor.
+     * @param entries The map with properties
+     */
+    public MapAsProperties(final Map.Entry<?, ?>... entries) {
+        this(
+            new IterableAsMap<>(
+                new MappedIterable<Map.Entry<?, ?>, Map.Entry<String, String>>(
+                    new ArrayAsIterable<>(entries),
+                    input -> new AbstractMap.SimpleEntry<>(
+                        input.getKey().toString(), input.getValue().toString()
+                    )
+                )
+            )
+        );
+    }
+
     /**
      * Ctor.
      * @param map The map with properties

diff --git a/...org/cactoos/list/TransformedIterable.java → ...java/org/cactoos/list/MappedIterable.java b/...org/cactoos/list/TransformedIterable.java → ...java/org/cactoos/list/MappedIterable.java
@@ -27,7 +27,7 @@
 import org.cactoos.Func;
 
 /**
- * Transformed iterable.
+ * Mapped iterable.
  *
  * <p>There is no thread-safety guarantee.
  *
@@ -37,7 +37,7 @@
  * @param <Y> Type of target item
  * @since 0.1
  */
-public final class TransformedIterable<X, Y> implements Iterable<Y> {
+public final class MappedIterable<X, Y> implements Iterable<Y> {
 
     /**
      * Iterable.
@@ -54,14 +54,14 @@ public final class TransformedIterable<X, Y> implements Iterable<Y> {
      * @param src Source iterable
      * @param fnc Func
      */
-    public TransformedIterable(final Iterable<X> src, final Func<X, Y> fnc) {
+    public MappedIterable(final Iterable<X> src, final Func<X, Y> fnc) {
         this.iterable = src;
         this.func = fnc;
     }
 
     @Override
     public Iterator<Y> iterator() {
-        return new TransformedIterator<>(
+        return new MappedIterator<>(
             this.iterable.iterator(), this.func
         );
     }

diff --git a/...org/cactoos/list/TransformedIterator.java → ...java/org/cactoos/list/MappedIterator.java b/...org/cactoos/list/TransformedIterator.java → ...java/org/cactoos/list/MappedIterator.java
@@ -28,7 +28,7 @@
 import org.cactoos.func.UncheckedFunc;
 
 /**
- * Transformed iterator.
+ * Mapped iterator.
  *
  * <p>There is no thread-safety guarantee.
  *
@@ -38,7 +38,7 @@
  * @param <Y> Type of target item
  * @since 0.1
  */
-public final class TransformedIterator<X, Y> implements Iterator<Y> {
+public final class MappedIterator<X, Y> implements Iterator<Y> {
 
     /**
      * Iterator.
@@ -55,7 +55,7 @@ public final class TransformedIterator<X, Y> implements Iterator<Y> {
      * @param src Source iterable
      * @param fnc Func
      */
-    public TransformedIterator(final Iterator<X> src, final Func<X, Y> fnc) {
+    public MappedIterator(final Iterator<X> src, final Func<X, Y> fnc) {
         this.iterator = src;
         this.func = fnc;
     }

diff --git a/src/test/java/org/cactoos/list/AllOfTest.java b/src/test/java/org/cactoos/list/AllOfTest.java
@@ -49,7 +49,7 @@ public void iteratesList() {
         MatcherAssert.assertThat(
             "Can't iterate a list with a procedure",
             new AllOf(
-                new TransformedIterable<>(
+                new MappedIterable<>(
                     new ArrayAsIterable<>("hello", "world"),
                     list::add
                 )

diff --git a/src/test/java/org/cactoos/list/AnyOfTest.java b/src/test/java/org/cactoos/list/AnyOfTest.java
@@ -41,7 +41,7 @@ public void iteratesList() {
         MatcherAssert.assertThat(
             "Can't iterate a list",
             new AnyOf(
-                new TransformedIterable<>(
+                new MappedIterable<>(
                     new ArrayAsIterable<>("a", "file", "is", "corrupt"),
                     txt -> txt.length() > 2
                 )

diff --git a/...actoos/list/ConcatenatedIterableTest.java → .../org/cactoos/list/ConcatIterableTest.java b/...actoos/list/ConcatenatedIterableTest.java → .../org/cactoos/list/ConcatIterableTest.java
@@ -28,21 +28,21 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link ConcatenatedIterable}.
+ * Test case for {@link ConcatIterable}.
  * @author Yegor Bugayenko (yegor256@gmail.com)
  * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
-public final class ConcatenatedIterableTest {
+public final class ConcatIterableTest {
 
     @Test
     @SuppressWarnings("unchecked")
     public void transformsList() {
         MatcherAssert.assertThat(
             "Can't concatenate iterables together",
             new LengthOfIterable(
-                new ConcatenatedIterable<>(
+                new ConcatIterable<>(
                     new ArrayAsIterable<>("hello", "world", "друг"),
                     new ArrayAsIterable<>("how", "are", "you"),
                     new ArrayAsIterable<>("what's", "up")

diff --git a/...cactoos/list/TransformedIterableTest.java → .../org/cactoos/list/MappedIterableTest.java b/...cactoos/list/TransformedIterableTest.java → .../org/cactoos/list/MappedIterableTest.java
@@ -33,19 +33,19 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link TransformedIterable}.
+ * Test case for {@link MappedIterable}.
  * @author Yegor Bugayenko (yegor256@gmail.com)
  * @version $Id$
  * @since 0.1
  * @checkstyle JavadocMethodCheck (500 lines)
  */
-public final class TransformedIterableTest {
+public final class MappedIterableTest {
 
     @Test
     public void transformsList() throws IOException {
         MatcherAssert.assertThat(
             "Can't transform an iterable",
-            new TransformedIterable<String, Text>(
+            new MappedIterable<String, Text>(
                 new ArrayAsIterable<>(
                     "hello", "world", "друг"
                 ),
@@ -59,7 +59,7 @@ public void transformsList() throws IOException {
     public void transformsEmptyList() {
         MatcherAssert.assertThat(
             "Can't transform an empty iterable",
-            new TransformedIterable<String, Text>(
+            new MappedIterable<String, Text>(
                 Collections.emptyList(),
                 input -> new UpperText(new StringAsText(input))
             ),