embulk-output-mailchimp 0.3.24 → 0.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bd2a4db83fe03e54434449187716447a8c7ce7b
-  data.tar.gz: 3b3385ab55f592b937b38a4cfac2f2c5d62ad548
+  metadata.gz: 94b54333acb168038a0b2537d6bf7c8a71be4993
+  data.tar.gz: 18b422345048fd9d9681dc24a369c8c16680c55e
 SHA512:
-  metadata.gz: 727ddd4c581d69b5b34962d73a3d8a54e2e4365ee98b7ddd13df84b04b6c8222adcc101673056c74c113ba061d654034dd7fea4b4dfe1e48e148ddbeaa2b1c2b
-  data.tar.gz: ecd1e9229bb8015e28eea7a5dbedb70e7997b28fb74d78ab3cdafbf4e2790ff6f7f22a0523ace0e710cf873f4bdf2166db9d59a79ae1b77cd50cd933459c6bcf
+  metadata.gz: 8248823129afda3c947fed964e9ea6d080cf7cfb81b18d399cf9ab4aae25b40ead8e71a0981a98a9c184b018b5cc7c948b1df5aef639b35f7c03dba81ce6d7fc
+  data.tar.gz: 24220688ee272036fa55ce8cf040ee3c95ce76942e424a35121767bf4f8e7924985b236712ffeac1d57ef75c2ae3441ff8646e67cf63b55d5e963c5e0ec97b56

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.25 - 2018-10-11
+
+- Fixed an NPE when column names and merge tags are not exactly (case-sensitive) matched
+
 ## 0.3.23 - 2018-09-12
 - Introduce an option to fail the job when there is an error returning from Mailchimp. Previous versions marked the job as success with
 detail error in log

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.3.24"
+version = "0.3.25"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/output/mailchimp/MailChimpRecordBuffer.java

@@ -208,17 +208,20 @@ public class MailChimpRecordBuffer
 
                 // 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;
                         }
@@ -226,8 +229,7 @@ public class MailChimpRecordBuffer
                         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);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.25
 platform: ruby
 authors:
 - Thang Nguyen
@@ -89,7 +89,7 @@ files:
 - test/override_assert_raise.rb
 - test/run-test.rb
 - classpath/jetty-io-9.2.14.v20151106.jar
-- classpath/embulk-output-mailchimp-0.3.24.jar
+- classpath/embulk-output-mailchimp-0.3.25.jar
 - classpath/jetty-util-9.2.14.v20151106.jar
 - classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/jetty-client-9.2.14.v20151106.jar