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

PMD: Avoid using a branching statement as the last in a loop. 

Make deprecated code reuse main code
This commit is contained in:
Gary Gregory 2022-08-26 15:05:43 -04:00
parent 9b0e54e096
commit b6739ab929
1 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/org/apache/commons/lang3/text/StrBuilder.java
View File

@ -2457,32 +2457,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, int startIndex) {
startIndex = Math.max(startIndex, 0);
if (str == null || startIndex >= size) {
return -1;
}
final int strLen = str.length();
if (strLen == 1) {
return indexOf(str.charAt(0), startIndex);
}
if (strLen == 0) {
return startIndex;
}
if (strLen > size) {
return -1;
}
final char[] thisBuf = buffer;
final int len = size - strLen + 1;
outer:
for (int i = startIndex; i < len; i++) {
for (int j = 0; j < strLen; j++) {
if (str.charAt(j) != thisBuf[i + j]) {
continue outer;
}
}
return i;
}
return -1;
return StringUtils.indexOf(this, str, startIndex);
}
/**
@ -2583,30 +2558,7 @@ public class StrBuilder implements CharSequence, Appendable, Serializable, Build
* @return the last index of the string, or -1 if not found
*/
public int lastIndexOf(final String str, int startIndex) {
startIndex = startIndex >= size ? size - 1 : startIndex;
if (str == null || startIndex < 0) {
return -1;
}
final int strLen = str.length();
if (strLen > 0 && strLen <= size) {
if (strLen == 1) {
return lastIndexOf(str.charAt(0), startIndex);
}
outer:
for (int i = startIndex - strLen + 1; i >= 0; i--) {
for (int j = 0; j < strLen; j++) {
if (str.charAt(j) != buffer[i + j]) {
continue outer;
}
}
return i;
}
} else if (strLen == 0) {
return startIndex;
}
return -1;
return StringUtils.lastIndexOf(this, str, startIndex);
}
/**