isEmpty(String) must not return false for whitespace-only values

kwin · michael-o · commit 7f5114af7d0c · 2022-09-12T10:11:46.000+02:00
This closes #214
diff --git a/src/main/java/org/codehaus/plexus/util/StringUtils.java b/src/main/java/org/codehaus/plexus/util/StringUtils.java
@@ -156,9 +156,7 @@ public static String deleteWhitespace( String str )
     }
 
     /**
-     * <p>
      * Checks if a String is non <code>null</code> and is not empty (<code>length &gt; 0</code>).
-     * </p>
      *
      * @param str the String to check
      * @return true if the String is non-null, and not length zero
@@ -169,21 +167,18 @@ public static boolean isNotEmpty( String str )
     }
 
     /**
+     * Checks if a String is <code>null</code> or empty.
      * <p>
-     * Checks if a (trimmed) String is <code>null</code> or empty.
-     * </p>
-     * <p>
-     * <strong>Note:</strong> In future releases, this method will no longer trim the input string such that it works
-     * complementary to {@link #isNotEmpty(String)}. Code that wants to test for whitespace-only strings should be
-     * migrated to use {@link #isBlank(String)} instead.
-     * </p>
+     * <strong>Note:</strong> In releases prior 3.5.0, this method trimmed the input string such that it worked
+     * the same as {@link #isBlank(String)}. Since release 3.5.0 it no longer returns {@code true} for strings
+     * containing only whitespace characters.
      *
      * @param str the String to check
-     * @return <code>true</code> if the String is <code>null</code>, or length zero once trimmed
+     * @return <code>true</code> if the String is <code>null</code>, or length zero
      */
     public static boolean isEmpty( String str )
     {
-        return ( ( str == null ) || ( str.trim().isEmpty() ) );
+        return ( ( str == null ) || ( str.isEmpty() ) );
     }
 
     /**
diff --git a/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java b/src/test/java/org/codehaus/plexus/util/StringUtilsTest.java
@@ -43,7 +43,7 @@ public void testIsEmpty()
     {
         assertEquals( true, StringUtils.isEmpty( null ) );
         assertEquals( true, StringUtils.isEmpty( "" ) );
-        assertEquals( true, StringUtils.isEmpty( " " ) );
+        assertEquals( false, StringUtils.isEmpty( " " ) );
         assertEquals( false, StringUtils.isEmpty( "foo" ) );
         assertEquals( false, StringUtils.isEmpty( "  foo  " ) );
     }
@@ -61,6 +61,16 @@ public void testIsNotEmpty()
         assertEquals( true, StringUtils.isNotEmpty( "  foo  " ) );
     }
 
+    @Test
+    public void testIsNotEmptyNegatesIsEmpty()
+    {
+        assertEquals( !StringUtils.isEmpty( null ), StringUtils.isNotEmpty( null ) );
+        assertEquals( !StringUtils.isEmpty( "" ), StringUtils.isNotEmpty( "" ) );
+        assertEquals( !StringUtils.isEmpty( " " ), StringUtils.isNotEmpty( " " ) );
+        assertEquals( !StringUtils.isEmpty( "foo" ), StringUtils.isNotEmpty( "foo" ) );
+        assertEquals( !StringUtils.isEmpty( "  foo  " ), StringUtils.isNotEmpty( "  foo  " ) );
+    }
+
     /**
      * <p>testIsBlank.</p>
      */

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,7 @@ public static String deleteWhitespace( String str )`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
`159`		`- * <p>`
`160`	`159`	`* Checks if a String is non <code>null</code> and is not empty (<code>length > 0</code>).`
`161`		`- * </p>`
`162`	`160`	`*`
`163`	`161`	`* @param str the String to check`
`164`	`162`	`* @return true if the String is non-null, and not length zero`
`@@ -169,21 +167,18 @@ public static boolean isNotEmpty( String str )`
`169`	`167`	`}`
`170`	`168`
`171`	`169`	`/**`
	`170`	`+ * Checks if a String is <code>null</code> or empty.`
`172`	`171`	`* <p>`
`173`		`- * Checks if a (trimmed) String is <code>null</code> or empty.`
`174`		`- * </p>`
`175`		`- * <p>`
`176`		`- * <strong>Note:</strong> In future releases, this method will no longer trim the input string such that it works`
`177`		`- * complementary to {@link #isNotEmpty(String)}. Code that wants to test for whitespace-only strings should be`
`178`		`- * migrated to use {@link #isBlank(String)} instead.`
`179`		`- * </p>`
	`172`	`+ * <strong>Note:</strong> In releases prior 3.5.0, this method trimmed the input string such that it worked`
	`173`	`+ * the same as {@link #isBlank(String)}. Since release 3.5.0 it no longer returns {@code true} for strings`
	`174`	`+ * containing only whitespace characters.`
`180`	`175`	`*`
`181`	`176`	`* @param str the String to check`
`182`		`- * @return <code>true</code> if the String is <code>null</code>, or length zero once trimmed`
	`177`	`+ * @return <code>true</code> if the String is <code>null</code>, or length zero`
`183`	`178`	`*/`
`184`	`179`	`public static boolean isEmpty( String str )`
`185`	`180`	`{`
`186`		`- return ( ( str == null ) \|\| ( str.trim().isEmpty() ) );`
	`181`	`+ return ( ( str == null ) \|\| ( str.isEmpty() ) );`
`187`	`182`	`}`
`188`	`183`
`189`	`184`	`/**`