Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify some if statements in StringUtils. (#521) 

* Simplify if-else statements at the start of abbreviate().

* Combine if statements in abbreviateMiddle().

* Simplify the first if condition of substringBetween().

* Simplify the first if condition of stripAll().
This commit is contained in:
Isira Seneviratne 2020-04-20 20:52:56 +00:00 committed by GitHub
parent f13f787a66
commit 675d30d882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/apache/commons/lang3/StringUtils.java
View File

@ -330,11 +330,9 @@ public static String abbreviate(final String str, final String abbrevMarker, fin
* @since 3.6
*/
public static String abbreviate(final String str, final String abbrevMarker, int offset, final int maxWidth) {
if (isEmpty(str) && isEmpty(abbrevMarker)) {
return str;
} else if (isNotEmpty(str) && EMPTY.equals(abbrevMarker) && maxWidth > 0) {
return str.substring(0, maxWidth);
} else if (isEmpty(str) || isEmpty(abbrevMarker)) {
if (isNotEmpty(str) && EMPTY.equals(abbrevMarker) && maxWidth > 0) {
return substring(str, 0, maxWidth);
} else if (isAnyEmpty(str, abbrevMarker)) {
return str;
}
final int abbrevMarkerLength = abbrevMarker.length();
@ -395,11 +393,7 @@ public static String abbreviate(final String str, final String abbrevMarker, int
* @since 2.5
*/
public static String abbreviateMiddle(final String str, final String middle, final int length) {
if (isEmpty(str) || isEmpty(middle)) {
return str;
}
if (length >= str.length() || length < middle.length()+2) {
if (isAnyEmpty(str, middle) || length >= str.length() || length < middle.length()+2) {
return str;
}
@ -8274,8 +8268,8 @@ public static String[] stripAll(final String... strs) {
* @return the stripped Strings, {@code null} if null array input
*/
public static String[] stripAll(final String[] strs, final String stripChars) {
int strsLen;
if (strs == null || (strsLen = strs.length) == 0) {
int strsLen = ArrayUtils.getLength(strs);
if (strsLen == 0) {
return strs;
}
final String[] newArr = new String[strsLen];
@ -8772,7 +8766,7 @@ public static String substringBetween(final String str, final String tag) {
* @since 2.0
*/
public static String substringBetween(final String str, final String open, final String close) {
if (str == null || open == null || close == null) {
if (!ObjectUtils.allNotNull(str, open, close)) {
return null;
}
final int start = str.indexOf(open);