Merge pull request #45 from treasure-data/PLT-10915_case_insensitive_…

…column_lookup Merge fields / columns matching should be case insensitive
treasure-data · Oct 11, 2018 · bd1bd4e · bd1bd4e
2 parents b95010e + f777787
commit bd1bd4e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/java/org/embulk/output/mailchimp/MailChimpRecordBuffer.java b/src/main/java/org/embulk/output/mailchimp/MailChimpRecordBuffer.java
@@ -208,26 +208,28 @@ public JsonNode apply(JsonNode input)
 
                 // Update additional merge fields if exist
                 if (task.getMergeFields().isPresent() && !task.getMergeFields().get().isEmpty()) {
-                    Map<String, String> columnNameLookup = new TreeMap<>(CASE_INSENSITIVE_ORDER);
+                    Map<String, String> columnNameCaseInsensitiveLookup = new TreeMap<>(CASE_INSENSITIVE_ORDER);
                     for (Column col : schema.getColumns()) {
-                        columnNameLookup.put(col.getName(), col.getName());
+                        columnNameCaseInsensitiveLookup.put(col.getName(), col.getName());
                     }
+                    Map<String, MergeField> availableMergeFieldsCaseInsensitiveLookup = new TreeMap<>(CASE_INSENSITIVE_ORDER);
+                    availableMergeFieldsCaseInsensitiveLookup.putAll(availableMergeFields);
+
                     for (String field : task.getMergeFields().get()) {
-                        if (!columnNameLookup.containsKey(field)) {
+                        if (!columnNameCaseInsensitiveLookup.containsKey(field)) {
                             LOG.warn(format("Field '%s' is configured on data transfer but cannot be found on any columns.", field));
                             continue;
                         }
-                        String columnName = columnNameLookup.get(field);
-                        if (!availableMergeFields.containsKey(columnName.toLowerCase())) {
+                        String columnName = columnNameCaseInsensitiveLookup.get(field);
+                        if (!availableMergeFieldsCaseInsensitiveLookup.containsKey(columnName)) {
                             LOG.warn(format("Field '%s' is configured on data transfer but is not predefined on Mailchimp.", field));
                             continue;
                         }
 
                         String value = input.hasNonNull(columnName) ? input.findValue(columnName).asText() : "";
 
                         // Try to convert to Json from string with the merge field's type is address
-                        if (availableMergeFields.get(columnName).getType()
-                                .equals(MergeField.MergeFieldType.ADDRESS.getType())) {
+                        if (availableMergeFieldsCaseInsensitiveLookup.get(columnName).getType().equals(MergeField.MergeFieldType.ADDRESS.getType())) {
                             JsonNode addressNode = toJsonNode(value);
                             if (addressNode instanceof NullNode) {
                                 mergeFields.put(columnName.toUpperCase(), value);