You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/09/24 14:08:31 UTC
[commons-text] 01/04: Reuse existing methods
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit 72dfb53537c8fac6f229c6678d33b3ecd2a76a22
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Sep 24 08:17:10 2022 -0400
Reuse existing methods
---
.../java/org/apache/commons/text/StrBuilder.java | 21 +++++++--------------
.../org/apache/commons/text/TextStringBuilder.java | 9 +--------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java b/src/main/java/org/apache/commons/text/StrBuilder.java
index e5530a31..f0c0099d 100644
--- a/src/main/java/org/apache/commons/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/text/StrBuilder.java
@@ -1364,14 +1364,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
*/
public StrBuilder appendWithSeparators(final Iterable<?> iterable, final String separator) {
if (iterable != null) {
- final String sep = Objects.toString(separator, StringUtils.EMPTY);
- final Iterator<?> it = iterable.iterator();
- while (it.hasNext()) {
- append(it.next());
- if (it.hasNext()) {
- append(sep);
- }
- }
+ appendWithSeparators(iterable.iterator(), separator);
}
return this;
}
@@ -1382,16 +1375,16 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
* Appending a null iterator will have no effect.
* Each object is appended using {@link #append(Object)}.
*
- * @param it the iterator to append
+ * @param iterator the iterator to append
* @param separator the separator to use, null means no separator
* @return this, to enable chaining
*/
- public StrBuilder appendWithSeparators(final Iterator<?> it, final String separator) {
- if (it != null) {
+ public StrBuilder appendWithSeparators(final Iterator<?> iterator, final String separator) {
+ if (iterator != null) {
final String sep = Objects.toString(separator, StringUtils.EMPTY);
- while (it.hasNext()) {
- append(it.next());
- if (it.hasNext()) {
+ while (iterator.hasNext()) {
+ append(iterator.next());
+ if (iterator.hasNext()) {
append(sep);
}
}
diff --git a/src/main/java/org/apache/commons/text/TextStringBuilder.java b/src/main/java/org/apache/commons/text/TextStringBuilder.java
index 21805783..1c63f828 100644
--- a/src/main/java/org/apache/commons/text/TextStringBuilder.java
+++ b/src/main/java/org/apache/commons/text/TextStringBuilder.java
@@ -1377,14 +1377,7 @@ public class TextStringBuilder implements CharSequence, Appendable, Serializable
*/
public TextStringBuilder appendWithSeparators(final Iterable<?> iterable, final String separator) {
if (iterable != null) {
- final String sep = Objects.toString(separator, StringUtils.EMPTY);
- final Iterator<?> it = iterable.iterator();
- while (it.hasNext()) {
- append(it.next());
- if (it.hasNext()) {
- append(sep);
- }
- }
+ appendWithSeparators(iterable.iterator(), separator);
}
return this;
}