You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2016/10/19 16:55:14 UTC
[1/3] [lang] LANG-1270: Add StringUtils#isAnyNotEmpty and
#isAnyNotBlank (closes #193)
Repository: commons-lang
Updated Branches:
refs/heads/master 8592cfe49 -> 3b12d4fe5
LANG-1270: Add StringUtils#isAnyNotEmpty and #isAnyNotBlank (closes #193)
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/5acf310d
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/5acf310d
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/5acf310d
Branch: refs/heads/master
Commit: 5acf310d08b2bc5182cf936616ef70938cb2c499
Parents: 8592cfe
Author: Pierre Templier <pi...@gmail.com>
Authored: Sat Sep 24 00:49:32 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Wed Oct 19 18:53:35 2016 +0200
----------------------------------------------------------------------
.../org/apache/commons/lang3/StringUtils.java | 74 ++++++++++++++++++--
.../lang3/StringUtilsEmptyBlankTest.java | 26 +++++++
2 files changed, 93 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/5acf310d/src/main/java/org/apache/commons/lang3/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 8791394..cec4fa6 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -256,7 +256,36 @@ public class StringUtils {
}
return false;
}
-
+
+ /**
+ * <p>Checks if any one of the CharSequences are not empty ("") or null.</p>
+ *
+ * <pre>
+ * StringUtils.isAnyNotEmpty(null) = false
+ * StringUtils.isAnyNotEmpty(null, "foo") = true
+ * StringUtils.isAnyNotEmpty("", "bar") = true
+ * StringUtils.isAnyNotEmpty("bob", "") = true
+ * StringUtils.isAnyNotEmpty(" bob ", null) = true
+ * StringUtils.isAnyNotEmpty(" ", "bar") = true
+ * StringUtils.isAnyNotEmpty("foo", "bar") = true
+ * </pre>
+ *
+ * @param css the CharSequences to check, may be null or empty
+ * @return {@code true} if any of the CharSequences are empty or null
+ * @since 3.6
+ */
+ public static boolean isAnyNotEmpty(final CharSequence... css) {
+ if (ArrayUtils.isEmpty(css)) {
+ return true;
+ }
+ for (final CharSequence cs : css) {
+ if (isNotEmpty(cs)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* <p>Checks if none of the CharSequences are empty ("") or null.</p>
*
@@ -276,7 +305,8 @@ public class StringUtils {
*/
public static boolean isNoneEmpty(final CharSequence... css) {
return !isAnyEmpty(css);
- }
+ }
+
/**
* <p>Checks if a CharSequence is whitespace, empty ("") or null.</p>
*
@@ -326,9 +356,9 @@ public class StringUtils {
public static boolean isNotBlank(final CharSequence cs) {
return !isBlank(cs);
}
-
- /**
- * <p>Checks if any one of the CharSequences are blank ("") or null and not whitespace only..</p>
+
+ /**
+ * <p>Checks if any one of the CharSequences are blank ("") or null and not whitespace only.</p>
*
* <pre>
* StringUtils.isAnyBlank(null) = true
@@ -356,9 +386,39 @@ public class StringUtils {
}
return false;
}
-
+
+ /**
+ * <p>Checks if any one of the CharSequences are not blank ("") or null and not whitespace only.</p>
+ *
+ * <pre>
+ * StringUtils.isAnyNotBlank(null) = false
+ * StringUtils.isAnyNotBlank(null, "foo") = true
+ * StringUtils.isAnyNotBlank(null, null) = false
+ * StringUtils.isAnyNotBlank("", "bar") = true
+ * StringUtils.isAnyNotBlank("bob", "") = true
+ * StringUtils.isAnyNotBlank(" bob ", null) = true
+ * StringUtils.isAnyNotBlank(" ", "bar") = true
+ * StringUtils.isAnyNotBlank("foo", "bar") = false
+ * </pre>
+ *
+ * @param css the CharSequences to check, may be null or empty
+ * @return {@code true} if any of the CharSequences are not blank or null or whitespace only
+ * @since 3.6
+ */
+ public static boolean isAnyNotBlank(final CharSequence... css) {
+ if (ArrayUtils.isEmpty(css)) {
+ return true;
+ }
+ for (final CharSequence cs : css) {
+ if (isNotBlank(cs)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
- * <p>Checks if none of the CharSequences are blank ("") or null and whitespace only..</p>
+ * <p>Checks if none of the CharSequences are blank ("") or null and whitespace only.</p>
*
* <pre>
* StringUtils.isNoneBlank(null) = false
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/5acf310d/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
index b3d33fc..78e16a9 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
@@ -57,6 +57,19 @@ public class StringUtilsEmptyBlankTest {
}
@Test
+ public void testIsAnyNotEmpty() {
+ assertFalse(StringUtils.isAnyNotEmpty((String) null));
+ assertTrue(StringUtils.isAnyNotEmpty((String[]) null));
+ assertTrue(StringUtils.isAnyNotEmpty(null, "foo"));
+ assertTrue(StringUtils.isAnyNotEmpty("", "bar"));
+ assertTrue(StringUtils.isAnyNotEmpty("bob", ""));
+ assertTrue(StringUtils.isAnyNotEmpty(" bob ", null));
+ assertTrue(StringUtils.isAnyNotEmpty(" ", "bar"));
+ assertTrue(StringUtils.isAnyNotEmpty("foo", "bar"));
+ assertFalse(StringUtils.isAnyNotEmpty("", null));
+ }
+
+ @Test
public void testIsNoneEmpty() {
assertFalse(StringUtils.isNoneEmpty((String) null));
assertFalse(StringUtils.isNoneEmpty((String[]) null));
@@ -100,6 +113,19 @@ public class StringUtilsEmptyBlankTest {
}
@Test
+ public void testIsAnyNotBlank() {
+ assertFalse(StringUtils.isAnyNotBlank((String) null));
+ assertTrue(StringUtils.isAnyNotBlank((String[]) null));
+ assertTrue(StringUtils.isAnyNotBlank(null, "foo"));
+ assertFalse(StringUtils.isAnyNotBlank(null, null));
+ assertTrue(StringUtils.isAnyNotBlank("", "bar"));
+ assertTrue(StringUtils.isAnyNotBlank("bob", ""));
+ assertTrue(StringUtils.isAnyNotBlank(" bob ", null));
+ assertTrue(StringUtils.isAnyNotBlank(" ", "bar"));
+ assertTrue(StringUtils.isAnyNotBlank("foo", "bar"));
+ }
+
+ @Test
public void testIsNoneBlank() {
assertFalse(StringUtils.isNoneBlank((String) null));
assertFalse(StringUtils.isNoneBlank((String[]) null));
[3/3] [lang] LANG-1271, LANG-1270: add changes.xml entries
Posted by pa...@apache.org.
LANG-1271, LANG-1270: add changes.xml entries
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/3b12d4fe
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/3b12d4fe
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/3b12d4fe
Branch: refs/heads/master
Commit: 3b12d4fe5dfa8aa1f8d44274333c9c24594c1655
Parents: 38140a5
Author: pascalschumacher <pa...@gmx.net>
Authored: Wed Oct 19 18:52:33 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Wed Oct 19 18:54:27 2016 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/3b12d4fe/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2b22be1..81456e1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,8 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="3.6" date="tba" description="tba">
+ <action issue="LANG-1271" type="add" dev="pschumacher" due-to="Pierre Templier">StringUtils#isAnyEmpty and #isAnyBlank should return false for an empty array</action>
+ <action issue="LANG-1270" type="add" dev="pschumacher" due-to="Pierre Templier">Add StringUtils#isAnyNotEmpty and #isAnyNotBlank</action>
</release>
<release version="3.5" date="2016-10-13" description="New features including Java 9 detection">
[2/3] [lang] LANG-1271: StringUtils#isAnyEmpty and #isAnyBlank should
return false for an empty array (closes #193)
Posted by pa...@apache.org.
LANG-1271: StringUtils#isAnyEmpty and #isAnyBlank should return false for an empty array (closes #193)
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/38140a5d
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/38140a5d
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/38140a5d
Branch: refs/heads/master
Commit: 38140a5d8dffec88f7c88da73ce3989770e086e6
Parents: 5acf310
Author: Pierre Templier <pi...@gmail.com>
Authored: Sat Sep 24 14:52:42 2016 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Wed Oct 19 18:54:14 2016 +0200
----------------------------------------------------------------------
src/main/java/org/apache/commons/lang3/StringUtils.java | 8 ++++----
.../apache/commons/lang3/StringUtilsEmptyBlankTest.java | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/38140a5d/src/main/java/org/apache/commons/lang3/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index cec4fa6..d92604d 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -247,7 +247,7 @@ public class StringUtils {
*/
public static boolean isAnyEmpty(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) {
- return true;
+ return false;
}
for (final CharSequence cs : css){
if (isEmpty(cs)) {
@@ -276,7 +276,7 @@ public class StringUtils {
*/
public static boolean isAnyNotEmpty(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) {
- return true;
+ return false;
}
for (final CharSequence cs : css) {
if (isNotEmpty(cs)) {
@@ -377,7 +377,7 @@ public class StringUtils {
*/
public static boolean isAnyBlank(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) {
- return true;
+ return false;
}
for (final CharSequence cs : css){
if (isBlank(cs)) {
@@ -407,7 +407,7 @@ public class StringUtils {
*/
public static boolean isAnyNotBlank(final CharSequence... css) {
if (ArrayUtils.isEmpty(css)) {
- return true;
+ return false;
}
for (final CharSequence cs : css) {
if (isNotBlank(cs)) {
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/38140a5d/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
index 78e16a9..769a138 100644
--- a/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringUtilsEmptyBlankTest.java
@@ -47,7 +47,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsAnyEmpty() {
assertTrue(StringUtils.isAnyEmpty((String) null));
- assertTrue(StringUtils.isAnyEmpty((String[]) null));
+ assertFalse(StringUtils.isAnyEmpty((String[]) null));
assertTrue(StringUtils.isAnyEmpty(null, "foo"));
assertTrue(StringUtils.isAnyEmpty("", "bar"));
assertTrue(StringUtils.isAnyEmpty("bob", ""));
@@ -59,7 +59,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsAnyNotEmpty() {
assertFalse(StringUtils.isAnyNotEmpty((String) null));
- assertTrue(StringUtils.isAnyNotEmpty((String[]) null));
+ assertFalse(StringUtils.isAnyNotEmpty((String[]) null));
assertTrue(StringUtils.isAnyNotEmpty(null, "foo"));
assertTrue(StringUtils.isAnyNotEmpty("", "bar"));
assertTrue(StringUtils.isAnyNotEmpty("bob", ""));
@@ -72,7 +72,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsNoneEmpty() {
assertFalse(StringUtils.isNoneEmpty((String) null));
- assertFalse(StringUtils.isNoneEmpty((String[]) null));
+ assertTrue(StringUtils.isNoneEmpty((String[]) null));
assertFalse(StringUtils.isNoneEmpty(null, "foo"));
assertFalse(StringUtils.isNoneEmpty("", "bar"));
assertFalse(StringUtils.isNoneEmpty("bob", ""));
@@ -102,7 +102,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsAnyBlank() {
assertTrue(StringUtils.isAnyBlank((String) null));
- assertTrue(StringUtils.isAnyBlank((String[]) null));
+ assertFalse(StringUtils.isAnyBlank((String[]) null));
assertTrue(StringUtils.isAnyBlank(null, "foo"));
assertTrue(StringUtils.isAnyBlank(null, null));
assertTrue(StringUtils.isAnyBlank("", "bar"));
@@ -115,7 +115,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsAnyNotBlank() {
assertFalse(StringUtils.isAnyNotBlank((String) null));
- assertTrue(StringUtils.isAnyNotBlank((String[]) null));
+ assertFalse(StringUtils.isAnyNotBlank((String[]) null));
assertTrue(StringUtils.isAnyNotBlank(null, "foo"));
assertFalse(StringUtils.isAnyNotBlank(null, null));
assertTrue(StringUtils.isAnyNotBlank("", "bar"));
@@ -128,7 +128,7 @@ public class StringUtilsEmptyBlankTest {
@Test
public void testIsNoneBlank() {
assertFalse(StringUtils.isNoneBlank((String) null));
- assertFalse(StringUtils.isNoneBlank((String[]) null));
+ assertTrue(StringUtils.isNoneBlank((String[]) null));
assertFalse(StringUtils.isNoneBlank(null, "foo"));
assertFalse(StringUtils.isNoneBlank(null, null));
assertFalse(StringUtils.isNoneBlank("", "bar"));