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

Fix http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21904 as suggested (but with the guard clause factored in a method.) 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2003-07-26 19:12:30 +00:00
parent 9410b31864
commit 3b19309d76
2 changed files with 93 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/java/org/apache/commons/lang/math/NumberUtils.java
View File

@ -57,6 +57,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import org.apache.commons.lang.NullArgumentException;
import org.apache.commons.lang.StringUtils;
/**
* <p>Provides extra functionality for Java Number classes.</p>
@ -68,8 +69,9 @@ import org.apache.commons.lang.NullArgumentException;
* @author Eric Pugh
* @author Phil Steitz
* @author Matthew Hawthorne
* @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
* @since 2.0
* @version $Id: NumberUtils.java,v 1.6 2003/07/26 15:39:04 scolebourne Exp $
* @version $Id: NumberUtils.java,v 1.7 2003/07/26 19:12:03 ggregory Exp $
*/
public class NumberUtils {
@ -216,12 +218,9 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static Number createNumber(String str) throws NumberFormatException {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
if (str.length() == 0) {
throw new NumberFormatException("\"\" is not a valid number.");
}
if (str.startsWith("--")) {
// this is protection for poorness in java.lang.BigDecimal.
// it accepts this as a legal value, but it does not appear
@ -389,7 +388,7 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static Float createFloat(String str) {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return Float.valueOf(str);
@ -405,7 +404,7 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static Double createDouble(String str) {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return Double.valueOf(str);
@ -423,7 +422,7 @@ public class NumberUtils {
*/
public static Integer createInteger(String str) {
// decode() handles 0xAABD and 0777 (hex and octal) as well.
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return Integer.decode(str);
@ -439,7 +438,7 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static Long createLong(String str) {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return Long.valueOf(str);
@ -455,7 +454,7 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static BigInteger createBigInteger(String str) {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return new BigInteger(str);
@ -471,12 +470,33 @@ public class NumberUtils {
* @throws NumberFormatException if the value cannot be converted
*/
public static BigDecimal createBigDecimal(String str) {
if (str == null) {
if (!validateNumber(str)) {
return null;
}
return new BigDecimal(str);
}
/**
* Checks the validitiy of a <code>String</code> for conversion it to a number.
* <ol>
* <li>If <code>str</code> is <code>null</code>, return <code>false</code>;</li>
* <li>If <code>str</code> is <i>blank</i>, throw a <code>NumberFormatException</code>;</li>
* <li>Otherewise return <code>true</code>.</li>
* </ol>
*
* @param str The <code>String</code> to check.
* @return Whether or not the argument is suitable for conversion.
*/
protected static boolean validateNumber(String str) {
if (str == null) {
return false;
}
if (StringUtils.isBlank(str)) {
throw new NumberFormatException("A blank string is not a valid number.");
}
return true;
}
// Min in array
//--------------------------------------------------------------------
/**

75
src/test/org/apache/commons/lang/math/NumberUtilsTest.java
View File

@ -72,7 +72,8 @@ import org.apache.commons.lang.SystemUtils;
* @author Phil Steitz
* @author Stephen Colebourne
* @author Matthew Hawthorne
* @version $Id: NumberUtilsTest.java,v 1.4 2003/07/21 19:42:12 ggregory Exp $
* @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
* @version $Id: NumberUtilsTest.java,v 1.5 2003/07/26 19:12:30 ggregory Exp $
*/
public class NumberUtilsTest extends TestCase {
@ -150,9 +151,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateFloat() {
assertEquals("createFloat(String) failed", new Float("1234.5"), NumberUtils.createFloat("1234.5"));
assertEquals("createFloat(null) failed", null, NumberUtils.createFloat(null));
this.testCreateFloatFailure("");
this.testCreateFloatFailure(" ");
this.testCreateFloatFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateFloatFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateFloatFailure(String str) {
try {
Float f = NumberUtils.createFloat("");
fail("createFloat(empty) failed");
Float value = NumberUtils.createFloat(str);
fail("createFloat(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}
@ -161,9 +170,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateDouble() {
assertEquals("createDouble(String) failed", new Double("1234.5"), NumberUtils.createDouble("1234.5"));
assertEquals("createDouble(null) failed", null, NumberUtils.createDouble(null));
this.testCreateDoubleFailure("");
this.testCreateDoubleFailure(" ");
this.testCreateDoubleFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateDoubleFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateDoubleFailure(String str) {
try {
Double d = NumberUtils.createDouble("");
fail("createDouble(empty) failed");
Double value = NumberUtils.createDouble(str);
fail("createDouble(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}
@ -172,9 +189,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateInteger() {
assertEquals("createInteger(String) failed", new Integer("12345"), NumberUtils.createInteger("12345"));
assertEquals("createInteger(null) failed", null, NumberUtils.createInteger(null));
this.testCreateIntegerFailure("");
this.testCreateIntegerFailure(" ");
this.testCreateIntegerFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateIntegerFailure(String str) {
try {
Integer i = NumberUtils.createInteger("");
fail("createInteger(empty) failed");
Integer value = NumberUtils.createInteger(str);
fail("createInteger(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}
@ -183,9 +208,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateLong() {
assertEquals("createLong(String) failed", new Long("12345"), NumberUtils.createLong("12345"));
assertEquals("createLong(null) failed", null, NumberUtils.createLong(null));
this.testCreateLongFailure("");
this.testCreateLongFailure(" ");
this.testCreateLongFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateLongFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateLongFailure(String str) {
try {
Long l = NumberUtils.createLong("");
fail("createLong(empty) failed");
Long value = NumberUtils.createLong(str);
fail("createLong(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}
@ -194,9 +227,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateBigInteger() {
assertEquals("createBigInteger(String) failed", new BigInteger("12345"), NumberUtils.createBigInteger("12345"));
assertEquals("createBigInteger(null) failed", null, NumberUtils.createBigInteger(null));
this.testCreateBigIntegerFailure("");
this.testCreateBigIntegerFailure(" ");
this.testCreateBigIntegerFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateBigIntegerFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateBigIntegerFailure(String str) {
try {
BigInteger i = NumberUtils.createBigInteger("");
fail("createBigInteger(empty) failed");
BigInteger value = NumberUtils.createBigInteger(str);
fail("createBigInteger(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}
@ -205,9 +246,17 @@ public class NumberUtilsTest extends TestCase {
public void testCreateBigDecimal() {
assertEquals("createBigDecimal(String) failed", new BigDecimal("1234.5"), NumberUtils.createBigDecimal("1234.5"));
assertEquals("createBigDecimal(null) failed", null, NumberUtils.createBigDecimal(null));
this.testCreateBigDecimalFailure("");
this.testCreateBigDecimalFailure(" ");
this.testCreateBigDecimalFailure("\b\t\n\f\r");
// Funky whitespaces
this.testCreateBigDecimalFailure("\u00A0\uFEFF\u000B\u000C\u001C\u001D\u001E\u001F");
}
protected void testCreateBigDecimalFailure(String str) {
try {
BigDecimal d = NumberUtils.createBigDecimal("");
fail("createBigDecimal(empty) failed");
BigDecimal value = NumberUtils.createBigDecimal(str);
fail("createBigDecimal(blank) failed: " + value);
} catch (NumberFormatException ex) {
// empty
}