Update CSVEncoder.

Author: gk-brown

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

@@ -20,7 +20,6 @@
 import java.io.Writer;
 import java.text.Format;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -33,13 +32,11 @@
 public class CSVEncoder extends Encoder<Iterable<?>> {
     private List<String> keys;
 
-    private ResourceBundle resourceBundle = null;
-
     private Format numberFormat = null;
     private Format booleanFormat = null;
     private Format dateFormat = null;
 
-    private Map<String, Format> formats = new HashMap<>();
+    private ResourceBundle resourceBundle = null;
 
     private static final char DELIMITER = ',';
 
@@ -57,27 +54,6 @@ public CSVEncoder(List<String> keys) {
         this.keys = keys;
     }
 
-    /**
-     * Returns the resource bundle.
-     *
-     * @return
-     * The resource bundle, or {@code null} if a resource bundle has not been
-     * set.
-     */
-    public ResourceBundle getResourceBundle() {
-        return resourceBundle;
-    }
-
-    /**
-     * Sets the resource bundle.
-     *
-     * @param resourceBundle
-     * The resource bundle, or {@code null} for no resource bundle.
-     */
-    public void setResourceBundle(ResourceBundle resourceBundle) {
-        this.resourceBundle = resourceBundle;
-    }
-
     /**
      * Returns the number format.
      *
@@ -138,6 +114,27 @@ public void setDateFormat(Format dateFormat) {
         this.dateFormat = dateFormat;
     }
 
+    /**
+     * Returns the resource bundle.
+     *
+     * @return
+     * The resource bundle, or {@code null} if a resource bundle has not been
+     * set.
+     */
+    public ResourceBundle getResourceBundle() {
+        return resourceBundle;
+    }
+
+    /**
+     * Sets the resource bundle.
+     *
+     * @param resourceBundle
+     * The resource bundle, or {@code null} for no resource bundle.
+     */
+    public void setResourceBundle(ResourceBundle resourceBundle) {
+        this.resourceBundle = resourceBundle;
+    }
+
     @Override
     public void write(Iterable<?> rows, Writer writer) throws IOException {
         if (rows == null || writer == null) {
@@ -189,17 +186,7 @@ private void encode(Iterable<?> rows, Writer writer) throws IOException {
                     writer.write(DELIMITER);
                 }
 
-                var value = map.get(key);
-
-                if (value != null) {
-                    var format = formats.get(key);
-
-                    if (format != null) {
-                        value = format.format(value);
-                    }
-                }
-
-                encode(value, writer);
+                encode(map.get(key), writer);
 
                 i++;
             }

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

@@ -284,11 +284,11 @@ public Set<Entry<Object, Object>> entrySet() {
 
     private URI uri;
 
-    private ResourceBundle resourceBundle = null;
-
     private Locale locale = Locale.getDefault();
     private TimeZone timeZone = TimeZone.getDefault();
 
+    private ResourceBundle resourceBundle = null;
+
     private Modifier defaultModifier = new MarkupModifier();
 
     private Map<String, Modifier> modifiers = mapOf(
@@ -347,27 +347,6 @@ public TemplateEncoder(Class<?> type, String name) {
         }
     }
 
-    /**
-     * Returns the resource bundle.
-     *
-     * @return
-     * The resource bundle, or {@code null} if a resource bundle has not been
-     * set.
-     */
-    public ResourceBundle getResourceBundle() {
-        return resourceBundle;
-    }
-
-    /**
-     * Sets the resource bundle.
-     *
-     * @param resourceBundle
-     * The resource bundle, or {@code null} for no resource bundle.
-     */
-    public void setResourceBundle(ResourceBundle resourceBundle) {
-        this.resourceBundle = resourceBundle;
-    }
-
     /**
      * Returns the locale.
      *
@@ -416,6 +395,27 @@ public void setTimeZone(TimeZone timeZone) {
         this.timeZone = timeZone;
     }
 
+    /**
+     * Returns the resource bundle.
+     *
+     * @return
+     * The resource bundle, or {@code null} if a resource bundle has not been
+     * set.
+     */
+    public ResourceBundle getResourceBundle() {
+        return resourceBundle;
+    }
+
+    /**
+     * Sets the resource bundle.
+     *
+     * @param resourceBundle
+     * The resource bundle, or {@code null} for no resource bundle.
+     */
+    public void setResourceBundle(ResourceBundle resourceBundle) {
+        this.resourceBundle = resourceBundle;
+    }
+
     /**
      * Returns the default modifier.
      *