Skip to content

Bug fixes for Jira REST Java client #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rantoniuk merged 4 commits into from
Apr 23, 2025
Merged

Bug fixes for Jira REST Java client #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d30697
Use 100 as the max number of issues for searchJql()
rantoniuk Apr 22, 2025
dd665db
Add default fields to searchJql() since null doesn't work properly
rantoniuk Apr 22, 2025
a018096
spotless fixes
rantoniuk Apr 22, 2025
a9104bb
update issue templates to use new issue type field [skip ci]
rantoniuk Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1-report-bug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "🐛 Bug report"
labels: ["bug"]
type: "Bug"
description: Create a bug report to help us improve

body:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2-feature-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "🚀 Feature request"
labels: ["enhancement"]
type: "feature"
description: I have a suggestion

body:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
build
target
bin
work/
.work
.env*
.docker
*.code-workspace

Expand Down
8 changes: 7 additions & 1 deletion src/main/java/hudson/plugins/jira/JiraRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/hudson/plugins/jira/JiraSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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);
}

/**
Expand Down
Loading