Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LANG-1675 - Improve performance of StringUtils.join for primitives - preview #4

Closed
wants to merge 4 commits into from
Closed

LANG-1675 - Improve performance of StringUtils.join for primitives - preview #4

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db16c58
String.join - boolean - use StringBuilder
HubertWo Oct 9, 2021
e31a723
Replaced StringJoiner by StringBuilder
HubertWo Oct 9, 2021
1fe3e64
Fix: formatting, removed condition in for
HubertWo Oct 9, 2021
f2f6cd9
Merge branch 'apache:master' into fix/LANG-1675_string_join_refactor
HubertWo Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 57 additions & 39 deletions src/main/java/org/apache/commons/lang3/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3930,11 +3930,15 @@ public static String join(final boolean[] array, final char delimiter, final int
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4007,11 +4011,15 @@ public static String join(final byte[] array, final char delimiter, final int st
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4084,11 +4092,15 @@ public static String join(final char[] array, final char delimiter, final int st
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4161,11 +4173,15 @@ public static String join(final double[] array, final char delimiter, final int
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4238,11 +4254,15 @@ public static String join(final float[] array, final char delimiter, final int s
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4315,11 +4335,15 @@ public static String join(final int[] array, final char delimiter, final int sta
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4601,11 +4625,15 @@ public static String join(final long[] array, final char delimiter, final int st
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -4664,17 +4692,7 @@ public static String join(final Object[] array, final char delimiter) {
* @since 2.0
*/
public static String join(final Object[] array, final char delimiter, final int startIndex, final int endIndex) {
if (array == null) {
return null;
}
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
for (int i = startIndex; i < endIndex; i++) {
joiner.add(toStringOrEmpty(array[i]));
}
return joiner.toString();
return join(array, String.valueOf(delimiter), startIndex, endIndex);
}

/**
Expand Down Expand Up @@ -4826,11 +4844,15 @@ public static String join(final short[] array, final char delimiter, final int s
if (endIndex - startIndex <= 0) {
return EMPTY;
}
final StringJoiner joiner = newStringJoiner(delimiter);
final StringBuilder stringBuilder = new StringBuilder();
for (int i = startIndex; i < endIndex; i++) {
joiner.add(String.valueOf(array[i]));
stringBuilder
.append(array[i])
.append(delimiter);
}
return joiner.toString();
return stringBuilder
.deleteCharAt(stringBuilder.length() - 1)
.toString();
}

/**
Expand Down Expand Up @@ -5522,10 +5544,6 @@ public static String mid(final String str, int pos, final int len) {
return str.substring(pos, pos + len);
}

private static StringJoiner newStringJoiner(final char delimiter) {
return new StringJoiner(String.valueOf(delimiter));
}

/**
* <p>
* Similar to <a
Expand Down