Fixes Data Tool Outputs Empty Strings: If a column returns an empty string, the data tool still outputs the column value. Empty strings should not be output. This bloats the XML.

http://transparensee.jira.com/browse/DATATOOL-32

Author: Eric Meyer

src/main/java/com/t11e/discovery/datatool/CreateActionRowCallbackHandler.java

@@ -184,7 +184,6 @@ else if (StringUtils.isBlank(subquery.getProperty()))
         {
           final String propertyPrefix = StringUtils.isNotBlank(subquery.getPropertyPrefix()) ? subquery.getPropertyPrefix() : "";
           if (values.size() == 1)
-
           {
             final Map<String, Object> row = values.get(0);
             for (final Entry<String, Object> entry : row.entrySet())
@@ -380,7 +379,11 @@ private SubqueryRowCallbackHandler(final List<Map<String, Object>> values, final
     public void processRow(final ResultSet rs)
       throws SQLException
     {
-      values.add(convertor.getRowAsMap(rs));
+      final Map<String, Object> row = convertor.getRowAsMap(rs);
+      if (!row.isEmpty())
+      {
+        values.add(row);
+      }
     }
   }
 }

src/main/java/com/t11e/discovery/datatool/column/StringColumnProcessor.java

@@ -3,6 +3,8 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.commons.lang.StringUtils;
+
 public class StringColumnProcessor
   implements IColumnProcessor
 {
@@ -20,7 +22,7 @@ public String processColumn(final ResultSet rs, final int column)
     }
     else
     {
-      value = value.trim();
+      value = StringUtils.trimToNull(value);
     }
     return value;
   }

src/test/java/com/t11e/discovery/datatool/SqlChangesetExtractorTest.java

@@ -107,10 +107,7 @@ public void testStringColumns()
           CollectionsFactory.<String, String> makeMap());
         oneOf(writer).setItem(
           "2",
-          CollectionsFactory.<String, String> makeMap(
-            "col_fixed", "",
-            "col_string", "",
-            "col_clob", ""));
+          CollectionsFactory.<String, String> makeMap());
         oneOf(writer).setItem(
           "3",
           CollectionsFactory.<String, String> makeMap(

src/test/java/com/t11e/discovery/datatool/SubqueryTestCreate.sql

@@ -26,6 +26,8 @@ create table SubqueryColors (
 
 insert into SubqueryColors (parent_id, name, asnumber, asdate) values
   (1, 'red', 10, '2011-01-01-00.00.00.000000'),
+  (1, '', null, null),
+  (1, null, null, null),
   (2, 'orange', 20, '2011-01-02-00.00.00.000000'),
   (2, 'yellow', 30, '2011-01-03-00.00.00.000000');
 

src/test/java/com/t11e/discovery/datatool/VerticalTableTestCreate.sql

@@ -23,6 +23,8 @@ create table vertical_data (
 
 insert into vertical_data (id, name, value) values
   (1, 'color', 'red'),
+  (1, 'color', ''),
+  (1, 'color', null),
   (1, 'provider', 'p1'),
   (1, 'kind', 'k1'),
   (2, 'color', 'orange'),