Treat empty values as null in CSVDecoder.

gk-brown · gk-brown · commit 46f9347b4043 · 2020-02-26T17:12:21.000-05:00
diff --git a/httprpc-client/src/main/java/org/httprpc/io/CSVDecoder.java b/httprpc-client/src/main/java/org/httprpc/io/CSVDecoder.java
@@ -71,7 +71,11 @@ public Map<String, String> next() {
                 LinkedHashMap<String, String> row = new LinkedHashMap<>();
 
                 for (int i = 0, n = Math.min(keys.size(), values.size()); i < n; i++) {
-                    row.put(keys.get(i), values.get(i));
+                    String value = values.get(i);
+
+                    if (!value.isEmpty()) {
+                        row.put(keys.get(i), value);
+                    }
                 }
 
                 hasNext = null;
diff --git a/httprpc-client/src/test/java/org/httprpc/io/CSVDecoderTest.java b/httprpc-client/src/test/java/org/httprpc/io/CSVDecoderTest.java
@@ -30,9 +30,10 @@
 public class CSVDecoderTest {
     @Test
     public void testRead() throws IOException {
-        String text = "\"a\",\"b\",\"c\",\"d\"\r\n"
-            + "\"A,B,\"\"C\"\" \",1,2.0,true\r\n"
-            + "\" D\rÉ\nF\r\n\",2,4.0,false\n";
+        String text = "\"a\",\"b\",\"c\",\"d\",\"e\"\r\n"
+            + "\"A,B,\"\"C\"\" \",1,2.0,true,\r\n"
+            + "\" D\rÉ\nF\r\n\",2,4.0,false\r\n"
+            + ",3,6.0\n";
 
         List<Map<String, ?>> expected = listOf(
             mapOf(
@@ -46,6 +47,10 @@ public void testRead() throws IOException {
                 entry("b", "2"),
                 entry("c", "4.0"),
                 entry("d", "false")
+            ),
+            mapOf(
+                entry("b", "3"),
+                entry("c", "6.0")
             )
         );
 
