Merge pull request #55 from treasure-data/support_empty_jql_fix_check…

…_host Support empty JQL
treasure-data · Mar 4, 2019 · 3a8158b · 3a8158b
2 parents b368bf5 + 0d99dd6
commit 3a8158b
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/CHANGELOG.md b/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)
 

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ configurations {
     provided
 }
 
-version = "0.2.6"
+version = "0.2.7"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/src/main/java/org/embulk/input/jira/JiraInputPlugin.java b/src/main/java/org/embulk/input/jira/JiraInputPlugin.java
@@ -3,6 +3,7 @@
 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 interface PluginTask
         public int getRetryLimit();
 
         @Config("jql")
-        public String getJQL();
+        @ConfigDefault("null")
+        public Optional<String> getJQL();
 
         @Config("columns")
         public SchemaConfig getColumns();

diff --git a/src/main/java/org/embulk/input/jira/client/JiraClient.java b/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 @@ private HttpRequestBase createGetRequest(PluginTask task, String url)
     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();

diff --git a/src/main/java/org/embulk/input/jira/util/JiraUtil.java b/src/main/java/org/embulk/input/jira/util/JiraUtil.java
@@ -76,10 +76,6 @@ public static void validateTaskConfig(final PluginTask task)
                 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");

diff --git a/src/test/java/org/embulk/input/jira/client/JiraClientTest.java b/src/test/java/org/embulk/input/jira/client/JiraClientTest.java
@@ -8,6 +8,7 @@
 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 void test_searchIssues_failJql() throws IOException
 
         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);
+    }
 }
diff --git a/src/test/java/org/embulk/input/jira/util/JiraUtilTest.java b/src/test/java/org/embulk/input/jira/util/JiraUtilTest.java
@@ -196,9 +196,19 @@ public void test_validateTaskConfig() throws IOException
         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();