Merge branch '__rultor'

yegor256 · Jun 27, 2017 · a21f88e · a21f88e
2 parents aba0fd2 + fa8d4a0
commit a21f88e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 33 deletions.
diff --git a/src/main/java/org/cactoos/text/JoinedText.java b/src/main/java/org/cactoos/text/JoinedText.java
@@ -52,54 +52,45 @@ public final class JoinedText implements Text {
 
     /**
      * Ctor.
-     * @param delimiter Delimit among texts
-     * @param texts Texts to be joined
+     * @param delimit Delimit among strings
+     * @param strs Strings to be joined
      */
-    public JoinedText(final String delimiter, final String... texts) {
-        this(
-            new StringAsText(delimiter),
-            new MappedIterable<>(
-                new ArrayAsIterable<>(texts),
-                text -> new StringAsText(text)
-            )
-        );
+    public JoinedText(final String delimit, final String... strs) {
+        this(delimit, new ArrayAsIterable<>(strs));
     }
 
     /**
      * Ctor.
-     * @param delimiter Delimit among texts
-     * @param texts Texts to be joined
+     * @param delimit Delimit among strings
+     * @param strs Strings to be joined
      */
-    public JoinedText(final String delimiter, final Text... texts) {
-        this(delimiter, new ArrayAsIterable<>(texts));
-    }
-
-    /**
-     * Ctor.
-     * @param delimiter Delimit among texts
-     * @param texts Texts to be joined
-     */
-    public JoinedText(final String delimiter, final Iterable<Text> texts) {
-        this(new StringAsText(delimiter), texts);
+    public JoinedText(final String delimit, final Iterable<String> strs) {
+        this(
+            new StringAsText(delimit),
+            new MappedIterable<>(
+                strs,
+                text -> new StringAsText(text)
+            )
+        );
     }
 
     /**
      * Ctor.
-     * @param delimiter Delimit among texts
-     * @param texts Texts to be joined
+     * @param delimit Delimit among texts
+     * @param txts Texts to be joined
      */
-    public JoinedText(final Text delimiter, final Text... texts) {
-        this(delimiter, new ArrayAsIterable<>(texts));
+    public JoinedText(final Text delimit, final Text... txts) {
+        this(delimit, new ArrayAsIterable<>(txts));
     }
 
     /**
      * Ctor.
-     * @param delimiter Delimit among texts
-     * @param texts Texts to be joined
+     * @param delimit Delimit among texts
+     * @param txts Texts to be joined
      */
-    public JoinedText(final Text delimiter, final Iterable<Text> texts) {
-        this.delimiter = delimiter;
-        this.texts = texts;
+    public JoinedText(final Text delimit, final Iterable<Text> txts) {
+        this.delimiter = delimit;
+        this.texts = txts;
     }
 
     @Override

diff --git a/src/test/java/org/cactoos/text/JoinedTextTest.java b/src/test/java/org/cactoos/text/JoinedTextTest.java
@@ -51,7 +51,7 @@ public void joinsTexts() throws IOException {
         MatcherAssert.assertThat(
             "Can't join texts",
             new JoinedText(
-                " ",
+                new StringAsText(" "),
                 new StringAsText("foo"),
                 new StringAsText("bar")
             ),