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

Added 1 and 0 in toBooleanObject(final String str) (#502) 

* Added 1 and 0 in toBooleanObject(String)

* Added 1 and 0 in toBooleanObject(String)

 - Documentation
 - Tests
This commit is contained in:
Dominik Schramm 2020-03-07 16:58:19 +01:00 committed by GitHub
parent ba607f525b
commit fde46a232d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/apache/commons/lang3/BooleanUtils.java
View File

@ -532,10 +532,10 @@ public static Integer toIntegerObject(final Boolean bool, final Integer trueValu
/** /**
* <p>Converts a String to a Boolean.</p> * <p>Converts a String to a Boolean.</p>
* *
* <p>{@code 'true'}, {@code 'on'}, {@code 'y'}, {@code 't'} or {@code 'yes'} * <p>{@code 'true'}, {@code 'on'}, {@code 'y'}, {@code 't'}, {@code 'yes'}
* (case insensitive) will return {@code true}. * or {@code '1'} (case insensitive) will return {@code true}.
* {@code 'false'}, {@code 'off'}, {@code 'n'}, {@code 'f'} or {@code 'no'} * {@code 'false'}, {@code 'off'}, {@code 'n'}, {@code 'f'}, {@code 'no'}
* (case insensitive) will return {@code false}. * or {@code '0'} (case insensitive) will return {@code false}.
* Otherwise, {@code null} is returned.</p> * Otherwise, {@code null} is returned.</p>
* *
* <p>NOTE: This method may return {@code null} and may throw a {@code NullPointerException} * <p>NOTE: This method may return {@code null} and may throw a {@code NullPointerException}
@ -556,6 +556,8 @@ public static Integer toIntegerObject(final Boolean bool, final Integer trueValu
* BooleanUtils.toBooleanObject("oFf") = Boolean.FALSE * BooleanUtils.toBooleanObject("oFf") = Boolean.FALSE
* BooleanUtils.toBooleanObject("yes") = Boolean.TRUE * BooleanUtils.toBooleanObject("yes") = Boolean.TRUE
* BooleanUtils.toBooleanObject("Y") = Boolean.TRUE // i.e. Y[ES] * BooleanUtils.toBooleanObject("Y") = Boolean.TRUE // i.e. Y[ES]
* BooleanUtils.toBooleanObject("1") = Boolean.TRUE
* BooleanUtils.toBooleanObject("0") = Boolean.FALSE
* BooleanUtils.toBooleanObject("blue") = null * BooleanUtils.toBooleanObject("blue") = null
* BooleanUtils.toBooleanObject("true ") = null // trailing space (too long) * BooleanUtils.toBooleanObject("true ") = null // trailing space (too long)
* BooleanUtils.toBooleanObject("ono") = null // does not match on or no * BooleanUtils.toBooleanObject("ono") = null // does not match on or no
@ -581,11 +583,13 @@ public static Boolean toBooleanObject(final String str) {
case 1: { case 1: {
final char ch0 = str.charAt(0); final char ch0 = str.charAt(0);
if (ch0 == 'y' || ch0 == 'Y' || if (ch0 == 'y' || ch0 == 'Y' ||
ch0 == 't' || ch0 == 'T') { ch0 == 't' || ch0 == 'T' ||
ch0 == '1') {
return Boolean.TRUE; return Boolean.TRUE;
} }
if (ch0 == 'n' || ch0 == 'N' || if (ch0 == 'n' || ch0 == 'N' ||
ch0 == 'f' || ch0 == 'F') { ch0 == 'f' || ch0 == 'F' ||
ch0 == '0') {
return Boolean.FALSE; return Boolean.FALSE;
} }
break; break;

4
src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java
View File

@ -280,10 +280,12 @@ public void test_toBooleanObject_String() {
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("Y")); assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("Y"));
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("t")); // true assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("t")); // true
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("T")); assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("T"));
assertEquals(Boolean.TRUE, BooleanUtils.toBooleanObject("1"));
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("f")); // false assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("f")); // false
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("F")); assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("F"));
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("n")); // No assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("n")); // No
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("N")); assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("N"));
assertEquals(Boolean.FALSE, BooleanUtils.toBooleanObject("0"));
assertNull(BooleanUtils.toBooleanObject("z")); assertNull(BooleanUtils.toBooleanObject("z"));
assertNull(BooleanUtils.toBooleanObject("ab")); assertNull(BooleanUtils.toBooleanObject("ab"));
@ -353,7 +355,9 @@ public void test_toBoolean_String() {
assertTrue(BooleanUtils.toBoolean("YeS")); assertTrue(BooleanUtils.toBoolean("YeS"));
assertTrue(BooleanUtils.toBoolean("YEs")); assertTrue(BooleanUtils.toBoolean("YEs"));
assertTrue(BooleanUtils.toBoolean("YES")); assertTrue(BooleanUtils.toBoolean("YES"));
assertTrue(BooleanUtils.toBoolean("1"));
assertFalse(BooleanUtils.toBoolean("yes?")); assertFalse(BooleanUtils.toBoolean("yes?"));
assertFalse(BooleanUtils.toBoolean("0"));
assertFalse(BooleanUtils.toBoolean("tru")); assertFalse(BooleanUtils.toBoolean("tru"));
assertFalse(BooleanUtils.toBoolean("no")); assertFalse(BooleanUtils.toBoolean("no"));