Update CSVEncoder.

Author: gk-brown

kilo-client/src/main/java/org/httprpc/kilo/io/CSVEncoder.java

@@ -23,6 +23,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.function.Function;
 
@@ -32,7 +33,7 @@
  * Encodes CSV content.
  */
 public class CSVEncoder extends Encoder<Iterable<?>> {
-    private Collection<String> keys;
+    private Collection<?> keys;
 
     private Map<Class<?>, Function<Object, String>> formatters = new HashMap<>();
 
@@ -46,7 +47,7 @@ public class CSVEncoder extends Encoder<Iterable<?>> {
      * @param keys
      * The column keys.
      */
-    public CSVEncoder(Collection<String> keys) {
+    public CSVEncoder(Collection<?> keys) {
         if (keys == null) {
             throw new IllegalArgumentException();
         }
@@ -120,18 +121,21 @@ private void encode(Iterable<?> rows, Writer writer) throws IOException {
 
         for (var key : keys) {
             if (key == null) {
-                throw new IllegalStateException();
+                throw new IllegalStateException("Missing key.");
             }
 
             if (i > 0) {
                 writer.write(DELIMITER);
             }
 
-            String heading;
-            if (resourceBundle == null) {
-                heading = key;
-            } else {
-                heading = resourceBundle.getObject(key).toString();
+            var heading = key;
+
+            if (resourceBundle != null) {
+                try {
+                    heading = resourceBundle.getObject(key.toString());
+                } catch (MissingResourceException exception) {
+                    // No-op
+                }
             }
 
             encode(heading, writer);
@@ -151,31 +155,35 @@ private void encode(Iterable<?> rows, Writer writer) throws IOException {
                     writer.write(DELIMITER);
                 }
 
-                var value = map.get(key);
+                encode(map.get(key), writer);
+
+                i++;
+            }
 
-                if (value != null) {
-                    if (value instanceof Date date) {
-                        value = date.toInstant();
-                    }
+            writer.write("\r\n");
+        }
+    }
 
-                    var formatter = formatters.get(value.getClass());
+    private void encode(Object value, Writer writer) throws IOException {
+        if (value == null) {
+            return;
+        }
 
-                    if (formatter != null) {
-                        value = formatter.apply(value);
-                    }
+        if (value instanceof Date date) {
+            value = date.toInstant();
+        }
 
-                    switch (value) {
-                        case CharSequence text -> encode(text, writer);
-                        case Number number -> encode(number, writer);
-                        case Boolean flag -> encode(flag, writer);
-                        default -> encode(value.toString(), writer);
-                    }
-                }
+        var formatter = formatters.get(value.getClass());
 
-                i++;
-            }
+        if (formatter != null) {
+            value = formatter.apply(value);
+        }
 
-            writer.write("\r\n");
+        switch (value) {
+            case CharSequence text -> encode(text, writer);
+            case Number number -> encode(number, writer);
+            case Boolean flag -> encode(flag, writer);
+            default -> encode(value.toString(), writer);
         }
     }
 

kilo-client/src/test/java/org/httprpc/kilo/io/CSVEncoderTest.java

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
@@ -131,6 +132,41 @@ public void testRecords() throws IOException {
         assertEquals(expected, writer.toString());
     }
 
+    @Test
+    public void testKeys() throws IOException {
+        var date = LocalDate.now();
+
+        var keys = listOf("a", date);
+
+        var csvEncoder = new CSVEncoder(keys);
+
+        var dateFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT);
+
+        csvEncoder.format(LocalDate.class, dateFormatter::format);
+        csvEncoder.setResourceBundle(ResourceBundle.getBundle(getClass().getPackageName() + ".csv"));
+
+        var rows = listOf(
+            mapOf(
+                entry("a", true),
+                entry(date, 123)
+            ),
+            mapOf(
+                entry("a", false),
+                entry(date, 456)
+            )
+        );
+
+        var writer = new StringWriter();
+
+        csvEncoder.write(rows, writer);
+
+        var expected = "\"a\",\"" + dateFormatter.format(date) + "\"\r\n"
+            + "true,123\r\n"
+            + "false,456\r\n";
+
+        assertEquals(expected, writer.toString());
+    }
+
     @Test
     public void testFormat() throws IOException {
         var date = new Date();