embulk-input-jira 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871da4fb82630f92834e2b00784c8e7ccd8b06b6
-  data.tar.gz: 96b6ced1eef2d43a1c258b1d985da224506e2b23
+  metadata.gz: 59b1ced33586839216b5590e44c33f57496af807
+  data.tar.gz: 507c7b27b8a4d5820a1603a9bdf1ef8c0038684f
 SHA512:
-  metadata.gz: c9aab03ff69b21824422a998039c2f0d17eae69d85b59c3aed382acbeb6b940f2b1152b54eb3218c7f252d1360ca2f2cbd92288d8b412fe1c724999ea3a438a8
-  data.tar.gz: e7fd609dc219332b64a9c0a67ffb529b0d65b32b439cce67c506ba986ac2b9cfa26c069e84634a146a9b8afbabb58d962ad2f9ea5b1ac7ddbee70be34a653183
+  metadata.gz: 40ea0eca3da6112d3cf4a571234ea892f6736d695274a503d756cc5f50261f519162ff9beede190688e3e23c7bfb95401006f6bc49d74b30be2e28d8365a6f2d
+  data.tar.gz: 19b48eef1db34c3cd2cb9379b08e000d9c056af2d5f9e1280efba31dd58b6dbf9a6a4b6e69f9a579e92216037c2570b15b240c2878bc036ffea203874b848181

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.10 - 2020-03-18
+
+* [enhancement] Use `java.util.Optional` instead of `com.google.common.base.Optional`, use `LoggerFactory.getLogger` instead of `Exec.getLogger` [#58](https://github.com/treasure-data/embulk-input-jira/pull/58)
+
 ## 0.2.9 - 2019-11-17
 
 * [enhancement] Remove usage of `ConfigSource#getObjectNode` [#57](https://github.com/treasure-data/embulk-input-jira/pull/57)

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.2.9"
+version = "0.2.10"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/input/jira/JiraInputPlugin.java

@@ -3,7 +3,6 @@ package org.embulk.input.jira;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -29,9 +28,11 @@ import org.embulk.spi.PageOutput;
 import org.embulk.spi.Schema;
 import org.embulk.spi.SchemaConfig;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -44,7 +45,7 @@ import static org.embulk.input.jira.Constant.PREVIEW_RECORDS_COUNT;
 public class JiraInputPlugin
         implements InputPlugin
 {
-    private static final Logger LOGGER = Exec.getLogger(JiraInputPlugin.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JiraInputPlugin.class);
 
     public interface PluginTask
             extends Task
@@ -88,55 +89,55 @@ public class JiraInputPlugin
     }
 
     @Override
-    public ConfigDiff transaction(ConfigSource config,
-            InputPlugin.Control control)
+    public ConfigDiff transaction(final ConfigSource config,
+            final InputPlugin.Control control)
     {
-        PluginTask task = config.loadConfig(PluginTask.class);
+        final PluginTask task = config.loadConfig(PluginTask.class);
 
-        Schema schema = task.getColumns().toSchema();
-        int taskCount = 1;
+        final Schema schema = task.getColumns().toSchema();
+        final int taskCount = 1;
 
         return resume(task.dump(), schema, taskCount, control);
     }
 
     @Override
-    public ConfigDiff resume(TaskSource taskSource,
-            Schema schema, int taskCount,
-            InputPlugin.Control control)
+    public ConfigDiff resume(final TaskSource taskSource,
+            final Schema schema, final int taskCount,
+            final InputPlugin.Control control)
     {
         control.run(taskSource, schema, taskCount);
         return Exec.newConfigDiff();
     }
 
     @Override
-    public void cleanup(TaskSource taskSource,
-            Schema schema, int taskCount,
-            List<TaskReport> successTaskReports)
+    public void cleanup(final TaskSource taskSource,
+            final Schema schema, final int taskCount,
+            final List<TaskReport> successTaskReports)
     {
     }
 
     @Override
-    public TaskReport run(TaskSource taskSource,
-            Schema schema, int taskIndex,
-            PageOutput output)
+    public TaskReport run(final TaskSource taskSource,
+            final Schema schema, final int taskIndex,
+            final PageOutput output)
     {
-        PluginTask task = taskSource.loadTask(PluginTask.class);
+        final PluginTask task = taskSource.loadTask(PluginTask.class);
         JiraUtil.validateTaskConfig(task);
-        JiraClient jiraClient = getJiraClient();
+        final JiraClient jiraClient = getJiraClient();
         jiraClient.checkUserCredentials(task);
         try (final PageBuilder pageBuilder = getPageBuilder(schema, output)) {
             if (isPreview()) {
-                List<Issue> issues = jiraClient.searchIssues(task, 0, PREVIEW_RECORDS_COUNT);
+                final List<Issue> issues = jiraClient.searchIssues(task, 0, PREVIEW_RECORDS_COUNT);
                 issues.forEach(issue -> JiraUtil.addRecord(issue, schema, task, pageBuilder));
             }
             else {
                 int currentPage = 0;
-                int totalCount = jiraClient.getTotalCount(task);
-                int totalPage = JiraUtil.calculateTotalPage(totalCount, MAX_RESULTS);
+                final int totalCount = jiraClient.getTotalCount(task);
+                final int totalPage = JiraUtil.calculateTotalPage(totalCount, MAX_RESULTS);
                 LOGGER.info(String.format("Total pages (%d)", totalPage));
                 while (currentPage < totalPage) {
                     LOGGER.info(String.format("Fetching page %d/%d", (currentPage + 1), totalPage));
-                    List<Issue> issues = jiraClient.searchIssues(task, (currentPage * MAX_RESULTS), MAX_RESULTS);
+                    final List<Issue> issues = jiraClient.searchIssues(task, (currentPage * MAX_RESULTS), MAX_RESULTS);
                     issues.forEach(issue -> JiraUtil.addRecord(issue, schema, task, pageBuilder));
                     currentPage++;
                 }
@@ -147,20 +148,20 @@ public class JiraInputPlugin
     }
 
     @Override
-    public ConfigDiff guess(ConfigSource config)
+    public ConfigDiff guess(final ConfigSource config)
     {
         // Reset columns in case already have or missing on configuration
         config.set("columns", new ObjectMapper().createArrayNode());
-        PluginTask task = config.loadConfig(PluginTask.class);
+        final PluginTask task = config.loadConfig(PluginTask.class);
         JiraUtil.validateTaskConfig(task);
-        JiraClient jiraClient = getJiraClient();
+        final JiraClient jiraClient = getJiraClient();
         jiraClient.checkUserCredentials(task);
-        List<Issue> issues = jiraClient.searchIssues(task, 0, GUESS_RECORDS_COUNT);
+        final List<Issue> issues = jiraClient.searchIssues(task, 0, GUESS_RECORDS_COUNT);
         if (issues.isEmpty()) {
             throw new ConfigException("Could not guess schema due to empty data set");
         }
-        Buffer sample = Buffer.copyOf(createSamples(issues, getUniqueAttributes(issues)).toString().getBytes());
-        JsonNode columns = Exec.getInjector().getInstance(GuessExecutor.class)
+        final Buffer sample = Buffer.copyOf(createSamples(issues, getUniqueAttributes(issues)).toString().getBytes());
+        final JsonNode columns = Exec.getInjector().getInstance(GuessExecutor.class)
                                 .guessParserConfig(sample, Exec.newConfigSource(), createGuessConfig())
                                 .get(JsonNode.class, "columns");
         return Exec.newConfigDiff().set("columns", columns);
@@ -173,24 +174,24 @@ public class JiraInputPlugin
                     .set("guess_sample_buffer_bytes", GUESS_BUFFER_SIZE);
     }
 
-    private SortedSet<String> getUniqueAttributes(List<Issue> issues)
+    private SortedSet<String> getUniqueAttributes(final List<Issue> issues)
     {
-        SortedSet<String> uniqueAttributes = new TreeSet<>();
-        for (Issue issue : issues) {
-            for (Entry<String, JsonElement> entry : issue.getFlatten().entrySet()) {
+        final SortedSet<String> uniqueAttributes = new TreeSet<>();
+        for (final Issue issue : issues) {
+            for (final Entry<String, JsonElement> entry : issue.getFlatten().entrySet()) {
                 uniqueAttributes.add(entry.getKey());
             }
         }
         return uniqueAttributes;
     }
 
-    private JsonArray createSamples(List<Issue> issues, Set<String> uniqueAttributes)
+    private JsonArray createSamples(final List<Issue> issues, final Set<String> uniqueAttributes)
     {
-        JsonArray samples = new JsonArray();
-        for (Issue issue : issues) {
-            JsonObject flatten = issue.getFlatten();
-            JsonObject unified = new JsonObject();
-            for (String key : uniqueAttributes) {
+        final JsonArray samples = new JsonArray();
+        for (final Issue issue : issues) {
+            final JsonObject flatten = issue.getFlatten();
+            final JsonObject unified = new JsonObject();
+            for (final String key : uniqueAttributes) {
                 JsonElement value = flatten.get(key);
                 if (value == null) {
                     value = JsonNull.INSTANCE;
@@ -209,7 +210,7 @@ public class JiraInputPlugin
     }
 
     @VisibleForTesting
-    public PageBuilder getPageBuilder(Schema schema, PageOutput output)
+    public PageBuilder getPageBuilder(final Schema schema, final PageOutput output)
     {
         return new PageBuilder(Exec.getBufferAllocator(), schema, output);
     }

data/src/main/java/org/embulk/input/jira/client/JiraClient.java

@@ -1,7 +1,6 @@
 package org.embulk.input.jira.client;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -24,15 +23,16 @@ import org.embulk.input.jira.Issue;
 import org.embulk.input.jira.JiraInputPlugin.PluginTask;
 import org.embulk.input.jira.util.JiraException;
 import org.embulk.input.jira.util.JiraUtil;
-import org.embulk.spi.Exec;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.embulk.spi.util.RetryExecutor.Retryable;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -49,14 +49,14 @@ public class JiraClient
 {
     public JiraClient() {}
 
-    private static final Logger LOGGER = Exec.getLogger(JiraClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JiraClient.class);
 
     public void checkUserCredentials(final PluginTask task)
     {
         try {
             authorizeAndRequest(task, JiraUtil.buildPermissionUrl(task.getUri()), null);
         }
-        catch (JiraException e) {
+        catch (final JiraException e) {
             LOGGER.error(String.format("JIRA return status (%s), reason (%s)", e.getStatusCode(), e.getMessage()));
             if (e.getStatusCode() == HttpStatus.SC_UNAUTHORIZED) {
                 throw new ConfigException("Could not authorize with your credential.");
@@ -67,18 +67,18 @@ public class JiraClient
         }
     }
 
-    public List<Issue> searchIssues(final PluginTask task, int startAt, int maxResults)
+    public List<Issue> searchIssues(final PluginTask task, final int startAt, final int maxResults)
     {
-        String response = searchJiraAPI(task, startAt, maxResults);
-        JsonObject result = new JsonParser().parse(response).getAsJsonObject();
+        final String response = searchJiraAPI(task, startAt, maxResults);
+        final JsonObject result = new JsonParser().parse(response).getAsJsonObject();
         return StreamSupport.stream(result.get("issues").getAsJsonArray().spliterator(), false)
                             .map(jsonElement -> {
-                                JsonObject json = jsonElement.getAsJsonObject();
-                                JsonObject fields = json.get("fields").getAsJsonObject();
-                                Set<Entry<String, JsonElement>> entries = fields.entrySet();
+                                final JsonObject json = jsonElement.getAsJsonObject();
+                                final JsonObject fields = json.get("fields").getAsJsonObject();
+                                final Set<Entry<String, JsonElement>> entries = fields.entrySet();
                                 json.remove("fields");
                                 // Merged all properties in fields to the object
-                                for (Entry<String, JsonElement> entry : entries) {
+                                for (final Entry<String, JsonElement> entry : entries) {
                                     json.add(entry.getKey(), entry.getValue());
                                 }
                                 return new Issue(json);
@@ -91,7 +91,7 @@ public class JiraClient
         return new JsonParser().parse(searchJiraAPI(task, 0, MIN_RESULTS)).getAsJsonObject().get("total").getAsInt();
     }
 
-    private String searchJiraAPI(final PluginTask task, int startAt, int maxResults)
+    private String searchJiraAPI(final PluginTask task, final int startAt, final int maxResults)
     {
         try {
             return retryExecutor().withRetryLimit(task.getRetryLimit())
@@ -106,10 +106,10 @@ public class JiraClient
                 }
 
                 @Override
-                public boolean isRetryableException(Exception exception)
+                public boolean isRetryableException(final Exception exception)
                 {
                     if (exception instanceof JiraException) {
-                        int statusCode = ((JiraException) exception).getStatusCode();
+                        final int statusCode = ((JiraException) exception).getStatusCode();
                         // When overloading JIRA APIs (i.e 100 requests per second) the API will return 401 although the credential is correct. So add retry for this
                         // 429 is stand for "Too many requests"
                         // Other 4xx considered errors
@@ -119,11 +119,11 @@ public class JiraClient
                 }
 
                 @Override
-                public void onRetry(Exception exception, int retryCount, int retryLimit, int retryWait)
+                public void onRetry(final Exception exception, final int retryCount, final int retryLimit, final int retryWait)
                         throws RetryGiveupException
                 {
                     if (exception instanceof JiraException) {
-                        String message = String
+                        final String message = String
                                 .format("Retrying %d/%d after %d seconds. HTTP status code: %s",
                                         retryCount, retryLimit,
                                         retryWait / 1000,
@@ -131,7 +131,7 @@ public class JiraClient
                         LOGGER.warn(message);
                     }
                     else {
-                        String message = String
+                        final String message = String
                                 .format("Retrying %d/%d after %d seconds. Message: %s",
                                         retryCount, retryLimit,
                                         retryWait / 1000,
@@ -141,7 +141,7 @@ public class JiraClient
                 }
 
                 @Override
-                public void onGiveup(Exception firstException, Exception lastException) throws RetryGiveupException
+                public void onGiveup(final Exception firstException, final Exception lastException) throws RetryGiveupException
                 {
                     LOGGER.warn("Retry Limit Exceeded");
                 }
@@ -155,7 +155,7 @@ public class JiraClient
         }
     }
 
-    private String authorizeAndRequest(final PluginTask task, String url, String body) throws JiraException
+    private String authorizeAndRequest(final PluginTask task, final String url, final String body) throws JiraException
     {
         try (CloseableHttpClient client = createHttpClient()) {
             HttpRequestBase request;
@@ -167,28 +167,28 @@ public class JiraClient
             }
             try (CloseableHttpResponse response = client.execute(request)) {
              // Check for HTTP response code : 200 : SUCCESS
-                int statusCode = response.getStatusLine().getStatusCode();
+                final int statusCode = response.getStatusLine().getStatusCode();
                 if (statusCode != HttpStatus.SC_OK) {
                     throw new JiraException(statusCode, extractErrorMessages(EntityUtils.toString(response.getEntity())));
                 }
                 return EntityUtils.toString(response.getEntity());
             }
         }
-        catch (IOException e) {
+        catch (final IOException e) {
             throw new JiraException(-1, e.getMessage());
         }
     }
 
-    private String extractErrorMessages(String errorResponse)
+    private String extractErrorMessages(final String errorResponse)
     {
-        List<String> messages = new ArrayList<>();
+        final List<String> messages = new ArrayList<>();
         try {
-            JsonObject errorObject = new JsonParser().parse(errorResponse).getAsJsonObject();
-            for (JsonElement element : errorObject.get("errorMessages").getAsJsonArray()) {
+            final JsonObject errorObject = new JsonParser().parse(errorResponse).getAsJsonObject();
+            for (final JsonElement element : errorObject.get("errorMessages").getAsJsonArray()) {
                 messages.add(element.getAsString());
             }
         }
-        catch (Exception e) {
+        catch (final Exception e) {
             messages.add(errorResponse);
         }
         return String.join(" , ", messages);
@@ -207,9 +207,9 @@ public class JiraClient
                     .build();
     }
 
-    private HttpRequestBase createPostRequest(PluginTask task, String url, String body) throws IOException
+    private HttpRequestBase createPostRequest(final PluginTask task, final String url, final String body) throws IOException
     {
-        HttpPost request = new HttpPost(url);
+        final HttpPost request = new HttpPost(url);
         switch (task.getAuthMethod()) {
         default:
             request.setHeader(
@@ -226,9 +226,9 @@ public class JiraClient
         return request;
     }
 
-    private HttpRequestBase createGetRequest(PluginTask task, String url)
+    private HttpRequestBase createGetRequest(final PluginTask task, final String url)
     {
-        HttpGet request = new HttpGet(url);
+        final HttpGet request = new HttpGet(url);
         switch (task.getAuthMethod()) {
         default:
             request.setHeader(
@@ -244,14 +244,14 @@ public class JiraClient
         return request;
     }
 
-    private String createSearchIssuesBody(PluginTask task, int startAt, int maxResults)
+    private String createSearchIssuesBody(final PluginTask task, final int startAt, final int maxResults)
     {
-        JsonObject body = new JsonObject();
-        Optional<String> jql = task.getJQL();
-        body.add("jql", new JsonPrimitive(jql.or("")));
+        final JsonObject body = new JsonObject();
+        final Optional<String> jql = task.getJQL();
+        body.add("jql", new JsonPrimitive(jql.orElse("")));
         body.add("startAt", new JsonPrimitive(startAt));
         body.add("maxResults", new JsonPrimitive(maxResults));
-        JsonArray fields = new JsonArray();
+        final JsonArray fields = new JsonArray();
         fields.add("*all");
         body.add("fields", fields);
         return body.toString();

data/src/test/java/org/embulk/input/jira/TestHelpers.java

@@ -2,7 +2,7 @@ package org.embulk.input.jira;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
-import com.fasterxml.jackson.datatype.joda.JodaModule;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.google.common.io.Resources;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -20,22 +20,22 @@ public final class TestHelpers
 {
     private TestHelpers() {}
 
-    public static JsonObject getJsonFromFile(String fileName) throws IOException
+    public static JsonObject getJsonFromFile(final String fileName) throws IOException
      {
-        String path = Resources.getResource(fileName).getPath();
+        final String path = Resources.getResource(fileName).getPath();
         try (JsonReader reader = new JsonReader(new FileReader(path))) {
-            JsonParser parser = new JsonParser();
+            final JsonParser parser = new JsonParser();
             return parser.parse(reader).getAsJsonObject();
         }
     }
 
     public static ConfigSource config() throws IOException
     {
-        String path = Resources.getResource("config.yml").getPath();
-        ObjectMapper mapper = new ObjectMapper()
+        final String path = Resources.getResource("config.yml").getPath();
+        final ObjectMapper mapper = new ObjectMapper()
                 .registerModule(new GuavaModule())
-                .registerModule(new JodaModule());
-        ConfigLoader configLoader = new ConfigLoader(new ModelManager(null, mapper));
+                .registerModule(new Jdk8Module());
+        final ConfigLoader configLoader = new ConfigLoader(new ModelManager(null, mapper));
         return configLoader.fromYamlFile(new File(path));
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ files:
 - build.gradle
 - classpath/commons-codec-1.10.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-input-jira-0.2.9.jar
+- classpath/embulk-input-jira-0.2.10.jar
 - classpath/gson-2.8.5.jar
 - classpath/httpclient-4.5.6.jar
 - classpath/httpcore-4.4.10.jar