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

Adding green regionMatches implementation and moving endsWith and startsWith methods to use it; thus giving them CharSequence based APIs. LANG-687 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1089540 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2011-04-06 17:21:36 +00:00
parent 5b8fd90207
commit 3af0fd99d1
1 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6103,7 +6103,7 @@ allows us to retain the previous cost counts as required by the algorithm (takin
//-----------------------------------------------------------------------
/**
* <p>Check if a String starts with a specified prefix.</p>
* <p>Check if a CharSequence starts with a specified prefix.</p>
*
* <p>{@code null}s are handled without exceptions. Two {@code null}
* references are considered to be equal. The comparison is case sensitive.</p>
@ -6117,18 +6117,18 @@ allows us to retain the previous cost counts as required by the algorithm (takin
* </pre>
*
* @see java.lang.String#startsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param prefix the prefix to find, may be null
* @return {@code true} if the String starts with the prefix, case sensitive, or
* @return {@code true} if the CharSequence starts with the prefix, case sensitive, or
* both {@code null}
* @since 2.4
*/
public static boolean startsWith(String str, String prefix) {
public static boolean startsWith(CharSequence str, CharSequence prefix) {
return startsWith(str, prefix, false);
}
/**
* <p>Case insensitive check if a String starts with a specified prefix.</p>
* <p>Case insensitive check if a CharSequence starts with a specified prefix.</p>
*
* <p>{@code null}s are handled without exceptions. Two {@code null}
* references are considered to be equal. The comparison is case insensitive.</p>
@ -6142,39 +6142,39 @@ public static boolean startsWith(String str, String prefix) {
* </pre>
*
* @see java.lang.String#startsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param prefix the prefix to find, may be null
* @return {@code true} if the String starts with the prefix, case insensitive, or
* @return {@code true} if the CharSequence starts with the prefix, case insensitive, or
* both {@code null}
* @since 2.4
*/
public static boolean startsWithIgnoreCase(String str, String prefix) {
public static boolean startsWithIgnoreCase(CharSequence str, CharSequence prefix) {
return startsWith(str, prefix, true);
}
/**
* <p>Check if a String starts with a specified prefix (optionally case insensitive).</p>
* <p>Check if a CharSequence starts with a specified prefix (optionally case insensitive).</p>
*
* @see java.lang.String#startsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param prefix the prefix to find, may be null
* @param ignoreCase inidicates whether the compare should ignore case
* (case insensitive) or not.
* @return {@code true} if the String starts with the prefix or
* @return {@code true} if the CharSequence starts with the prefix or
* both {@code null}
*/
private static boolean startsWith(String str, String prefix, boolean ignoreCase) {
private static boolean startsWith(CharSequence str, CharSequence prefix, boolean ignoreCase) {
if (str == null || prefix == null) {
return (str == null && prefix == null);
}
if (prefix.length() > str.length()) {
return false;
}
return str.regionMatches(ignoreCase, 0, prefix, 0, prefix.length());
return regionMatchesSequence(str, ignoreCase, 0, prefix, 0, prefix.length());
}
/**
* <p>Check if a String starts with any of an array of specified strings.</p>
* <p>Check if a CharSequence starts with any of an array of specified strings.</p>
*
* <pre>
* StringUtils.startsWithAny(null, null) = false
@ -6185,18 +6185,18 @@ private static boolean startsWith(String str, String prefix, boolean ignoreCase)
* StringUtils.startsWithAny("abcxyz", new String[] {null, "xyz", "abc"}) = true
* </pre>
*
* @param string the String to check, may be null
* @param searchStrings the Strings to find, may be null or empty
* @return {@code true} if the String starts with any of the the prefixes, case insensitive, or
* @param string the CharSequence to check, may be null
* @param searchStrings the CharSequences to find, may be null or empty
* @return {@code true} if the CharSequence starts with any of the the prefixes, case insensitive, or
* both {@code null}
* @since 2.5
*/
public static boolean startsWithAny(String string, String... searchStrings) {
public static boolean startsWithAny(CharSequence string, CharSequence... searchStrings) {
if (isEmpty(string) || ArrayUtils.isEmpty(searchStrings)) {
return false;
}
for (int i = 0; i < searchStrings.length; i++) {
String searchString = searchStrings[i];
CharSequence searchString = searchStrings[i];
if (StringUtils.startsWith(string, searchString)) {
return true;
}
@ -6208,7 +6208,7 @@ public static boolean startsWithAny(String string, String... searchStrings) {
//-----------------------------------------------------------------------
/**
* <p>Check if a String ends with a specified suffix.</p>
* <p>Check if a CharSequence ends with a specified suffix.</p>
*
* <p>{@code null}s are handled without exceptions. Two {@code null}
* references are considered to be equal. The comparison is case sensitive.</p>
@ -6223,18 +6223,18 @@ public static boolean startsWithAny(String string, String... searchStrings) {
* </pre>
*
* @see java.lang.String#endsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param suffix the suffix to find, may be null
* @return {@code true} if the String ends with the suffix, case sensitive, or
* @return {@code true} if the CharSequence ends with the suffix, case sensitive, or
* both {@code null}
* @since 2.4
*/
public static boolean endsWith(String str, String suffix) {
public static boolean endsWith(CharSequence str, CharSequence suffix) {
return endsWith(str, suffix, false);
}
/**
* <p>Case insensitive check if a String ends with a specified suffix.</p>
* <p>Case insensitive check if a CharSequence ends with a specified suffix.</p>
*
* <p>{@code null}s are handled without exceptions. Two {@code null}
* references are considered to be equal. The comparison is case insensitive.</p>
@ -6249,28 +6249,28 @@ public static boolean endsWith(String str, String suffix) {
* </pre>
*
* @see java.lang.String#endsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param suffix the suffix to find, may be null
* @return {@code true} if the String ends with the suffix, case insensitive, or
* @return {@code true} if the CharSequence ends with the suffix, case insensitive, or
* both {@code null}
* @since 2.4
*/
public static boolean endsWithIgnoreCase(String str, String suffix) {
public static boolean endsWithIgnoreCase(CharSequence str, CharSequence suffix) {
return endsWith(str, suffix, true);
}
/**
* <p>Check if a String ends with a specified suffix (optionally case insensitive).</p>
* <p>Check if a CharSequence ends with a specified suffix (optionally case insensitive).</p>
*
* @see java.lang.String#endsWith(String)
* @param str the String to check, may be null
* @param str the CharSequence to check, may be null
* @param suffix the suffix to find, may be null
* @param ignoreCase inidicates whether the compare should ignore case
* (case insensitive) or not.
* @return {@code true} if the String starts with the prefix or
* @return {@code true} if the CharSequence starts with the prefix or
* both {@code null}
*/
private static boolean endsWith(String str, String suffix, boolean ignoreCase) {
private static boolean endsWith(CharSequence str, CharSequence suffix, boolean ignoreCase) {
if (str == null || suffix == null) {
return str == null && suffix == null;
}
@ -6278,7 +6278,7 @@ private static boolean endsWith(String str, String suffix, boolean ignoreCase) {
return false;
}
int strOffset = str.length() - suffix.length();
return str.regionMatches(ignoreCase, strOffset, suffix, 0, suffix.length());
return regionMatchesSequence(str, ignoreCase, strOffset, suffix, 0, suffix.length());
}
/**
@ -6330,7 +6330,7 @@ public static String normalizeSpace(String str) {
}
/**
* <p>Check if a String ends with any of an array of specified strings.</p>
* <p>Check if a CharSequence ends with any of an array of specified strings.</p>
*
* <pre>
* StringUtils.endsWithAny(null, null) = false
@ -6341,18 +6341,18 @@ public static String normalizeSpace(String str) {
* StringUtils.endsWithAny("abcxyz", new String[] {null, "xyz", "abc"}) = true
* </pre>
*
* @param string the String to check, may be null
* @param searchStrings the Strings to find, may be null or empty
* @return {@code true} if the String ends with any of the the prefixes, case insensitive, or
* @param string the CharSequence to check, may be null
* @param searchStrings the CharSequences to find, may be null or empty
* @return {@code true} if the CharSequence ends with any of the the prefixes, case insensitive, or
* both {@code null}
* @since 3.1
*/
public static boolean endsWithAny(String string, String... searchStrings) {
public static boolean endsWithAny(CharSequence string, CharSequence... searchStrings) {
if (isEmpty(string) || ArrayUtils.isEmpty(searchStrings)) {
return false;
}
for (int i = 0; i < searchStrings.length; i++) {
String searchString = searchStrings[i];
CharSequence searchString = searchStrings[i];
if (StringUtils.endsWith(string, searchString)) {
return true;
}
@ -6491,4 +6491,15 @@ static char[] toCharArraySequence(CharSequence cs) {
}
}
static boolean regionMatchesSequence(CharSequence cs, boolean ignoreCase, int thisStart,
CharSequence substring, int start, int length)
{
if (cs instanceof String && substring instanceof String) {
return ((String) cs).regionMatches(ignoreCase, thisStart, ((String)substring), start, length);
} else {
// TODO: Implement rather than convert to String
return cs.toString().regionMatches(ignoreCase, thisStart, substring.toString(), start, length);
}
}
}