enabling getAsString() to return empty string rather than null

Author: mieslep

src/main/java/datastax/astra/migrate/properties/PropertyHelper.java

@@ -181,24 +181,28 @@ public List<MigrateDataType> getMigrationTypeList(String propertyName) {
     }
 
     public String getAsString(String propertyName) {
+        String rtn;
         if (null == propertyName)
             return null;
         Object propertyValue = get(propertyName, getType(propertyName));
         if (null == propertyValue)
-            return null;
+            return "";
         switch (getType(propertyName)) {
             case STRING:
-                return (String) propertyValue;
+                rtn = (String) propertyValue;
+                break;
             case STRING_LIST:
             case NUMBER_LIST:
             case MIGRATION_TYPE_LIST:
-                return StringUtils.join((List<?>) propertyValue, ",");
+                rtn = StringUtils.join((List<?>) propertyValue, ",");
+                break;
             case NUMBER:
             case BOOLEAN:
             case MIGRATION_TYPE:
             default:
-                return propertyValue.toString();
+                rtn = propertyValue.toString();
         }
+        return (null == rtn) ? "" : rtn;
     }
 
     protected void loadSparkConf() {

src/test/java/datastax/astra/migrate/properties/PropertyHelperTest.java

@@ -459,15 +459,15 @@ public void getAsString_MigrateDataTypeList() {
         assertEquals("0,5%0%1", helper.getAsString(KnownProperties.TEST_MIGRATE_TYPE_LIST));
     }
 
-//    @Test
-//    public void getAsString_valueNotSet_withDefault() {
-//        assertEquals(KnownProperties.getDefaultAsString(KnownProperties.TEST_STRING),helper.getAsString(KnownProperties.TEST_STRING));
-//    }
-//
-//    @Test
-//    public void getAsString_valueNotSet_noDefault() {
-//        assertNull(helper.getAsString(KnownProperties.TEST_STRING_NO_DEFAULT));
-//    }
+    @Test
+    public void getAsString_valueNotSet_string() {
+        assertEquals("",helper.getAsString(KnownProperties.TEST_STRING_NO_DEFAULT));
+    }
+
+    @Test
+    public void getAsString_valueNotSet_list() {
+        assertEquals("",helper.getAsString(KnownProperties.TEST_MIGRATE_TYPE_LIST));
+    }
 
     @Test
     public void getAsString_nullArgument() {