Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Jun 23, 2017
2 parents 5fa946b + 7fcc2be commit 9c44ae7
Show file tree
Hide file tree
Showing 2 changed files with 175 additions and 0 deletions.
113 changes: 113 additions & 0 deletions src/main/java/org/cactoos/text/JoinedText.java
@@ -0,0 +1,113 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.cactoos.text;

import java.io.IOException;
import java.util.StringJoiner;
import org.cactoos.Text;
import org.cactoos.list.ArrayAsIterable;
import org.cactoos.list.MappedIterable;

/**
* Join a Text.
*
* <p>There is no thread-safety guarantee.
*
* @author Fabricio Cabral (fabriciofx@gmail.com)
* @version $Id$
* @since 0.9
*/
public final class JoinedText implements Text {

/**
* The texts.
*/
private final Iterable<Text> texts;

/**
* The delimiter.
*/
private final Text delimiter;

/**
* Ctor.
* @param delimiter Delimit among texts
* @param texts Texts to be joined
*/
public JoinedText(final String delimiter, final String... texts) {
this(
new StringAsText(delimiter),
new MappedIterable<>(
new ArrayAsIterable<>(texts),
text -> new StringAsText(text)
)
);
}

/**
* Ctor.
* @param delimiter Delimit among texts
* @param texts Texts 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);
}

/**
* Ctor.
* @param delimiter Delimit among texts
* @param texts Texts to be joined
*/
public JoinedText(final Text delimiter, final Text... texts) {
this(delimiter, new ArrayAsIterable<>(texts));
}

/**
* Ctor.
* @param delimiter Delimit among texts
* @param texts Texts to be joined
*/
public JoinedText(final Text delimiter, final Iterable<Text> texts) {
this.delimiter = delimiter;
this.texts = texts;
}

@Override
public String asString() throws IOException {
final StringJoiner joint = new StringJoiner(this.delimiter.asString());
for (final Text text : this.texts) {
joint.add(text.asString());
}
return joint.toString();
}
}
62 changes: 62 additions & 0 deletions src/test/java/org/cactoos/text/JoinedTextTest.java
@@ -0,0 +1,62 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.cactoos.text;

import java.io.IOException;
import org.cactoos.TextHasString;
import org.hamcrest.MatcherAssert;
import org.junit.Test;

/**
* Test case for {@link JoinedText}.
* @author Fabricio Cabral (fabriciofx@gmail.com)
* @version $Id$
* @since 0.9
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class JoinedTextTest {

@Test
public void joinsStrings() throws IOException {
MatcherAssert.assertThat(
"Can't join strings",
new JoinedText(" ", "hello", "world"),
new TextHasString("hello world")
);
}

@Test
public void joinsTexts() throws IOException {
MatcherAssert.assertThat(
"Can't join texts",
new JoinedText(
" ",
new StringAsText("foo"),
new StringAsText("bar")
),
new TextHasString("foo bar")
);
}

}

0 comments on commit 9c44ae7

Please sign in to comment.