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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 216e3fda5 Update deprecated call sites
216e3fda5 is described below
commit 216e3fda5d7d0438cfa3f8d5657c5d96d6a9d3e0
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Sep 22 08:50:59 2024 -0400
Update deprecated call sites
---
.../apache/commons/lang3/StringEscapeUtils.java | 4 +--
.../java/org/apache/commons/lang3/StringUtils.java | 14 ++++-----
.../org/apache/commons/lang3/text/StrBuilder.java | 2 +-
.../commons/lang3/time/DurationFormatUtils.java | 34 +++++++++++++++-------
4 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
index aa0b8662a..bfc455ee1 100644
--- a/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringEscapeUtils.java
@@ -63,7 +63,7 @@ public class StringEscapeUtils {
out.write(input.toString());
} else {
out.write(CSV_QUOTE);
- out.write(StringUtils.replace(input.toString(), CSV_QUOTE_STR,
CSV_QUOTE_STR + CSV_QUOTE_STR));
+ out.write(Strings.CS.replace(input.toString(), CSV_QUOTE_STR,
CSV_QUOTE_STR + CSV_QUOTE_STR));
out.write(CSV_QUOTE);
}
return Character.codePointCount(input, 0, input.length());
@@ -94,7 +94,7 @@ public class StringEscapeUtils {
if ( StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS) ) {
// deal with escaped quotes; ie) ""
- out.write(StringUtils.replace(quoteless, CSV_QUOTE_STR +
CSV_QUOTE_STR, CSV_QUOTE_STR));
+ out.write(Strings.CS.replace(quoteless, CSV_QUOTE_STR +
CSV_QUOTE_STR, CSV_QUOTE_STR));
} else {
out.write(input.toString());
}
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java
b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 6284bc11b..6b359bcf2 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -720,7 +720,7 @@ public class StringUtils {
*/
@Deprecated
public static String chomp(final String str, final String separator) {
- return removeEnd(str, separator);
+ return Strings.CS.removeEnd(str, separator);
}
/**
@@ -1717,7 +1717,7 @@ public class StringUtils {
return false;
}
for (final CharSequence searchString : searchStrings) {
- if (endsWith(sequence, searchString)) {
+ if (Strings.CS.endsWith(sequence, searchString)) {
return true;
}
}
@@ -5711,7 +5711,7 @@ public class StringUtils {
if (isEmpty(str) || isEmpty(remove)) {
return str;
}
- return replace(str, remove, EMPTY, -1);
+ return Strings.CS.replace(str, remove, EMPTY, -1);
}
/**
@@ -5907,7 +5907,7 @@ public class StringUtils {
* @since 3.5
*/
public static String removeIgnoreCase(final String str, final String
remove) {
- return replaceIgnoreCase(str, remove, EMPTY, -1);
+ return Strings.CI.replace(str, remove, EMPTY, -1);
}
/**
@@ -6148,7 +6148,7 @@ public class StringUtils {
}
// given that repeat(String, int) is quite optimized, better to rely
on it than try and splice this into it
final String result = repeat(str + separator, repeat);
- return removeEnd(result, separator);
+ return Strings.CS.removeEnd(result, separator);
}
/**
@@ -7833,7 +7833,7 @@ public class StringUtils {
return false;
}
for (final CharSequence searchString : searchStrings) {
- if (startsWith(sequence, searchString)) {
+ if (Strings.CS.startsWith(sequence, searchString)) {
return true;
}
}
@@ -9116,7 +9116,7 @@ public class StringUtils {
return str;
}
- if (startsWith(str, wrapToken) && endsWith(str, wrapToken)) {
+ if (Strings.CS.startsWith(str, wrapToken) && Strings.CS.endsWith(str,
wrapToken)) {
return str.substring(wrapToken.length(),
str.lastIndexOf(wrapToken));
}
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 6f907a8f1..e70c9f3f4 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -2036,7 +2036,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* @return the first index of the string, or -1 if not found
*/
public int indexOf(final String str, final int startIndex) {
- return StringUtils.indexOf(this, str, startIndex);
+ return Strings.CS.indexOf(this, str, startIndex);
}
/**
diff --git
a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
index 4ce849039..2c7d0c134 100644
--- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java
@@ -26,6 +26,7 @@ import java.util.TimeZone;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.Validate;
/**
@@ -438,13 +439,16 @@ public class DurationFormatUtils {
if (suppressLeadingZeroElements) {
// this is a temporary marker on the front. Like ^ in regexp.
duration = " " + duration;
- String tmp = StringUtils.replaceOnce(duration, " 0 days",
StringUtils.EMPTY);
+ final String text = duration;
+ String tmp = Strings.CS.replaceOnce(text, " 0 days",
StringUtils.EMPTY);
if (tmp.length() != duration.length()) {
duration = tmp;
- tmp = StringUtils.replaceOnce(duration, " 0 hours",
StringUtils.EMPTY);
+ final String text1 = duration;
+ tmp = Strings.CS.replaceOnce(text1, " 0 hours",
StringUtils.EMPTY);
if (tmp.length() != duration.length()) {
duration = tmp;
- tmp = StringUtils.replaceOnce(duration, " 0 minutes",
StringUtils.EMPTY);
+ final String text2 = duration;
+ tmp = Strings.CS.replaceOnce(text2, " 0 minutes",
StringUtils.EMPTY);
duration = tmp;
}
}
@@ -454,25 +458,33 @@ public class DurationFormatUtils {
}
}
if (suppressTrailingZeroElements) {
- String tmp = StringUtils.replaceOnce(duration, " 0 seconds",
StringUtils.EMPTY);
+ final String text = duration;
+ String tmp = Strings.CS.replaceOnce(text, " 0 seconds",
StringUtils.EMPTY);
if (tmp.length() != duration.length()) {
duration = tmp;
- tmp = StringUtils.replaceOnce(duration, " 0 minutes",
StringUtils.EMPTY);
+ final String text1 = duration;
+ tmp = Strings.CS.replaceOnce(text1, " 0 minutes",
StringUtils.EMPTY);
if (tmp.length() != duration.length()) {
duration = tmp;
- tmp = StringUtils.replaceOnce(duration, " 0 hours",
StringUtils.EMPTY);
+ final String text2 = duration;
+ tmp = Strings.CS.replaceOnce(text2, " 0 hours",
StringUtils.EMPTY);
if (tmp.length() != duration.length()) {
- duration = StringUtils.replaceOnce(tmp, " 0 days",
StringUtils.EMPTY);
+ final String text3 = tmp;
+ duration = Strings.CS.replaceOnce(text3, " 0 days",
StringUtils.EMPTY);
}
}
}
}
// handle plurals
duration = " " + duration;
- duration = StringUtils.replaceOnce(duration, " 1 seconds", " 1
second");
- duration = StringUtils.replaceOnce(duration, " 1 minutes", " 1
minute");
- duration = StringUtils.replaceOnce(duration, " 1 hours", " 1 hour");
- duration = StringUtils.replaceOnce(duration, " 1 days", " 1 day");
+ final String text = duration;
+ duration = Strings.CS.replaceOnce(text, " 1 seconds", " 1 second");
+ final String text1 = duration;
+ duration = Strings.CS.replaceOnce(text1, " 1 minutes", " 1 minute");
+ final String text2 = duration;
+ duration = Strings.CS.replaceOnce(text2, " 1 hours", " 1 hour");
+ final String text3 = duration;
+ duration = Strings.CS.replaceOnce(text3, " 1 days", " 1 day");
return duration.trim();
}
