Merge pull request #647 from jenkinsci/rantoniuk/jrjc-fixes

Bug fixes for Jira REST Java client

Author: rantoniuk

.github/ISSUE_TEMPLATE/1-report-bug.yml

@@ -1,5 +1,5 @@
 name: "🐛 Bug report"
-labels: ["bug"]
+type: "Bug"
 description: Create a bug report to help us improve
 
 body:

.github/ISSUE_TEMPLATE/2-feature-request.yml

@@ -1,5 +1,5 @@
 name: "🚀 Feature request"
-labels: ["enhancement"]
+type: "feature"
 description: I have a suggestion
 
 body:

.gitignore

@@ -5,7 +5,9 @@
 build
 target
 bin
+work/
 .work
+.env*
 .docker
 *.code-workspace
 

src/main/java/hudson/plugins/jira/JiraRestService.java

@@ -51,10 +51,13 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
@@ -226,9 +229,12 @@ public List<String> getProjectsKeys() {
 
     public List<Issue> getIssuesFromJqlSearch(String jqlSearch, Integer maxResults) throws TimeoutException {
         try {
+            Set<String> neededFields =
+                    new HashSet<>(Arrays.asList("summary", "issuetype", "created", "updated", "project", "status"));
+
             final SearchResult searchResult = jiraRestClient
                     .getSearchClient()
-                    .searchJql(jqlSearch, maxResults, 0, null)
+                    .searchJql(jqlSearch, maxResults, 0, neededFields)
                     .get(timeout, TimeUnit.SECONDS);
             return StreamSupport.stream(searchResult.getIssues().spliterator(), false)
                     .collect(Collectors.toList());

src/main/java/hudson/plugins/jira/JiraSession.java

@@ -129,7 +129,7 @@ public Issue getIssue(String id) {
      * @return issues matching the JQL query
      */
     public List<Issue> getIssuesFromJqlSearch(final String jqlSearch) throws TimeoutException {
-        return service.getIssuesFromJqlSearch(jqlSearch, Integer.MAX_VALUE);
+        return service.getIssuesFromJqlSearch(jqlSearch, 100);
     }
 
     /**
@@ -173,11 +173,10 @@ public List<Issue> getIssuesWithFixVersion(String projectKey, String version, St
         LOGGER.fine("Fetching versions from project: " + projectKey + " with fixVersion:" + version);
         if (isNotEmpty(filter)) {
             return service.getIssuesFromJqlSearch(
-                    String.format("project = \"%s\" and fixVersion = \"%s\" and " + filter, projectKey, version),
-                    Integer.MAX_VALUE);
+                    String.format("project = \"%s\" and fixVersion = \"%s\" and " + filter, projectKey, version), 100);
         }
         return service.getIssuesFromJqlSearch(
-                String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), Integer.MAX_VALUE);
+                String.format("project = \"%s\" and fixVersion = \"%s\"", projectKey, version), 100);
     }
 
     /**