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

LANG-1271: StringUtils#isAnyEmpty and #isAnyBlank should return false for an empty array (closes #193)

This commit is contained in:
Pierre Templier 2016-09-24 14:52:42 +02:00 committed by pascalschumacher
parent 5acf310d08
commit 38140a5d8d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ public static boolean isNotEmpty(final CharSequence cs) {
*/ */
public static boolean isAnyEmpty(final CharSequence... css) { public static boolean isAnyEmpty(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) { if (ArrayUtils.isEmpty(css)) {
return true; return false;
} }
for (final CharSequence cs : css){ for (final CharSequence cs : css){
if (isEmpty(cs)) { if (isEmpty(cs)) {
@ -276,7 +276,7 @@ public static boolean isAnyEmpty(final CharSequence... css) {
*/ */
public static boolean isAnyNotEmpty(final CharSequence... css) { public static boolean isAnyNotEmpty(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) { if (ArrayUtils.isEmpty(css)) {
return true; return false;
} }
for (final CharSequence cs : css) { for (final CharSequence cs : css) {
if (isNotEmpty(cs)) { if (isNotEmpty(cs)) {
@ -377,7 +377,7 @@ public static boolean isNotBlank(final CharSequence cs) {
*/ */
public static boolean isAnyBlank(final CharSequence... css) { public static boolean isAnyBlank(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) { if (ArrayUtils.isEmpty(css)) {
return true; return false;
} }
for (final CharSequence cs : css){ for (final CharSequence cs : css){
if (isBlank(cs)) { if (isBlank(cs)) {
@ -407,7 +407,7 @@ public static boolean isAnyBlank(final CharSequence... css) {
*/ */
public static boolean isAnyNotBlank(final CharSequence... css) { public static boolean isAnyNotBlank(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) { if (ArrayUtils.isEmpty(css)) {
return true; return false;
} }
for (final CharSequence cs : css) { for (final CharSequence cs : css) {
if (isNotBlank(cs)) { if (isNotBlank(cs)) {

12
src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
View File

@ -47,7 +47,7 @@ public void testIsNotEmpty() {
@Test @Test
public void testIsAnyEmpty() { public void testIsAnyEmpty() {
assertTrue(StringUtils.isAnyEmpty((String) null)); assertTrue(StringUtils.isAnyEmpty((String) null));
assertTrue(StringUtils.isAnyEmpty((String[]) null)); assertFalse(StringUtils.isAnyEmpty((String[]) null));
assertTrue(StringUtils.isAnyEmpty(null, "foo")); assertTrue(StringUtils.isAnyEmpty(null, "foo"));
assertTrue(StringUtils.isAnyEmpty("", "bar")); assertTrue(StringUtils.isAnyEmpty("", "bar"));
assertTrue(StringUtils.isAnyEmpty("bob", "")); assertTrue(StringUtils.isAnyEmpty("bob", ""));
@ -59,7 +59,7 @@ public void testIsAnyEmpty() {
@Test @Test
public void testIsAnyNotEmpty() { public void testIsAnyNotEmpty() {
assertFalse(StringUtils.isAnyNotEmpty((String) null)); assertFalse(StringUtils.isAnyNotEmpty((String) null));
assertTrue(StringUtils.isAnyNotEmpty((String[]) null)); assertFalse(StringUtils.isAnyNotEmpty((String[]) null));
assertTrue(StringUtils.isAnyNotEmpty(null, "foo")); assertTrue(StringUtils.isAnyNotEmpty(null, "foo"));
assertTrue(StringUtils.isAnyNotEmpty("", "bar")); assertTrue(StringUtils.isAnyNotEmpty("", "bar"));
assertTrue(StringUtils.isAnyNotEmpty("bob", "")); assertTrue(StringUtils.isAnyNotEmpty("bob", ""));
@ -72,7 +72,7 @@ public void testIsAnyNotEmpty() {
@Test @Test
public void testIsNoneEmpty() { public void testIsNoneEmpty() {
assertFalse(StringUtils.isNoneEmpty((String) null)); assertFalse(StringUtils.isNoneEmpty((String) null));
assertFalse(StringUtils.isNoneEmpty((String[]) null)); assertTrue(StringUtils.isNoneEmpty((String[]) null));
assertFalse(StringUtils.isNoneEmpty(null, "foo")); assertFalse(StringUtils.isNoneEmpty(null, "foo"));
assertFalse(StringUtils.isNoneEmpty("", "bar")); assertFalse(StringUtils.isNoneEmpty("", "bar"));
assertFalse(StringUtils.isNoneEmpty("bob", "")); assertFalse(StringUtils.isNoneEmpty("bob", ""));
@ -102,7 +102,7 @@ public void testIsNotBlank() {
@Test @Test
public void testIsAnyBlank() { public void testIsAnyBlank() {
assertTrue(StringUtils.isAnyBlank((String) null)); assertTrue(StringUtils.isAnyBlank((String) null));
assertTrue(StringUtils.isAnyBlank((String[]) null)); assertFalse(StringUtils.isAnyBlank((String[]) null));
assertTrue(StringUtils.isAnyBlank(null, "foo")); assertTrue(StringUtils.isAnyBlank(null, "foo"));
assertTrue(StringUtils.isAnyBlank(null, null)); assertTrue(StringUtils.isAnyBlank(null, null));
assertTrue(StringUtils.isAnyBlank("", "bar")); assertTrue(StringUtils.isAnyBlank("", "bar"));
@ -115,7 +115,7 @@ public void testIsAnyBlank() {
@Test @Test
public void testIsAnyNotBlank() { public void testIsAnyNotBlank() {
assertFalse(StringUtils.isAnyNotBlank((String) null)); assertFalse(StringUtils.isAnyNotBlank((String) null));
assertTrue(StringUtils.isAnyNotBlank((String[]) null)); assertFalse(StringUtils.isAnyNotBlank((String[]) null));
assertTrue(StringUtils.isAnyNotBlank(null, "foo")); assertTrue(StringUtils.isAnyNotBlank(null, "foo"));
assertFalse(StringUtils.isAnyNotBlank(null, null)); assertFalse(StringUtils.isAnyNotBlank(null, null));
assertTrue(StringUtils.isAnyNotBlank("", "bar")); assertTrue(StringUtils.isAnyNotBlank("", "bar"));
@ -128,7 +128,7 @@ public void testIsAnyNotBlank() {
@Test @Test
public void testIsNoneBlank() { public void testIsNoneBlank() {
assertFalse(StringUtils.isNoneBlank((String) null)); assertFalse(StringUtils.isNoneBlank((String) null));
assertFalse(StringUtils.isNoneBlank((String[]) null)); assertTrue(StringUtils.isNoneBlank((String[]) null));
assertFalse(StringUtils.isNoneBlank(null, "foo")); assertFalse(StringUtils.isNoneBlank(null, "foo"));
assertFalse(StringUtils.isNoneBlank(null, null)); assertFalse(StringUtils.isNoneBlank(null, null));
assertFalse(StringUtils.isNoneBlank("", "bar")); assertFalse(StringUtils.isNoneBlank("", "bar"));