From b030bfcc9791b63f0e8152a970c9438a1b1ea546 Mon Sep 17 00:00:00 2001
From: "Edilson A. Cuamba" <edilsoncuamba@gmail.com>
Date: Sun, 1 May 2022 20:53:11 +0200
Subject: [PATCH 1/2] Add method to convert any object to string and return
 empty string as default or default value given.

---
 .../org/apache/commons/lang3/StringUtils.java | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index 599801e4739..acb837e2c81 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1588,6 +1588,59 @@ public static String defaultString(final String str, final String nullDefault) {
         return Objects.toString(str, nullDefault);
     }
 
+    /**
+     * <p>Returns either the passed in String,
+     * or if the String is {@code null}, an empty String ("").</p>
+     *
+     * <pre>
+     * StringUtils.defaultString(null)  = ""
+     * StringUtils.defaultString("")    = ""
+     * StringUtils.defaultString("bat") = "bat"
+     * StringUtils.defaultString(1) = "1"
+     * StringUtils.defaultString(Integer.MIN_VALUE) = "-2147483648"
+     * </pre>
+     *
+     * @see Objects#toString(Object)
+     * @see String#valueOf(Object)
+     * @param str  the Object to check, may be null
+     * @return the passed in String, or the empty String if it
+     *  was {@code null}
+     */
+    public static String defaultString(final Object str) {
+        if(object == null)
+            return "";
+
+        return Objects.toString(object);
+    }
+
+    /**
+     * Returns either the given String, or if the String is
+     * {@code null}, {@code nullDefault}.
+     *
+     * <pre>
+     * StringUtils.defaultString(null, "NULL")  = "NULL"
+     * StringUtils.defaultString("", "NULL")    = ""
+     * StringUtils.defaultString("bat", "NULL") = "bat"
+     * StringUtils.defaultString(1, "20") = "1"
+     * StringUtils.defaultString(Integer.MIN_VALUE, "200") = "-2147483648"
+     * </pre>
+     *
+     * @see Objects#toString(Object, String)
+     * @see String#valueOf(Object)
+     * @param str  the String to check, may be null
+     * @param nullDefault  the default String to return
+     *  if the input is {@code null}, may be null
+     * @return the passed in String, or the default if it was {@code null}
+     * @deprecated Use {@link Objects#toString(Object, String)}
+     */
+    @Deprecated
+    public static String defaultString(final Object str, final String nullDefault) {
+        if(object == null)
+            return defaultString(nullDefault);
+
+        return Objects.toString(object);
+    }
+
     /**
      * <p>Deletes all whitespaces from a String as defined by
      * {@link Character#isWhitespace(char)}.</p>

From ecab0b08f76771956f0c70df9ed58d40241b0c2a Mon Sep 17 00:00:00 2001
From: "Edilson A. Cuamba" <edilsoncuamba@gmail.com>
Date: Sun, 1 May 2022 21:53:23 +0200
Subject: [PATCH 2/2] Add method to convert any object to string and return
 empty string as default or default value given.

---
 pom.xml                                                 | 3 +++
 src/main/java/org/apache/commons/lang3/StringUtils.java | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec623e13bfa..4792471a7cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,6 +520,9 @@
     <contributor>
       <name>Arturo Bernal</name>
     </contributor>
+    <contributor>
+      <name>Edilson Alexandre Cuamba</name>
+    </contributor>
   </contributors>
 
   <dependencyManagement>
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index acb837e2c81..e0e860d4e5a 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -1606,7 +1606,7 @@ public static String defaultString(final String str, final String nullDefault) {
      * @return the passed in String, or the empty String if it
      *  was {@code null}
      */
-    public static String defaultString(final Object str) {
+    public static String defaultString(final Object object) {
         if(object == null)
             return "";
 
@@ -1634,7 +1634,7 @@ public static String defaultString(final Object str) {
      * @deprecated Use {@link Objects#toString(Object, String)}
      */
     @Deprecated
-    public static String defaultString(final Object str, final String nullDefault) {
+    public static String defaultString(final Object object, final String nullDefault) {
         if(object == null)
             return defaultString(nullDefault);