diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/StringUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/StringUtils.java index a8348756..9382e5fc 100755 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/StringUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/StringUtils.java @@ -460,4 +460,19 @@ public class StringUtils return (Pattern.matches("[a-f0-9]{8}(?:-[a-f0-9]{4}){4}[a-f0-9]{8}", s)); } + + + /*************************************************************************** + ** + ***************************************************************************/ + public static String emptyToNull(String s) + { + if(!hasContent(s)) + { + return (null); + } + + return (s); + } + } diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java index b2cad605..d0aae185 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/StringUtilsTest.java @@ -318,4 +318,19 @@ class StringUtilsTest extends BaseTest assertEquals("Apples were eaten", StringUtils.pluralFormat(2, "Apple{,s} {was,were} eaten")); } + + + /******************************************************************************* + ** + *******************************************************************************/ + @Test + void testEmptyToNull() + { + assertNull(StringUtils.emptyToNull(null)); + assertNull(StringUtils.emptyToNull("")); + assertNull(StringUtils.emptyToNull(" ")); + assertNull(StringUtils.emptyToNull(" ")); + assertEquals("a", StringUtils.emptyToNull("a")); + } + }