embulk-output-mailchimp 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a7c2c34660acc5f41bae67c49ef51bf6da4623
-  data.tar.gz: 0876a7e5d771137162eebd468128b85e22717257
+  metadata.gz: c7ffeeb484184fcbcb739aef1c871a0c915fca74
+  data.tar.gz: ab5372d39822ac2c231945f1360611ed83f555ec
 SHA512:
-  metadata.gz: 3bf58d25c81e9ad92cd69a81146b57d87aa771cdfa1d9d1c5045824eb694fa88bfde080f88d3bc13d4d3790a1a9f3fbb8cc2c7ae6fb34ae7a2d9f7b7956f2d3e
-  data.tar.gz: 02045e97f6750c51287e2f56ccc96b7a0ffc406153dd4e39a9ff5e5ef8b2416a2e5c4a9e66c20bad1a09deaf1610c3b88c05d6512afb9a437947b1fe6ba76d2c
+  metadata.gz: ff9ea7f57503ac6149b87fb78a67200cfc59fde7fbf66e1bb632d660ab5480a5f4a9e50ddd8d94bdd9d6a4ec2a8b5dc9ee85f4f2c6b1c4f4041e915a991d6483
+  data.tar.gz: 15126516099f6bb739522ec13e9dfcda26ed365a0f686e5e7d9fe7c3dcb37d68cbe97e14a6a760acfa13cfa8c933b20e9f7dad36c5505846bda60817dcb0dde7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.13 - 2017-06-16
+- Upgraded `embulk-base-restclient` to v0.5.3 and fixed hang job [#28](https://github.com/treasure-data/embulk-output-mailchimp/pull/28)
+
 ## 0.3.12 - 2017-06-13
 - Fixed NPE while reading JSON data [#27](https://github.com/treasure-data/embulk-output-mailchimp/pull/27)
 

data/build.gradle

@@ -18,7 +18,7 @@ configurations {
     provided
 }
 
-version = "0.3.12"
+version = "0.3.13"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -26,8 +26,8 @@ targetCompatibility = 1.7
 dependencies {
     compile  "org.embulk:embulk-core:0.8.15"
     provided "org.embulk:embulk-core:0.8.15"
-    compile  "org.embulk.base.restclient:embulk-base-restclient:0.5.2"
-    compile  "org.embulk.base.restclient:embulk-util-retryhelper-jetty92:0.5.2"
+    compile  "org.embulk.base.restclient:embulk-base-restclient:0.5.3"
+    compile  "org.embulk.base.restclient:embulk-util-retryhelper-jetty92:0.5.3"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
 
     testCompile "junit:junit:4.+"

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

@@ -140,8 +140,8 @@ public abstract class MailChimpAbstractRecordBuffer
         catch (JsonProcessingException jpe) {
             throw new DataException(jpe);
         }
-        finally {
-            cleanUp();
+        catch (Exception ex) {
+            throw Throwables.propagate(ex);
         }
     }
 
@@ -202,11 +202,6 @@ public abstract class MailChimpAbstractRecordBuffer
         return categories;
     }
 
-    /**
-     * Clean up.
-     */
-    abstract void cleanUp();
-
     /**
      * Push payload data to MailChimp API and get @{@link ReportResponse}
      *

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

@@ -31,7 +31,6 @@ public class MailChimpHttpClient
     private final ObjectMapper jsonMapper = new ObjectMapper()
             .configure(com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, false)
             .configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    private Jetty92RetryHelper retryHelper;
 
     /**
      * Instantiates a new Mailchimp http client.
@@ -40,17 +39,6 @@ public class MailChimpHttpClient
      */
     public MailChimpHttpClient(MailChimpOutputPluginDelegate.PluginTask task)
     {
-        retryHelper = createRetryHelper(task);
-    }
-
-    /**
-     * Close @{@link Jetty92RetryHelper} connection
-     */
-    public void close()
-    {
-        if (retryHelper != null) {
-            retryHelper.close();
-        }
     }
 
     public JsonNode sendRequest(final String endpoint, final HttpMethod method,
@@ -62,44 +50,50 @@ public class MailChimpHttpClient
     public JsonNode sendRequest(final String endpoint, final HttpMethod method, final String content,
                                 final MailChimpOutputPluginDelegate.PluginTask task)
     {
-        final String authorizationHeader = getAuthorizationHeader(task);
+        try (final Jetty92RetryHelper retryHelper = createRetryHelper(task)) {
+            final String authorizationHeader = getAuthorizationHeader(task);
 
-        String responseBody = retryHelper.requestWithRetry(
-                new StringJetty92ResponseEntityReader(task.getTimeoutMillis()),
-                new Jetty92SingleRequester()
-                {
-                    @Override
-                    public void requestOnce(HttpClient client, Response.Listener responseListener)
+            String responseBody = retryHelper.requestWithRetry(
+                    new StringJetty92ResponseEntityReader(task.getTimeoutMillis()),
+                    new Jetty92SingleRequester()
                     {
-                        Request request = client
-                                .newRequest(endpoint)
-                                .accept("application/json")
-                                .method(method);
-                        if (method == HttpMethod.POST || method == HttpMethod.PUT) {
-                            request.content(new StringContentProvider(content), "application/json;utf-8");
+                        @Override
+                        public void requestOnce(HttpClient client, Response.Listener responseListener)
+                        {
+                            Request request = client
+                                    .newRequest(endpoint)
+                                    .accept("application/json")
+                                    .method(method);
+                            if (method == HttpMethod.POST || method == HttpMethod.PUT) {
+                                request.content(new StringContentProvider(content), "application/json;utf-8");
+                            }
+
+                            if (!authorizationHeader.isEmpty()) {
+                                request.header("Authorization", authorizationHeader);
+                            }
+                            request.send(responseListener);
                         }
 
-                        if (!authorizationHeader.isEmpty()) {
-                            request.header("Authorization", authorizationHeader);
-                        }
-                        request.send(responseListener);
-                    }
+                        @Override
+                        public boolean isResponseStatusToRetry(Response response)
+                        {
+                            int status = response.getStatus();
 
-                    @Override
-                    public boolean isResponseStatusToRetry(Response response)
-                    {
-                        int status = response.getStatus();
+                            if (status == 404) {
+                                LOG.error("Exception occurred while sending request: {}", response.getReason());
+                                throw new ConfigException("The `list id` could not be found.");
+                            }
 
-                        if (status == 404) {
-                            LOG.error("Exception occurred while sending request: {}", response.getReason());
-                            throw new ConfigException("The `list id` could not be found.");
+                            return status == 429 || status / 100 != 4;
                         }
+                    });
 
-                        return status == 429 || status / 100 != 4;
-                    }
-                });
-
-        return responseBody != null && !responseBody.isEmpty() ? parseJson(responseBody) : MissingNode.getInstance();
+            return responseBody != null && !responseBody.isEmpty() ? parseJson(responseBody) : MissingNode.getInstance();
+        }
+        catch (Exception ex) {
+            LOG.info("Exception occurred while sending request.");
+            throw Throwables.propagate(ex);
+        }
     }
 
     private JsonNode parseJson(final String json)

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

@@ -48,9 +48,13 @@ public class MailChimpRecordBuffer extends MailChimpAbstractRecordBuffer
     }
 
     @Override
-    void cleanUp()
+    public void finish()
+    {
+    }
+
+    @Override
+    public void close()
     {
-        client.close();
     }
 
     /**

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Thang Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +88,9 @@ files:
 - test/embulk/output/test_mailchimp.rb
 - test/override_assert_raise.rb
 - test/run-test.rb
-- classpath/embulk-base-restclient-0.5.2.jar
-- classpath/embulk-output-mailchimp-0.3.12.jar
-- classpath/embulk-util-retryhelper-jetty92-0.5.2.jar
+- classpath/embulk-base-restclient-0.5.3.jar
+- classpath/embulk-output-mailchimp-0.3.13.jar
+- classpath/embulk-util-retryhelper-jetty92-0.5.3.jar
 - classpath/jetty-client-9.2.14.v20151106.jar
 - classpath/jetty-http-9.2.14.v20151106.jar
 - classpath/jetty-io-9.2.14.v20151106.jar