embulk-input-jira 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62552f42fdada57506d9dba69a692e46a2d26ae0
-  data.tar.gz: 98254e3f22f27b3e724b65457bc824d424c46949
+  metadata.gz: bffa95b4ab1e2b43adb69e1a94ca3264d4c50589
+  data.tar.gz: 949d00a53b677ad6264db49eaceaa405bbb6607b
 SHA512:
-  metadata.gz: 63998e221582f23434ac6a37b2cbd0214865bc22a96b814b3946839c345f9bb7fdb714ee25818a48c077e0d8e2aee5b477af97ed0bca1bad95de65c9eb3c47e7
-  data.tar.gz: d6eb0d245eff6dae69c25c48949767d7c9660e597740ba579f5569ca9c947c26ceefb596d01c1ba7d0f1da09651ab9be4a9324c250e01c13e67742ed22936f3a
+  metadata.gz: b238a357a63fab9aeefd3b195dcc2ad1c9f934c1a310b031c7648c63ea72537c9ab2fdd13f88519d2fab516d3d5c508b6d33e592b1af4a64f18f4d9a7852a630
+  data.tar.gz: e35f6c9bf319e7b4802ce031592ade24b11781c7231f6191ed437550275bce3a05cb77f090902a2749037c4aa33982d6ed505f2ca994e73a5f22430eb823eef2

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.2.5 - 2019-03-05
+## 0.2.7 - 2019-03-05
+
+* [enhancement] Support empty JQL [#55](https://github.com/treasure-data/embulk-input-jira/pull/55)
+
+## 0.2.6 - 2019-03-01
 
 * [enhancement] Change from ruby to java plugin [#53](https://github.com/treasure-data/embulk-input-jira/pull/53)
 

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
     provided
 }
 
-version = "0.2.6"
+version = "0.2.7"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

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

@@ -3,6 +3,7 @@ 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;
@@ -74,7 +75,8 @@ public class JiraInputPlugin
         public int getRetryLimit();
 
         @Config("jql")
-        public String getJQL();
+        @ConfigDefault("null")
+        public Optional<String> getJQL();
 
         @Config("columns")
         public SchemaConfig getColumns();

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

@@ -1,6 +1,7 @@
 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;
@@ -243,7 +244,8 @@ public class JiraClient
     private String createSearchIssuesBody(PluginTask task, int startAt, int maxResults)
     {
         JsonObject body = new JsonObject();
-        body.add("jql", new JsonPrimitive(task.getJQL()));
+        Optional<String> jql = task.getJQL();
+        body.add("jql", new JsonPrimitive(jql.or("")));
         body.add("startAt", new JsonPrimitive(startAt));
         body.add("maxResults", new JsonPrimitive(maxResults));
         JsonArray fields = new JsonArray();

data/src/main/java/org/embulk/input/jira/util/JiraUtil.java

@@ -76,10 +76,6 @@ public final class JiraUtil
                 connection.disconnect();
             }
         }
-        String jql = task.getJQL();
-        if (isNullOrEmpty(jql)) {
-            throw new ConfigException("JQL could not be empty");
-        }
         int retryInitialWaitSec = task.getInitialRetryIntervalMillis();
         if (retryInitialWaitSec < 1) {
             throw new ConfigException("Initial retry delay should be equal or greater than 1");

data/src/test/java/org/embulk/input/jira/client/JiraClientTest.java

@@ -8,6 +8,7 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.entity.StringEntity;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.config.ConfigException;
+import org.embulk.config.ConfigSource;
 import org.embulk.input.jira.Issue;
 import org.embulk.input.jira.JiraInputPlugin.PluginTask;
 import org.embulk.input.jira.TestHelpers;
@@ -219,4 +220,28 @@ public class JiraClientTest
 
         assertThrows(ConfigException.class, () -> jiraClient.searchIssues(task, 0, 50));
     }
+
+    @Test
+    public void test_searchIssues_emptyJql() throws IOException
+    {
+        String dataName =  "searchIssuesSuccess";
+        JsonObject messageResponse = data.get(dataName).getAsJsonObject();
+
+        int statusCode = messageResponse.get("statusCode").getAsInt();
+        String body = messageResponse.get("body").toString();
+
+        when(statusLine.getStatusCode()).thenReturn(statusCode);
+        when(response.getEntity()).thenReturn(new StringEntity(body));
+        ConfigSource config = TestHelpers.config().remove("jql");
+        task = config.loadConfig(PluginTask.class);
+
+        List<Issue> issues = jiraClient.searchIssues(task, 0, 50);
+        assertEquals(issues.size(), 2);
+
+        config = TestHelpers.config().set("jql", "");
+        task = config.loadConfig(PluginTask.class);
+
+        issues = jiraClient.searchIssues(task, 0, 50);
+        assertEquals(issues.size(), 2);
+    }
 }

data/src/test/java/org/embulk/input/jira/util/JiraUtilTest.java

@@ -196,9 +196,19 @@ public class JiraUtilTest
         catch (Exception e) {
             exception = e;
         }
-        assertNotNull(exception);
-        assertTrue(exception instanceof ConfigException);
-        assertEquals("JQL could not be empty", exception.getMessage());
+        assertNull(exception);
+
+        configSource = TestHelpers.config();
+        configSource.remove("jql");
+        task = configSource.loadConfig(PluginTask.class);
+        exception = null;
+        try {
+            JiraUtil.validateTaskConfig(task);
+        }
+        catch (Exception e) {
+            exception = e;
+        }
+        assertNull(exception);
 
         // initial_retry_interval_millis = 0
         configSource = TestHelpers.config();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jira
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - uu59
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-04 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.6.jar
+- classpath/embulk-input-jira-0.2.7.jar
 - classpath/embulk-util-retryhelper-jetty92-0.6.0.jar
 - classpath/gson-2.8.5.jar
 - classpath/httpclient-4.5.6.jar