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

Add trimToNull 

Add trimToEmpty


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137274 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-03-24 00:47:02 +00:00
parent 3c1f752b2a
commit 67bdcb0f1a
2 changed files with 101 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/java/org/apache/commons/lang/StringUtils.java
View File

@ -76,8 +76,9 @@
* @author Holger Krauth
* @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @author Arun Mammen Thomas
* @since 1.0
* @version $Id: StringUtils.java,v 1.37 2003/03/23 21:52:31 scolebourne Exp $
* @version $Id: StringUtils.java,v 1.38 2003/03/24 00:47:02 scolebourne Exp $
*/
public class StringUtils {
@ -100,6 +101,14 @@ public StringUtils() {
* ends of this String, handling <code>null</code> by returning
* an empty String.</p>
*
* <pre>
* StringUtils.clean("abc") = "abc"
* StringUtils.clean(" abc ") = "abc"
* StringUtils.clean(" ") = ""
* StringUtils.clean("") = ""
* StringUtils.clean(null) = ""
* </pre>
*
* @see java.lang.String#trim()
* @param str the String to check
* @return the trimmed text (never <code>null</code>)
@ -113,14 +122,71 @@ public static String clean(String str) {
* ends of this String, handling <code>null</code> by returning
* <code>null</code>.</p>
*
* <p>The string is trimmed using {@link String#trim()}.</p>
*
* <pre>
* StringUtils.trim("abc") = "abc"
* StringUtils.trim(" abc ") = "abc"
* StringUtils.trim(" ") = ""
* StringUtils.trim("") = ""
* StringUtils.trim(null) = null
* </pre>
*
* @see java.lang.String#trim()
* @param str the String to check
* @param str the String to be trimmed
* @return the trimmed text (or <code>null</code>)
*/
public static String trim(String str) {
return (str == null ? null : str.trim());
}
/**
* <p>Removes control characters, including whitespace, from both
* ends of this string returning <code>null</code> if the string is
* empty after the trim or if it is <code>null</code>.
*
* <p>The string is trimmed using {@link String#trim()}.</p>
*
* <pre>
* StringUtils.trimToNull("abc") = "abc"
* StringUtils.trimToNull(" abc ") = "abc"
* StringUtils.trimToNull(" ") = null
* StringUtils.trimToNull("") = null
* StringUtils.trimToNull(null) = null
* </pre>
*
* @see java.lang.String#trim()
* @param str the String to be trimmed.
* @return the trimmed string, or null if it's empty or null
*/
public static String trimToNull(String str) {
String ts = trim(str);
return (ts == null || ts.length() == 0 ? null : ts);
}
/**
* <p>Removes control characters, including whitespace, from both
* ends of this string returning an empty string if the string is
* empty after the trim or if it is <code>null</code>.
*
* <p>The string is trimmed using {@link String#trim()}.</p>
*
* <pre>
* StringUtils.trimToEmpty("abc") = "abc"
* StringUtils.trimToEmpty(" abc ") = "abc"
* StringUtils.trimToEmpty(" ") = ""
* StringUtils.trimToEmpty("") = ""
* StringUtils.trimToEmpty(null) = ""
* </pre>
*
* @see java.lang.String#trim()
* @param str the String to be trimmed
* @return the trimmed string, or an empty string if it's empty or null
*/
public static String trimToEmpty(String str) {
return (str == null ? "" : str.trim());
}
/**
* <p>Deletes all 'space' characters from a String.</p>
*
@ -1708,8 +1774,8 @@ public static boolean isNumericSpace(String str) {
/**
* <p>Checks if the String contains only certain chars.</p>
*
* @param str the string to check
* @param validChars a string of valid chars
* @param str the String to check
* @param validChars a string of valid chars
* @return true if it only contains valid chars and is non-null
*/
public static boolean containsOnly(String str, String validChars) {
@ -1722,8 +1788,8 @@ public static boolean containsOnly(String str, String validChars) {
/**
* <p>Checks if the String contains only certain chars.</p>
*
* @param str the string to check
* @param validChars an array of valid chars
* @param str the String to check
* @param validChars an array of valid chars
* @return true if it only contains valid chars and is non-null
*/
public static boolean containsOnly(String str, char[] validChars) {
@ -1751,8 +1817,8 @@ public static boolean containsOnly(String str, char[] validChars) {
/**
* <p>Checks that the String does not contain certain chars.</p>
*
* @param str the string to check
* @param invalidChars a string of invalid chars
* @param str the String to check
* @param invalidChars a string of invalid chars
* @return true if it contains none of the invalid chars, or is null
*/
public static boolean containsNone(String str, String invalidChars) {
@ -1765,8 +1831,8 @@ public static boolean containsNone(String str, String invalidChars) {
/**
* <p>Checks that the String does not contain certain chars.</p>
*
* @param str the string to check
* @param invalidChars an array of invalid chars
* @param str the String to check
* @param invalidChars an array of invalid chars
* @return true if it contains none of the invalid chars, or is null
*/
public static boolean containsNone(String str, char[] invalidChars) {

26
src/test/org/apache/commons/lang/StringUtilsTrimEmptyTest.java
View File

@ -63,7 +63,7 @@
*
* @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
* @author <a href="mailto:ridesmet@users.sourceforge.net">Ringo De Smet</a>
* @version $Id: StringUtilsTrimEmptyTest.java,v 1.6 2003/03/23 21:51:19 scolebourne Exp $
* @version $Id: StringUtilsTrimEmptyTest.java,v 1.7 2003/03/24 00:47:02 scolebourne Exp $
*/
public class StringUtilsTrimEmptyTest extends TestCase {
private static final String FOO = "foo";
@ -97,6 +97,8 @@ public void testClean() {
assertEquals(FOO, StringUtils.clean(" " + FOO + " "));
assertEquals(FOO, StringUtils.clean(" " + FOO));
assertEquals(FOO, StringUtils.clean(FOO + ""));
assertEquals("", StringUtils.clean(" \t\r\n\b "));
assertEquals("", StringUtils.clean(""));
assertEquals("", StringUtils.clean(null));
}
@ -105,9 +107,31 @@ public void testTrim() {
assertEquals(FOO, StringUtils.trim(" " + FOO + " "));
assertEquals(FOO, StringUtils.trim(" " + FOO));
assertEquals(FOO, StringUtils.trim(FOO + ""));
assertEquals("", StringUtils.trim(" \t\r\n\b "));
assertEquals("", StringUtils.trim(""));
assertEquals(null, StringUtils.trim(null));
}
public void testTrimToNull() {
assertEquals(FOO, StringUtils.trimToNull(FOO + " "));
assertEquals(FOO, StringUtils.trimToNull(" " + FOO + " "));
assertEquals(FOO, StringUtils.trimToNull(" " + FOO));
assertEquals(FOO, StringUtils.trimToNull(FOO + ""));
assertEquals(null, StringUtils.trimToNull(" \t\r\n\b "));
assertEquals(null, StringUtils.trimToNull(""));
assertEquals(null, StringUtils.trimToNull(null));
}
public void testTrimToEmpty() {
assertEquals(FOO, StringUtils.trimToEmpty(FOO + " "));
assertEquals(FOO, StringUtils.trimToEmpty(" " + FOO + " "));
assertEquals(FOO, StringUtils.trimToEmpty(" " + FOO));
assertEquals(FOO, StringUtils.trimToEmpty(FOO + ""));
assertEquals("", StringUtils.trimToEmpty(" \t\r\n\b "));
assertEquals("", StringUtils.trimToEmpty(""));
assertEquals("", StringUtils.trimToEmpty(null));
}
public void testIsNotEmpty() {
assertEquals(true, StringUtils.isNotEmpty(FOO));
assertEquals(true, StringUtils.isNotEmpty(" "));